Drop .NET 6 support and modernize dependencies

.github/workflows/codeQL.yml

@@ -39,7 +39,7 @@ jobs:
     steps:
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -49,25 +49,12 @@ jobs:
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v7
       with:
         submodules: true
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-
-    - name: Set up .NET Core 2.1
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '2.1.x'
-
-    - name: Set up .NET Core 3.1
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '3.1.x'
-
     - name: Set up .NET 8
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v6
       with:
         dotnet-version: '8.0.x'
 
@@ -79,6 +66,6 @@ jobs:
 
     # Run CodeQL analysis
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

Directory.Packages.props

@@ -9,110 +9,105 @@
 
   <!-- Product dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Azure.Core" Version="1.44.1" />
+    <PackageVersion Include="Azure.Core" Version="1.61.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="Azure.Data.Tables" Version="12.11.0" />
-    <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
-    <PackageVersion Include="Azure.Storage.Blobs" Version="12.27.0" />
-    <PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
+    <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.2" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.29.1" />
+    <PackageVersion Include="Azure.Storage.Queues" Version="12.27.1" />
     <PackageVersion Include="Castle.Core" Version="5.2.1" />
-    <PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net48' OR '$(TargetFramework)' == 'net472'" />
-    <PackageVersion Include="ImpromptuInterface" Version="7.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+    <PackageVersion Include="ImpromptuInterface" Version="8.0.6" Condition="'$(TargetFramework)' == 'net48' OR '$(TargetFramework)' == 'net472'" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.23.0" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.10" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.Data.Services.Client" Version="5.8.5" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
     <PackageVersion Include="Microsoft.ServiceFabric" Version="6.4.617" />
     <PackageVersion Include="Microsoft.ServiceFabric.Data" Version="3.3.617" />
     <PackageVersion Include="Microsoft.ServiceFabric.Services" Version="3.3.617" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
-    <PackageVersion Include="System.Collections.Immutable" Version="1.2.0" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Reactive.Compatibility" Version="4.4.1" />
-    <PackageVersion Include="System.Reactive.Core" Version="4.4.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.301" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageVersion Include="OpenTelemetry.Api" Version="1.17.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="10.0.10" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.10" />
+    <PackageVersion Include="System.Linq.Async" Version="7.0.1" />
+    <PackageVersion Include="System.Reactive.Compatibility" Version="6.1.0" />
+    <PackageVersion Include="System.Reactive.Core" Version="6.1.0" />
   </ItemGroup>
 
   <!-- Product dependencies with net48 only-->
   <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-    <PackageVersion Include="Microsoft.Azure.KeyVault.Core" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Azure.KeyVault.Core" Version="3.0.5" />
     <PackageVersion Include="Microsoft.Data.Edm" Version="5.8.5" />
     <PackageVersion Include="Microsoft.Data.OData" Version="5.8.5" />
-    <PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.1" />
+    <PackageVersion Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
+    <PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
     <PackageVersion Include="System.Spatial" Version="5.8.5" />
-    <PackageVersion Include="WindowsAzure.ServiceBus" Version="4.1.3" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.36.0" />
+    <PackageVersion Include="WindowsAzure.ServiceBus" Version="7.0.1" />
   </ItemGroup>
 
   <!-- Test dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.8.1" />
+    <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.8.3" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net48'" />
     <PackageVersion Include="EnterpriseLibrary.SemanticLogging.EventSourceAnalyzer.NetCore" Version="2.0.1406.4" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.5.6" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageVersion Include="Moq" Version="4.10.0" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.5.0" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.5.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.13.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="4.3.3" />
