From f796c8485f16376c09a3f1b0dbcd7919c5a790fa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 25 Nov 2025 19:43:55 +0000
Subject: [PATCH 1/5] Initial plan


From 3085a3550eb26933d2413eab2065303d73901ef1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 25 Nov 2025 19:52:59 +0000
Subject: [PATCH 2/5] Add net10.0 target for DurableTask.AzureStorage with
 conditional package references

Co-authored-by: Arithmomaniac <654897+Arithmomaniac@users.noreply.github.com>
---
 .../DurableTask.AzureStorage.csproj              | 16 +++++++++++++---
 .../OrchestrationSessionManager.cs               |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index 8ff135fbd..3bf10fea7 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -2,7 +2,7 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IncludeSymbols>true</IncludeSymbols>
     <Description>Azure Storage provider extension for the Durable Task Framework.</Description>
@@ -18,6 +18,11 @@
     <NoWarn>NU5125;NU5048;CS7035</NoWarn> <!-- TODO: addition of CS7035 (version format doesn't follow convention) is a temporary workaround during 1ES migration -->
   </PropertyGroup>
 
+  <!-- Suppress warnings for obsolete APIs and nullable references for net10.0 that are not applicable to netstandard2.0 -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <NoWarn>$(NoWarn);SYSLIB0014;SYSLIB0050;SYSLIB0051;CS8600;CS8601;CS8602;CS8603;CS8604;CS8767;CS0618;CS0672</NoWarn>
+  </PropertyGroup>
+
   <!-- Version Info -->
   <PropertyGroup>
     <MajorVersion>2</MajorVersion>
@@ -40,12 +45,17 @@
     <Version>$(VersionPrefix)-$(VersionSuffix)</Version>
   </PropertyGroup>
 
+  <!-- Packages for netstandard2.0 only - not needed in net10.0 which has built-in async LINQ -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+    <PackageReference Include="System.Linq.Async" />
+  </ItemGroup>
+
+  <!-- Common packages for all target frameworks -->
   <ItemGroup>
     <PackageReference Include="Azure.Data.Tables" />
     <PackageReference Include="Azure.Storage.Blobs" />
     <PackageReference Include="Azure.Storage.Queues" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    <PackageReference Include="System.Linq.Async" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DurableTask.AzureStorage/OrchestrationSessionManager.cs b/src/DurableTask.AzureStorage/OrchestrationSessionManager.cs
index 51a6e07ba..f880c108d 100644
--- a/src/DurableTask.AzureStorage/OrchestrationSessionManager.cs
+++ b/src/DurableTask.AzureStorage/OrchestrationSessionManager.cs
@@ -273,7 +273,7 @@ async Task<IEnumerable<MessageData>> DedupeExecutionStartedMessagesAsync(
             // "Remote" -> the instance ID info comes from the Instances table that we're querying
             IAsyncEnumerable<OrchestrationState> instances = this.trackingStore.GetStateAsync(instanceIds, cancellationToken);
             IDictionary<string, OrchestrationState> remoteOrchestrationsById = 
-                await instances.ToDictionaryAsync(o => o.OrchestrationInstance.InstanceId, cancellationToken);
+                await instances.ToDictionaryAsync(o => o.OrchestrationInstance.InstanceId, cancellationToken: cancellationToken);
 
             foreach (MessageData message in executionStartedMessages)
             {

From 450c7a700aa442c55a73b389311b80403e5e7e1d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 26 Nov 2025 07:22:22 +0000
Subject: [PATCH 3/5] Update CI/CD to install .NET 10 SDK for net10.0 target

Co-authored-by: Arithmomaniac <654897+Arithmomaniac@users.noreply.github.com>
---
 .github/workflows/codeQL.yml  | 5 +++++
 eng/templates/build-steps.yml | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/.github/workflows/codeQL.yml b/.github/workflows/codeQL.yml
index 58eac188b..590b8b942 100644
--- a/.github/workflows/codeQL.yml
+++ b/.github/workflows/codeQL.yml
@@ -66,6 +66,11 @@ jobs:
       with:
         dotnet-version: '3.1.x'
 
+    - name: Set up .NET 10
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '10.0.x'
+
     - name: Restore dependencies
       run: dotnet restore $solution
 
diff --git a/eng/templates/build-steps.yml b/eng/templates/build-steps.yml
index 746a1dba7..4caaa20af 100644
--- a/eng/templates/build-steps.yml
+++ b/eng/templates/build-steps.yml
@@ -30,6 +30,12 @@ steps:
     packageType: 'sdk'
     version: '6.0.x'
 
+- task: UseDotNet@2
+  displayName: 'Use the .NET 10 SDK'
+  inputs:
+    packageType: 'sdk'
+    version: '10.0.x'
+
 - task: DotNetCoreCLI@2
   displayName: 'Restore nuget dependencies'
   inputs:

From a1c612dd0c1e446c417db56c698b87ddda64ab2c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 26 Nov 2025 07:41:10 +0000
Subject: [PATCH 4/5] Add net10.0 target for DurableTask.ApplicationInsights

Co-authored-by: Arithmomaniac <654897+Arithmomaniac@users.noreply.github.com>
---
 .../DurableTask.ApplicationInsights.csproj         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
index 02f79492c..017069453 100644
--- a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
+++ b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
@@ -2,12 +2,17 @@
 
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
         <PackageId>Microsoft.Azure.DurableTask.ApplicationInsights</PackageId>
         <!-- NuGet licenseUrl and PackageIconUrl/iconUrl deprecation. -->
         <NoWarn>NU5125;NU5048;CS7035</NoWarn>  <!-- TODO: addition of CS7035 (version format doesn't follow convention) is a temporary workaround during 1ES migration -->
     </PropertyGroup>
 
+    <!-- Suppress warnings for obsolete APIs and nullable references for net10.0 that are not applicable to netstandard2.0 -->
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
+        <NoWarn>$(NoWarn);SYSLIB0014;SYSLIB0050;SYSLIB0051;CS8600;CS8601;CS8602;CS8603;CS8604;CS8767;CS0618;CS0672</NoWarn>
+    </PropertyGroup>
+
     <!-- Version Info -->
     <PropertyGroup>
         <MajorVersion>0</MajorVersion>
@@ -24,9 +29,14 @@
         <Version>$(VersionPrefix)</Version>
     </PropertyGroup>
 
+    <!-- Package for netstandard2.0 only - not needed in net10.0 which has built-in IAsyncDisposable -->
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+    </ItemGroup>
+
+    <!-- Common packages for all target frameworks -->
     <ItemGroup>
         <PackageReference Include="Microsoft.ApplicationInsights" />
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     </ItemGroup>
 
     <ItemGroup>

From e7819ff0b78cc09b361421d4d8f557e4e2650593 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 26 Nov 2025 07:45:24 +0000
Subject: [PATCH 5/5] Revert net10.0 target changes to
 DurableTask.ApplicationInsights

Co-authored-by: Arithmomaniac <654897+Arithmomaniac@users.noreply.github.com>
---
 .../DurableTask.ApplicationInsights.csproj         | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
index 017069453..02f79492c 100644
--- a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
+++ b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
@@ -2,17 +2,12 @@
 
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <PackageId>Microsoft.Azure.DurableTask.ApplicationInsights</PackageId>
         <!-- NuGet licenseUrl and PackageIconUrl/iconUrl deprecation. -->
         <NoWarn>NU5125;NU5048;CS7035</NoWarn>  <!-- TODO: addition of CS7035 (version format doesn't follow convention) is a temporary workaround during 1ES migration -->
     </PropertyGroup>
 
-    <!-- Suppress warnings for obsolete APIs and nullable references for net10.0 that are not applicable to netstandard2.0 -->
-    <PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
-        <NoWarn>$(NoWarn);SYSLIB0014;SYSLIB0050;SYSLIB0051;CS8600;CS8601;CS8602;CS8603;CS8604;CS8767;CS0618;CS0672</NoWarn>
-    </PropertyGroup>
-
     <!-- Version Info -->
     <PropertyGroup>
         <MajorVersion>0</MajorVersion>
@@ -29,14 +24,9 @@
         <Version>$(VersionPrefix)</Version>
     </PropertyGroup>
 
-    <!-- Package for netstandard2.0 only - not needed in net10.0 which has built-in IAsyncDisposable -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-    </ItemGroup>
-
-    <!-- Common packages for all target frameworks -->
     <ItemGroup>
         <PackageReference Include="Microsoft.ApplicationInsights" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     </ItemGroup>
 
     <ItemGroup>