Skip to content
Merged
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.200
dotnet-version: 10.0.100

- name: Install workloads
run: dotnet workload restore
Expand All @@ -40,7 +40,7 @@ jobs:

# Yarn build in advance to avoid cuncurrency issues due to multi target build
- name: Yarn Build
run: dotnet build -c Release ./src/LLL.DurableTask.Ui -f:net9.0 -t:YarnBuild --no-restore
run: dotnet build -c Release ./src/LLL.DurableTask.Ui -f:net10.0 -t:YarnBuild --no-restore

- name: Build
run: dotnet build -c Release --no-restore
Expand All @@ -59,7 +59,7 @@ jobs:
--exclude-sources "**/Migrations/**"

- name: Test
run: dotnet test -c Release -f:net9.0 --no-build
run: dotnet test -c Release -f:net10.0 --no-build

- name: Report coverage
run: |
Expand Down Expand Up @@ -106,14 +106,14 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.200
dotnet-version: 10.0.100

- name: Create Release NuGet package
run: |
export Version=${GITHUB_REF:11}
echo Version: $Version
dotnet restore
dotnet build -c Release ./src/LLL.DurableTask.Ui -f:net9.0 -t:YarnBuild --no-restore
dotnet build -c Release ./src/LLL.DurableTask.Ui -f:net10.0 -t:YarnBuild --no-restore
dotnet pack -c Release --no-restore

- name: Push to NuGet Feed
Expand Down
4 changes: 2 additions & 2 deletions benchmark/StoragesBenchmark/StoragesBenchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

<PropertyGroup Condition=" '$(RunConfiguration)' == 'CarWorker' " />
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
<PackageReference Include="Microsoft.DurableTask.SqlServer" Version="1.5.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
<PackageReference Include="Microsoft.DurableTask.SqlServer" Version="1.5.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100",
"version": "10.0.100",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion samples/AppHost/AppHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.0" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions samples/BpmnWorker/Activities/EmptyActivity.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;

namespace BpmnWorker.Activities;
Expand Down
5 changes: 1 addition & 4 deletions samples/BpmnWorker/Activities/ScriptActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;

namespace BpmnWorker.Activities;
Expand Down
2 changes: 1 addition & 1 deletion samples/BpmnWorker/BpmnWorker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.ClearScript" Version="7.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.0.0" />
<PackageReference Include="Microsoft.ClearScript.osx-x64" Version="7.5.0" />
<PackageReference Include="Microsoft.ClearScript.osx-arm64" Version="7.5.0" />
</ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions samples/BpmnWorker/Providers/IBPMNProvider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Threading.Tasks;

namespace BpmnWorker.Providers;
namespace BpmnWorker.Providers;

public interface IBPMNProvider
{
Expand Down
5 changes: 1 addition & 4 deletions samples/BpmnWorker/Providers/LocalFileBPMNProvider.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System.IO;
using System.Threading.Tasks;

namespace BpmnWorker.Providers;
namespace BpmnWorker.Providers;

public class LocalFileBPMNProvider : IBPMNProvider
{
Expand Down
5 changes: 1 addition & 4 deletions samples/BpmnWorker/Scripting/IScriptEngine.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace BpmnWorker.Scripting;
namespace BpmnWorker.Scripting;

public interface IScriptEngine
{
Expand Down
5 changes: 1 addition & 4 deletions samples/BpmnWorker/Scripting/IScriptExecutor.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Threading.Tasks;

namespace BpmnWorker.Activities;
namespace BpmnWorker.Activities;

public interface IScriptExecutor
{
Expand Down
6 changes: 1 addition & 5 deletions samples/BpmnWorker/Scripting/ScriptExecutor.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BpmnWorker.Scripting;
using BpmnWorker.Scripting;

namespace BpmnWorker.Activities;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using Microsoft.Extensions.DependencyInjection;

namespace BpmnWorker.Scripting;
namespace BpmnWorker.Scripting;

public class ServiceProviderScriptEngineFactory<T> : ResolveTypeScriptEngineFactory
{
Expand Down
5 changes: 1 addition & 4 deletions samples/CarWorker/Activities/BookCarActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;

namespace CarWorker.Activities;

Expand Down
5 changes: 1 addition & 4 deletions samples/CarWorker/Activities/CancelCarActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;

namespace CarWorker.Activities;

Expand Down
2 changes: 1 addition & 1 deletion samples/CarWorker/CarWorker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions samples/FlightWorker/Activities/BookFlightActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;

namespace FlightWorker.Activities;

Expand Down
5 changes: 1 addition & 4 deletions samples/FlightWorker/Activities/CancelFlightActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;

namespace FlightWorker.Activities;

Expand Down
2 changes: 1 addition & 1 deletion samples/FlightWorker/FlightWorker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions samples/HotelWorker/Activities/BookHotelActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;

namespace HotelWorker.Activities;

Expand Down
5 changes: 1 addition & 4 deletions samples/HotelWorker/Activities/CancelHotelActivity.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using System;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using Microsoft.Extensions.Logging;

namespace HotelWorker.Activities;

Expand Down
2 changes: 1 addition & 1 deletion samples/HotelWorker/HotelWorker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/OrchestrationWorker/OrchestrationWorker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using static OrchestrationWorker.Orchestrations.BookParallelOrchestration;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker;
using LLL.DurableTask.Worker.Attributes;
using static OrchestrationWorker.Orchestrations.BookSequentialOrchestration;

Expand Down
2 changes: 1 addition & 1 deletion src/LLL.DurableTask.Api/LLL.DurableTask.Api.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<Description>Extends Durable Task Azure Storage</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
</ItemGroup>
Expand All @@ -17,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage" Version="2.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage" Version="2.7.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions src/LLL.DurableTask.Client/LLL.DurableTask.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<Description>Configure Durable Task client</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
Expand All @@ -19,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.6.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/LLL.DurableTask.Core/LLL.DurableTask.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<Description>Extends Durable Task Core contracts</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="3.6.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/LLL.DurableTask.Core/PurgeInstanceFilterExtended.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using DurableTask.Core;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<PropertyGroup>
<Description>InMemory extensions to EFCore Durable Task Storage</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<!-- EF Core 9 MySql package is pre-release and requires a pre-release package -->
<Version Condition="'$(Version)' != '' AND !$(Version.Contains(&quot;-&quot;))">$(Version)-preview</Version>
<!-- EF Core 10 MySql will be pre-release and requires a pre-release package -->
<!-- <Version Condition="'$(Version)' != '' AND !$(Version.Contains(&quot;-&quot;))">$(Version)-preview</Version> -->
</PropertyGroup>

<PropertyGroup>
Expand All @@ -19,7 +19,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-rc.1.efcore.9.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand Down
Loading