Merge pull request #1401 from autofac/feature/net8

Update build/target frameworks for .NET 8; remove netcoreapp3.1.

Author: tillig

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
   "recommendations": [
-    "formulahendry.dotnet-test-explorer",
-    "ms-dotnettools.csharp",
+    "ms-dotnettools.csdevkit",
     "editorconfig.editorconfig",
     "davidanson.vscode-markdownlint"
   ]

.vscode/settings.json

@@ -8,20 +8,20 @@
     "diagnoser",
     "inheritdoc",
     "langword",
+    "netcoreapp",
     "netstandard",
     "notnull",
     "paramref",
     "startable",
     "subclassing",
     "typeparam",
+    "unconfigured",
     "xunit"
   ],
-  "dotnet-test-explorer.testProjectPath": "test/**/*Test.csproj",
   "dotnet.defaultSolution": "Autofac.sln",
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "*.resx": "$(capture).*.resx, $(capture).designer.cs, $(capture).designer.vb"
   },
-  "omnisharp.enableEditorConfigSupport": true,
-  "omnisharp.enableRoslynAnalyzers": true
+  "omnisharp.enableEditorConfigSupport": true
 }

appveyor.yml

@@ -1,9 +1,9 @@
 image: Ubuntu
 
-version: "7.1.0.{build}"
+version: "8.0.0.{build}"
 
 dotnet_csproj:
-  version_prefix: "7.1.0"
+  version_prefix: "8.0.0"
   patch: true
   file: 'src\**\*.csproj'
 

bench/Autofac.BenchmarkProfiling/Autofac.BenchmarkProfiling.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
   </ItemGroup>
 
   <ItemGroup>

bench/Autofac.Benchmarks/Autofac.Benchmarks.csproj

@@ -34,10 +34,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

bench/Autofac.Benchmarks/ConcurrencyBenchmark.cs

@@ -45,7 +45,7 @@ public async Task MultipleResolvesOnMultipleTasks()
                 }
                 catch (Exception ex)
                 {
-                    Assert.True(false, ex.ToString());
+                    Assert.Fail(ex.ToString());
                 }
             });
             tasks.Add(task);

bench/Autofac.Benchmarks/ConcurrencyNestedScopeBenchmark.cs

@@ -55,7 +55,7 @@ public async Task MultipleResolvesOnMultipleTasks()
                 }
                 catch (Exception ex)
                 {
-                    Assert.True(false, ex.ToString());
+                    Assert.Fail(ex.ToString());
                 }
             });
             tasks.Add(task);

build/Analyzers.ruleset

@@ -4,8 +4,16 @@
   <Rules AnalyzerId="Microsoft.Usage" RuleNamespace="Microsoft.Usage">
     <!-- Implement standard exception constructors - not all of the exception constructors (e.g., parameterless) are desired in our system. -->
     <Rule Id="CA1032" Action="None" />
+    <!-- Use ArgumentNullException.ThrowIfNull - this isn't available until we stop targeting netstandard. -->
+    <Rule Id="CA1510" Action="None" />
+    <!-- Use ArgumentOutOfRangeException.ThrowIfNegative - this isn't available until we stop targeting anything below net8.0. -->
+    <Rule Id="CA1512" Action="None" />
+    <!-- Use ObjectDisposedException.ThrowIf - this isn't available until we stop targeting anything below net8.0. -->
+    <Rule Id="CA1513" Action="None" />
     <!-- Change names to avoid reserved word overlaps (e.g., Delegate, GetType, etc.) - too many of these in the public API, we'd break if we fixed it. -->
     <Rule Id="CA1716" Action="None" />
+    <!-- Cache a CompositeFormat object for use in String.Format - this isn't available until we stop targeting netstandard, and we only String.Format when throwing exceptions so the work/complexity isn't justified to increase perf just for those situations. -->
+    <Rule Id="CA1863" Action="None" />
     <!-- Implement serialization constructors - false positive when building .NET Core -->
     <Rule Id="CA2229" Action="None" />
     <!-- Mark ISerializable types with SerializableAttribute - false positive when building .NET Core -->

codegen/Autofac.CodeGen/Autofac.CodeGen.csproj

@@ -12,6 +12,7 @@
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,8 +24,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

global.json

@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "7.0.203",
+    "version": "8.0.100-rc.2.23502.2",
     "rollForward": "latestFeature"
   },
 
   "additionalSdks": [
-    "3.1.426",
-    "6.0.408"
+    "6.0.416",
+    "7.0.403"
   ]
 }