+    <PackageVersion Include="MSTest.TestFramework" Version="4.3.3" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.10" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.8" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.10" />
     <PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net48'" />
   </ItemGroup>
 
   <!-- Test dependencies with net8.0-->
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageVersion Include="EnterpriseLibrary.SemanticLogging.NetCore" Version="2.0.1406.4" />
-    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
   </ItemGroup>
 
   <!-- Test dependencies with net472-->
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Owin" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.3" />
   </ItemGroup>
 
   <!-- Test dependencies with net48-->
   <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
     <PackageVersion Include="EnterpriseLibrary.SemanticLogging" version="2.0.1406.1" />
     <PackageVersion Include="EnterpriseLibrary.SemanticLogging.TextFile" version="2.0.1406.1" />
-    <PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
+    <PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.3" />
     <PackageVersion Include="Microsoft.Tpl.Dataflow" version="4.5.24" />
   </ItemGroup>
 
   <!-- Samples dependencies -->
   <ItemGroup>
-    <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.23.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
-    <PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.17.3" />
+    <PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.17.5" />
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.14.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.10" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.17.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.17.0" />
     <PackageVersion Include="Vio.DurableTask.Hosting" Version="2.2.17" />
   </ItemGroup>
 
-  <!-- Dependencies specific to net8.0-->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.10" />
   </ItemGroup>
 
 

Test/DurableTask.AzureStorage.Tests/Storage/DurableTaskStorageExceptionTests.cs

@@ -30,7 +30,7 @@ public void MissingRequestFailedException()
             Assert.IsFalse(exception.LeaseLost);
         }
 
-        [DataTestMethod]
+        [TestMethod]
         [DataRow(true, HttpStatusCode.Conflict, nameof(BlobErrorCode.LeaseLost))]
         [DataRow(false, HttpStatusCode.Conflict, nameof(BlobErrorCode.LeaseNotPresentWithBlobOperation))]
         [DataRow(false, HttpStatusCode.NotFound, nameof(BlobErrorCode.BlobNotFound))]

docs/getting-started/installation.md

@@ -4,7 +4,7 @@ This guide covers installing the Durable Task Framework (DTFx) packages for your
 
 ## Prerequisites
 
-- .NET 6.0 or later (.NET 10.0 is currently recommended)
+- .NET 8.0 or later (.NET 10.0 is currently recommended)
 - .NET Framework 4.7.2 or later (for .NET Framework projects)
 
 ## NuGet Packages

docs/providers/service-bus.md

@@ -59,7 +59,7 @@ var client = new TaskHubClient(service, loggerFactory: loggerFactory);
 
 ### Using Managed Identity
 
