Update to .NET 9 SDK (#2003)

- Build with the .NET 9 SDK. - Add tests TFM for `net9.0`. - Remove tests for `net6.0` TFM. - Run workflows on PRs to `dotnet-vnext` branch. - Only audit direct NuGet dependencies. - Fix IDE0022 warning. - Temporarily disable some tests that are failing in GitHub Actions. - Add usage of `[DebuggerDisableUserUnhandledExceptions]` to avoid newer versions of the Visual Studio debugger for breaking for exceptions on async code paths we are intentionally handling. - Bump version to 8.5.0.
App-vNext · Nov 12, 2024 · 520ee38 · 520ee38
1 parent 7567acc
commit 520ee38
Show file tree

Hide file tree

Showing 52 changed files with 143 additions and 57 deletions.
diff --git a/.github/workflows/actions-lint.yml b/.github/workflows/actions-lint.yml
@@ -2,13 +2,18 @@ name: actions-lint
 
 on:
   push:
-    branches: [ main, release/* ]
+    branches:
+      - main
+      - release/*
     paths-ignore:
       - '**/*.gitattributes'
       - '**/*.gitignore'
       - '**/*.md'
   pull_request:
-    branches: [ main, release/* ]
+    branches:
+      - main
+      - release/*
+      - dotnet-vnext
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,10 +2,15 @@ name: build
 
 on:
   push:
-    branches: [ main, release/* ]
+    branches:
+      - main
+      - release/*
     tags: [ '*' ]
   pull_request:
-    branches: [ main, release/* ]
+    branches:
+      - main
+      - release/*
+      - dotnet-vnext
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -2,7 +2,10 @@ name: dependency-review
 
 on:
   pull_request:
-    branches: [ main, release/* ]
+    branches: 
+      - main
+      - release/*
+      - dotnet-vnext
 
 permissions:
   contents: read

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -2,9 +2,14 @@ name: github-pages
 
 on:
   push:
-    branches: [ main, release/* ]
+    branches:
+      - main
+      - release/*
   pull_request:
-    branches: [ main, release/* ]
+    branches:
+      - main
+      - release/*
+      - dotnet-vnext
   workflow_dispatch:
 
 permissions:
@@ -14,6 +19,7 @@ jobs:
 
   build-docs:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
 
     steps:
 
@@ -37,6 +43,8 @@ jobs:
       uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
 
     - name: Generate documentation
+      env:
+        DOTNET_ROLL_FORWARD: LatestMajor
       run: |
         dotnet tool restore
         dotnet build --configuration Release /p:SKIP_POLLY_ANALYZERS=true

diff --git a/.github/workflows/on-push-do-docs.yml b/.github/workflows/on-push-do-docs.yml
@@ -2,7 +2,7 @@ name: on-push-do-docs
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
     paths: [ "src/Snippets/**" ]
   workflow_dispatch:
 

diff --git a/.github/workflows/updater-approve.yml b/.github/workflows/updater-approve.yml
@@ -2,7 +2,10 @@ name: updater-approve
 
 on:
   pull_request:
-    branches: [ main, release/* ]
+    branches: 
+      - main
+      - release/*
+      - dotnet-vnext
 
 permissions:
   contents: read

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,6 +4,10 @@
     <PollyVersion>8.4.2</PollyVersion>
     <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
+    <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsTimeProviderVersion>9.0.0</MicrosoftExtensionsTimeProviderVersion>
+  </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
@@ -41,6 +45,7 @@
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="System.Threading.RateLimiting" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />

diff --git a/bench/Polly.Benchmarks/Polly.Benchmarks.csproj b/bench/Polly.Benchmarks/Polly.Benchmarks.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ProjectType>Benchmark</ProjectType>
     <NoWarn>$(NoWarn);CA1822;IDE0060</NoWarn>

diff --git a/bench/Polly.Core.Benchmarks/Polly.Core.Benchmarks.csproj b/bench/Polly.Core.Benchmarks/Polly.Core.Benchmarks.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     <RootNamespace>Polly</RootNamespace>
     <ImplicitUsings>true</ImplicitUsings>
     <ProjectType>Benchmark</ProjectType>

diff --git a/bench/benchmarks.ps1 b/bench/benchmarks.ps1
@@ -20,6 +20,6 @@ if ($Interactive -ne $true) {
 
 $project = Join-Path "Polly.Core.Benchmarks" "Polly.Core.Benchmarks.csproj"
 
-dotnet run --configuration $Configuration --framework net8.0 --project $project $additionalArgs
+dotnet run --configuration $Configuration --framework net9.0 --project $project $additionalArgs
 
 exit $LASTEXITCODE
diff --git a/eng/Common.targets b/eng/Common.targets
@@ -4,6 +4,7 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\Polly.snk</AssemblyOriginatorKeyFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>latest</LangVersion>
+    <NuGetAuditMode>direct</NuGetAuditMode>
     <SignAssembly>true</SignAssembly>
     <PollyStrongNamePublicKey Condition=" '$(SignAssembly)' == 'true' ">0024000004800000940000000602000000240000525341310004000001000100150819e3494f97263a3abdd18e5e0c47b04e6c0ede44a6c51d50b545d403ceeb7cbb32d18dbbbcdd1d88a87d7b73206b126be134b0609c36aa3cb31dd2e47e393293102809b8d77f192f3188618a42e651c14ebf05f8f5b76aa91b431642b23497ed82b65d63791cdaa31d4282a2d6cbabc3fe0745b6b6690c417cabf6a1349c</PollyStrongNamePublicKey>
   </PropertyGroup>
@@ -19,12 +20,12 @@
   </ItemGroup>
 
   <PropertyGroup Label="MinVer">
-    <MinVerMinimumMajorMinor>8.4</MinVerMinimumMajorMinor>
+    <MinVerMinimumMajorMinor>8.5</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
   <Target Name="CustomizeVersions" AfterTargets="MinVer" Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <PropertyGroup>
-      <FileVersion>$([MSBuild]::ValueOrDefault('$(MinVerMajor)', '8')).$([MSBuild]::ValueOrDefault('$(MinVerMinor)', '4')).$([MSBuild]::ValueOrDefault('$(MinVerPatch)', '0')).$(GITHUB_RUN_NUMBER)</FileVersion>
+      <FileVersion>$([MSBuild]::ValueOrDefault('$(MinVerMajor)', '8')).$([MSBuild]::ValueOrDefault('$(MinVerMinor)', '5')).$([MSBuild]::ValueOrDefault('$(MinVerPatch)', '0')).$(GITHUB_RUN_NUMBER)</FileVersion>
     </PropertyGroup>
     <PropertyGroup Condition="$(GITHUB_REF.StartsWith(`refs/pull/`))">
       <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-pr.$(GITHUB_REF_NAME.Replace(`/merge`, ``)).$(GITHUB_RUN_NUMBER)</PackageVersion>

diff --git a/eng/Library.targets b/eng/Library.targets
@@ -14,7 +14,7 @@
 
   <PropertyGroup Label="NuGet package validation">
     <EnablePackageValidation Condition="'$(EnablePackageValidation)' == ''">true</EnablePackageValidation>
-    <PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">8.2.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">8.4.2</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="SourceLink">

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

diff --git a/samples/Chaos/Chaos.csproj b/samples/Chaos/Chaos.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Chaos</RootNamespace>
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Polly.Core" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/DependencyInjection/DependencyInjection.csproj b/samples/DependencyInjection/DependencyInjection.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,6 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Polly.Extensions" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Extensibility/Extensibility.csproj b/samples/Extensibility/Extensibility.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/GenericPipelines/GenericPipelines.csproj b/samples/GenericPipelines/GenericPipelines.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/Intro/Intro.csproj b/samples/Intro/Intro.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/Retries/Retries.csproj b/samples/Retries/Retries.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Polly.Core/Hedging/Controller/TaskExecution.cs b/src/Polly.Core/Hedging/Controller/TaskExecution.cs
@@ -199,6 +199,7 @@ public async ValueTask ResetAsync()
         _stopExecutionTimestamp = 0;
     }
 
+    [DebuggerDisableUserUnhandledExceptions]
     private async Task ExecuteSecondaryActionAsync(Func<ValueTask<Outcome<T>>> action)
     {
         Outcome<T> outcome;
@@ -218,6 +219,7 @@ private async Task ExecuteSecondaryActionAsync(Func<ValueTask<Outcome<T>>> actio
 
     private async Task ExecuteCreateActionException(Exception e) => await UpdateOutcomeAsync(Polly.Outcome.FromException<T>(e)).ConfigureAwait(Context.ContinueOnCapturedContext);
 
+    [DebuggerDisableUserUnhandledExceptions]
     private async Task ExecutePrimaryActionAsync<TState>(Func<ResilienceContext, TState, ValueTask<Outcome<T>>> primaryCallback, TState state)
     {
         Outcome<T> outcome;

diff --git a/src/Polly.Core/Outcome.TResult.cs b/src/Polly.Core/Outcome.TResult.cs
@@ -90,5 +90,4 @@ internal TResult GetResultOrRethrow()
         ExceptionDispatchInfo?.Throw();
         return Result!;
     }
-
 }
diff --git a/src/Polly.Core/Polly.Core.csproj b/src/Polly.Core/Polly.Core.csproj
@@ -36,4 +36,8 @@
     <PackageReference Include="System.ComponentModel.Annotations" Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
+    <Compile Include="$(MSBuildThisFileDirectory)..\Shared\DebuggerDisableUserUnhandledExceptionsAttribute.cs" Link="DebuggerDisableUserUnhandledExceptionsAttribute.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Polly.Core/ResilienceContext.cs b/src/Polly.Core/ResilienceContext.cs
@@ -74,9 +74,11 @@ internal void InitializeFrom(ResilienceContext context, CancellationToken cancel
         Properties.AddOrReplaceProperties(context.Properties);
     }
 
+#pragma warning disable S3236 // Remove this argument from the method call; it hides the caller information.
     [ExcludeFromCodeCoverage]
     [Conditional("DEBUG")]
     internal void AssertInitialized() => Debug.Assert(IsInitialized, "The resilience context is not initialized.");
+#pragma warning restore S3236 // Remove this argument from the method call; it hides the caller information.
 
     internal ResilienceContext Initialize<TResult>(bool isSynchronous)
     {

diff --git a/src/Polly.Core/ResiliencePipeline.Async.cs b/src/Polly.Core/ResiliencePipeline.Async.cs
@@ -25,7 +25,7 @@ public async ValueTask ExecuteAsync<TState>(
         InitializeAsyncContext(context);
 
         var outcome = await Component.ExecuteCore(
-            static async (context, state) =>
+            [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
             {
                 try
                 {
@@ -60,7 +60,7 @@ public async ValueTask ExecuteAsync(
         InitializeAsyncContext(context);
 
         var outcome = await Component.ExecuteCore(
-            static async (context, state) =>
+            [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
             {
                 try
                 {
@@ -99,7 +99,7 @@ public async ValueTask ExecuteAsync<TState>(
         try
         {
             var outcome = await Component.ExecuteCore(
-                static async (context, state) =>
+                [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
                 {
                     try
                     {
@@ -140,7 +140,7 @@ public async ValueTask ExecuteAsync(
         try
         {
             var outcome = await Component.ExecuteCore(
-                static async (context, state) =>
+                [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
                 {
                     try
                     {

diff --git a/src/Polly.Core/ResiliencePipeline.AsyncT.cs b/src/Polly.Core/ResiliencePipeline.AsyncT.cs
@@ -53,7 +53,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult, TState>(
         InitializeAsyncContext<TResult>(context);
 
         var outcome = await Component.ExecuteCore(
-            static async (context, state) =>
+            [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
             {
                 try
                 {
@@ -88,7 +88,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult>(
         InitializeAsyncContext<TResult>(context);
 
         var outcome = await Component.ExecuteCore(
-            static async (context, state) =>
+            [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
             {
                 try
                 {
@@ -127,7 +127,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult, TState>(
         try
         {
             var outcome = await Component.ExecuteCore(
-                static async (context, state) =>
+                [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
                 {
                     try
                     {
@@ -168,7 +168,7 @@ public async ValueTask<TResult> ExecuteAsync<TResult>(
         try
         {
             var outcome = await Component.ExecuteCore(
-                static async (context, state) =>
+                [DebuggerDisableUserUnhandledExceptions] static async (context, state) =>
                 {
                     try
                     {