Update to .NET (#124)

This change updates the project to .NET 9 and removes support for .NET 6. I've also removed the benchmarks project as it's really not necessary.
craigktreasure · Nov 17, 2024 · e8b7c3d · e8b7c3d
1 parent b3152b8
commit e8b7c3d
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 280 deletions.
diff --git a/.github/actions/install-tools/action.yml b/.github/actions/install-tools/action.yml
@@ -7,9 +7,8 @@ runs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-            6.x
-            7.x
             8.x
+            9.x
 
     - name: Install .NET tools
       shell: pwsh

diff --git a/Treasure.Utils.sln b/Treasure.Utils.sln
@@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.json = version.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Treasure.Utils.Argument.Benchmarks", "test\Treasure.Utils.Argument.Benchmarks\Treasure.Utils.Argument.Benchmarks.csproj", "{AB3B36BF-791F-4DC2-8B53-4BA812A80E86}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7C628D75-6B6A-4D42-A4D9-45C6ACA51FB5}"
 	ProjectSection(SolutionItems) = preProject
 		src\Directory.Packages.props = src\Directory.Packages.props
@@ -50,17 +48,12 @@ Global
 		{EF141707-718F-49EC-99B9-8D7B59CBCCEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF141707-718F-49EC-99B9-8D7B59CBCCEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF141707-718F-49EC-99B9-8D7B59CBCCEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB3B36BF-791F-4DC2-8B53-4BA812A80E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB3B36BF-791F-4DC2-8B53-4BA812A80E86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB3B36BF-791F-4DC2-8B53-4BA812A80E86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB3B36BF-791F-4DC2-8B53-4BA812A80E86}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{EF141707-718F-49EC-99B9-8D7B59CBCCEF} = {B012001D-4B86-460D-A3E1-FC3EEC840D13}
-		{AB3B36BF-791F-4DC2-8B53-4BA812A80E86} = {B012001D-4B86-460D-A3E1-FC3EEC840D13}
 		{7C628D75-6B6A-4D42-A4D9-45C6ACA51FB5} = {A18B8F8E-8296-4968-A569-16F3F4FE045E}
 		{61D20241-7C98-4A60-AA8D-C7614B7D6768} = {A18B8F8E-8296-4968-A569-16F3F4FE045E}
 	EndGlobalSection

diff --git a/eng/DotNetAnalyzers.props b/eng/DotNetAnalyzers.props
@@ -7,7 +7,7 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <AnalysisLevel>8.0</AnalysisLevel>
+    <AnalysisLevel>9.0</AnalysisLevel>
   </PropertyGroup>
 
 </Project>
diff --git a/eng/DotNetDefaults.props b/eng/DotNetDefaults.props
@@ -10,7 +10,7 @@
     <!-- Sets the C# language version:
       https://docs.microsoft.com/dotnet/csharp/language-reference/configure-language-version#c-language-version-reference
     -->
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>latest</LangVersion>
 
     <!-- Enable implicit usings:
       https://docs.microsoft.com/dotnet/core/project-sdk/overview#implicit-using-directives

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.100",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   },

diff --git a/src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj b/src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Treasure.Utils</RootNamespace>
 
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/test/.editorconfig b/test/.editorconfig
@@ -2,5 +2,8 @@ root = false
 
 [*.cs]
 
+# CA1515: Consider making public types internal
+dotnet_diagnostic.CA1515.severity = none
+
 # CS1591: Missing XML comment for publicly visible type or member
 dotnet_diagnostic.CS1591.severity = suggestion
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -20,7 +20,7 @@
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <!-- Setup TFM properties for testing .NET Standard TFM's on supported platforms. -->
     <PlatformTFMSuffix Condition="$([MSBuild]::IsOSPlatform('Windows'))">-windows</PlatformTFMSuffix>
-    <DefaultNetStandardTestTFM >net6.0$(PlatformTFMSuffix)</DefaultNetStandardTestTFM>
+    <DefaultNetStandardTestTFM >net8.0$(PlatformTFMSuffix)</DefaultNetStandardTestTFM>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/Treasure.Utils.Argument.Benchmarks/Combine.ps1 b/test/Treasure.Utils.Argument.Benchmarks/Combine.ps1
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Program.cs b/test/Treasure.Utils.Argument.Benchmarks/Program.cs
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Run.ps1 b/test/Treasure.Utils.Argument.Benchmarks/Run.ps1
diff --git a/test/Treasure.Utils.Argument.Benchmarks/Treasure.Utils.Argument.Benchmarks.csproj b/test/Treasure.Utils.Argument.Benchmarks/Treasure.Utils.Argument.Benchmarks.csproj
diff --git a/test/Treasure.Utils.Argument.Tests/Treasure.Utils.Argument.Tests.csproj b/test/Treasure.Utils.Argument.Tests/Treasure.Utils.Argument.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);$(DefaultNetStandardTestTFM)</TargetFrameworks>
     <RootNamespace>Treasure.Utils.Tests</RootNamespace>
   </PropertyGroup>