From 17011f094ca1929b043e3a84f461a413da5b14ce Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 4 Mar 2025 13:10:40 +0800 Subject: [PATCH 1/4] Change target sdk --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index aaac9e0..a4a3946 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "9.0.200", "rollForward": "latestMinor", "allowPrerelease": false } From 77079d63d3b38717c86f19b6e9055a0b6151b837 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 4 Mar 2025 13:10:48 +0800 Subject: [PATCH 2/4] Move to slnx solution --- Flow.Launcher.Localization.sln | 22 ---------------------- Flow.Launcher.Localization.slnx | 5 +++++ 2 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 Flow.Launcher.Localization.sln create mode 100644 Flow.Launcher.Localization.slnx diff --git a/Flow.Launcher.Localization.sln b/Flow.Launcher.Localization.sln deleted file mode 100644 index 4bba42b..0000000 --- a/Flow.Launcher.Localization.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flow.Launcher.Localization.Analyzers", "Flow.Launcher.Localization.Analyzers\Flow.Launcher.Localization.Analyzers.csproj", "{C792C4B8-4FE0-40F8-8B81-CEBF9E942F8B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flow.Launcher.Localization.SourceGenerators", "Flow.Launcher.Localization.SourceGenerators\Flow.Launcher.Localization.SourceGenerators.csproj", "{4151088A-985C-4039-92FE-27FB5D7F6AE2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C792C4B8-4FE0-40F8-8B81-CEBF9E942F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C792C4B8-4FE0-40F8-8B81-CEBF9E942F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C792C4B8-4FE0-40F8-8B81-CEBF9E942F8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C792C4B8-4FE0-40F8-8B81-CEBF9E942F8B}.Release|Any CPU.Build.0 = Release|Any CPU - {4151088A-985C-4039-92FE-27FB5D7F6AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4151088A-985C-4039-92FE-27FB5D7F6AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4151088A-985C-4039-92FE-27FB5D7F6AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4151088A-985C-4039-92FE-27FB5D7F6AE2}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Flow.Launcher.Localization.slnx b/Flow.Launcher.Localization.slnx new file mode 100644 index 0000000..dc9bd15 --- /dev/null +++ b/Flow.Launcher.Localization.slnx @@ -0,0 +1,5 @@ + + + + + From 8f554e7005a2bb5073a864942711be195628d24f Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 4 Mar 2025 13:11:01 +0800 Subject: [PATCH 3/4] Combine projects --- ...low.Launcher.Localization.Analyzers.csproj | 30 +++++++++---------- ...ncher.Localization.SourceGenerators.csproj | 27 +++++++++-------- .../Flow.Launcher.Localization.csproj | 15 ++++++++++ 3 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 Flow.Launcher.Localization/Flow.Launcher.Localization.csproj diff --git a/Flow.Launcher.Localization.Analyzers/Flow.Launcher.Localization.Analyzers.csproj b/Flow.Launcher.Localization.Analyzers/Flow.Launcher.Localization.Analyzers.csproj index fb94749..b22e7a5 100644 --- a/Flow.Launcher.Localization.Analyzers/Flow.Launcher.Localization.Analyzers.csproj +++ b/Flow.Launcher.Localization.Analyzers/Flow.Launcher.Localization.Analyzers.csproj @@ -1,19 +1,19 @@ - + - - 1.0.0 - netstandard2.0 - true - Flow.Launcher.Localization.Analyzers - + + 1.0.0 + netstandard2.0 + true + Flow.Launcher.Localization.Analyzers + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Flow.Launcher.Localization.SourceGenerators/Flow.Launcher.Localization.SourceGenerators.csproj b/Flow.Launcher.Localization.SourceGenerators/Flow.Launcher.Localization.SourceGenerators.csproj index f8b7ab7..784d8fc 100644 --- a/Flow.Launcher.Localization.SourceGenerators/Flow.Launcher.Localization.SourceGenerators.csproj +++ b/Flow.Launcher.Localization.SourceGenerators/Flow.Launcher.Localization.SourceGenerators.csproj @@ -1,17 +1,18 @@  - - 1.0.0 - netstandard2.0 - true - Flow.Launcher.Localization.SourceGenerators - + + 1.0.0 + netstandard2.0 + true + Flow.Launcher.Localization.SourceGenerators + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Flow.Launcher.Localization/Flow.Launcher.Localization.csproj b/Flow.Launcher.Localization/Flow.Launcher.Localization.csproj new file mode 100644 index 0000000..e572c05 --- /dev/null +++ b/Flow.Launcher.Localization/Flow.Launcher.Localization.csproj @@ -0,0 +1,15 @@ + + + + 1.0.0 + netstandard2.0 + true + Flow.Launcher.Localization + + + + + + + + From 14d45be64841aa095c304c2b8b6d03d4346634a5 Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Tue, 4 Mar 2025 13:22:21 +0800 Subject: [PATCH 4/4] Set roll forward to latestMajor --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index a4a3946..36e1a9e 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "9.0.200", - "rollForward": "latestMinor", + "version": "7.0.0", + "rollForward": "latestMajor", "allowPrerelease": false } } \ No newline at end of file