Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/codeQL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions eng/templates/build-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 13 additions & 3 deletions src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Loading