-The Service Bus provider supports managed identity authentication (.NET Standard 2.0+):
+The Service Bus provider supports managed identity authentication on .NET 8.0 or later and on the .NET Framework 4.7.2 (`net472`) target:
 
 ```csharp
 using Azure.Identity;

eng/templates/build.yml

@@ -10,6 +10,12 @@ jobs:
                 sbomPackageName: 'DurableTask SBOM'
 
       steps:
+      - task: UseDotNet@2
+        displayName: 'Use the .NET 8 SDK'
+        inputs:
+          packageType: 'sdk'
+          version: '8.0.x'
+
       # Start by restoring all the dependencies. This needs to be its own task
       # from what I can tell. We specifically only target DurableTask.AzureStorage
       # and its direct dependencies.
@@ -34,7 +40,7 @@ jobs:
         displayName: 'Build (AzureStorage)'
         inputs:
           solution: 'src/DurableTask.AzureStorage/DurableTask.AzureStorage.sln'
-          vsVersion: '16.0'
+          vsVersion: '17.0'
           logFileVerbosity: minimal
           configuration: Release
           msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
@@ -43,7 +49,7 @@ jobs:
         displayName: 'Build (ApplicationInsights)'
         inputs:
           solution: 'src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj'
-          vsVersion: '16.0'
+          vsVersion: '17.0'
           logFileVerbosity: minimal
           configuration: Release
           msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
@@ -52,7 +58,7 @@ jobs:
         displayName: 'Build (Emulator)'
         inputs:
           solution: 'src/DurableTask.Emulator/DurableTask.Emulator.csproj'
-          vsVersion: '16.0'
+          vsVersion: '17.0'
           logFileVerbosity: minimal
           configuration: Release
           msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
@@ -61,7 +67,7 @@ jobs:
         displayName: 'Build (ServiceBus)'
         inputs:
           solution: 'src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj'
-          vsVersion: '16.0'
+          vsVersion: '17.0'
           logFileVerbosity: minimal
           configuration: Release
           platform: x64
@@ -71,18 +77,12 @@ jobs:
         displayName: 'Build (AzureServiceFabric)'
         inputs:
           solution: 'src/DurableTask.AzureServiceFabric/DurableTask.AzureServiceFabric.csproj'
-          vsVersion: '16.0'
+          vsVersion: '17.0'
           logFileVerbosity: minimal
           configuration: Release
           platform: x64
           msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
 
-      #- task: UseDotNet@2
-      #  displayName: 'Use the .NET Core 6 SDK (required for build signing)'
-      #  inputs:
-      #    packageType: 'sdk'
-      #    version: '6.x.x'
-
       - template: ci/sign-files.yml@eng
         parameters:
           displayName: Sign assemblies

samples/Correlation.Samples/docs/getting-started.md

@@ -6,7 +6,7 @@ In this tutorial, you can configure and execute a distributed tracing sample app
 
 The sample application requires these tools. If you don't have it, please click the following link and install it or create it on your Azure subscription.
 
-- [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/)
+- [Visual Studio 2022 17.8+](https://visualstudio.microsoft.com/vs/)
 - [Storage Emulator 5.9+](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator)
 - [Application Insights](https://docs.microsoft.com/en-us/azure/azure-monitor/app/create-new-resource)
 - [Azure Subscription](https://azure.microsoft.com/en-us/)

samples/DistributedTraceSample/ApplicationInsights/README.md

@@ -4,7 +4,7 @@ This sample demonstrates direct integration with Azure Application Insights for
 
 ## Prerequisites
 
-- .NET 6.0 SDK or later
+- .NET 8.0 SDK or later
 - Azure Storage Emulator (Azurite) or Azure Storage account
 - Azure Application Insights resource
 

samples/DistributedTraceSample/README.md

@@ -44,7 +44,7 @@ services.TryAddEnumerable(
 
 ## Prerequisites
 
-- .NET 6.0 SDK or later
+- .NET 8.0 SDK or later
 - Azure Storage Emulator (Azurite) or Azure Storage account
 - (Optional) Application Insights resource
 - (Optional) Zipkin instance for OpenTelemetry sample

src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj

@@ -2,7 +2,7 @@
 
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net472</TargetFrameworks>
         <PackageId>Microsoft.Azure.DurableTask.ApplicationInsights</PackageId>
         <NoWarn>NU5125;CS7035</NoWarn>  <!-- TODO: addition of CS7035 (version format doesn't follow convention) is a temporary workaround during 1ES migration -->
     </PropertyGroup>

src/DurableTask.AzureServiceFabric/DurableTask.AzureServiceFabric.csproj

@@ -24,12 +24,6 @@
     <Reference Include="System.Web" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <!-- Restoring packages for netstandard2.0 causes warnings. As warnings are treated as errors, compilation will fail. -->
-    <!-- Once the packages support netstandard2.0, this project will support netstandard2.0. -->
-    <PackageReference Include="Newtonsoft.Json" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="ImpromptuInterface" />
     <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" />

src/DurableTask.AzureServiceFabric/README.md

@@ -41,7 +41,7 @@ There are pre-requisites for setting up this project for developing or making co
 
 ## .Net Targets
 
-Currently this project supports .Net 4.6.1, which is framework version of 'netstandard2.0'. Some of the dependency packages do not have support for 'netstandard2.0', once those packages support 'netstandard2.0' this project will also support the same.
+This project supports .NET Framework 4.7.2 or later.
 
 ## Main Contributors