Upgrade project (netcore3.1 -> net8.0) (CSharpUtils -> LanguageUtils)

Mikescher · May 15, 2024 · 69db719 · 69db719
1 parent b4c5c8a
commit 69db719
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
+[Pp]ublish/
 x64/
 x86/
 bld/

diff --git a/Source/.run/linux-musl-x64-self-contained.run.xml b/Source/.run/linux-musl-x64-self-contained.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="linux-musl-x64-self-contained" type="DotNetFolderPublish" factoryName="Publish to folder">
+    <riderPublish configuration="Release" platform="Any CPU" produce_single_file="true" runtime="linux-musl-x64" self_contained="true" target_folder="$PROJECT_DIR$/../Publish/linux-musl-x64-self-contained" target_framework="net8.0" uuid_high="8351230986693332770" uuid_low="-5918065994023159266" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Source/.run/linux-x64-self-contained.run.xml b/Source/.run/linux-x64-self-contained.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="linux-x64-self-contained" type="DotNetFolderPublish" factoryName="Publish to folder">
+    <riderPublish configuration="Release" platform="Any CPU" produce_single_file="true" runtime="linux-x64" self_contained="true" target_folder="$PROJECT_DIR$/../Publish/linux-x64-self-contained" target_framework="net8.0" uuid_high="8351230986693332770" uuid_low="-5918065994023159266" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Source/.run/osx-arm64-self-contained.run.xml b/Source/.run/osx-arm64-self-contained.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="osx-arm64-self-contained" type="DotNetFolderPublish" factoryName="Publish to folder">
+    <riderPublish configuration="Release" platform="Any CPU" produce_single_file="true" runtime="osx-arm64" self_contained="true" target_folder="$PROJECT_DIR$/../Publish/osx-arm64-self-contained" target_framework="net8.0" uuid_high="8351230986693332770" uuid_low="-5918065994023159266" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Source/.run/osx-x64-self-contained.run.xml b/Source/.run/osx-x64-self-contained.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="osx-x64-self-contained" type="DotNetFolderPublish" factoryName="Publish to folder">
+    <riderPublish configuration="Release" platform="Any CPU" produce_single_file="true" runtime="osx-x64" self_contained="true" target_folder="$PROJECT_DIR$/../Publish/osx-x64-self-contained" target_framework="net8.0" uuid_high="8351230986693332770" uuid_low="-5918065994023159266" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Source/.run/win-portable.run.xml b/Source/.run/win-portable.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="win-portable" type="DotNetFolderPublish" factoryName="Publish to folder">
+    <riderPublish configuration="Release" platform="Any CPU" runtime="Portable" target_folder="$PROJECT_DIR$/../Publish/win-portable" target_framework="net8.0" uuid_high="8351230986693332770" uuid_low="-5918065994023159266" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Source/.run/win-x64-selfcontained.run.xml b/Source/.run/win-x64-selfcontained.run.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="win-x64-selfcontained" type="DotNetFolderPublish" factoryName="Publish to folder">
+    <riderPublish configuration="Release" platform="Any CPU" produce_single_file="true" runtime="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/../Publish/win-x64-selfcontained" target_framework="net8.0" uuid_high="8351230986693332770" uuid_low="-5918065994023159266" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Source/CSharpUtils b/Source/CSharpUtils
diff --git a/Source/SynoCtrl/Properties/Resources.resx b/Source/SynoCtrl/Properties/Resources.resx
@@ -122,6 +122,6 @@
     <value>..\Resources\cmd_schema.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="config_example" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\config_example.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>..\Resources\config_example.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>
diff --git a/Source/SynoCtrl/SynoCtrl.csproj b/Source/SynoCtrl/SynoCtrl.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <PropertyGroup>
     <Title>SynoCtrl</Title>
-    <Copyright>Copyright © Mikescher 2020</Copyright>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
-    <FileVersion>1.1.0</FileVersion>
-    <Version>1.1.0</Version>
+    <Copyright>Copyright © Mikescher 2024</Copyright>
+    <AssemblyVersion>1.2.0</AssemblyVersion>
+    <FileVersion>1.2.0</FileVersion>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -33,10 +33,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\CSharpUtils\CSharpUtils.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="Resources\config_example.txt" />
   </ItemGroup>
@@ -48,4 +44,8 @@
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\CSharpUtils\LanguageUtils\LanguageUtils.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Source/SynologyController.sln b/Source/SynologyController.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.28307.489
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SynoCtrl", "SynoCtrl\SynoCtrl.csproj", "{73E58855-EF17-4F22-ADDE-CE556CEE3A1E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpUtils", "CSharpUtils\CSharpUtils.csproj", "{D661CD9F-8934-496D-8332-BC82AAB77598}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageUtils", "CSharpUtils\LanguageUtils\LanguageUtils.csproj", "{4F0E4640-275E-418A-9084-6BDD5935622D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +17,10 @@ Global
 		{73E58855-EF17-4F22-ADDE-CE556CEE3A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73E58855-EF17-4F22-ADDE-CE556CEE3A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73E58855-EF17-4F22-ADDE-CE556CEE3A1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D661CD9F-8934-496D-8332-BC82AAB77598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D661CD9F-8934-496D-8332-BC82AAB77598}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D661CD9F-8934-496D-8332-BC82AAB77598}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D661CD9F-8934-496D-8332-BC82AAB77598}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F0E4640-275E-418A-9084-6BDD5935622D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F0E4640-275E-418A-9084-6BDD5935622D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F0E4640-275E-418A-9084-6BDD5935622D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F0E4640-275E-418A-9084-6BDD5935622D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE