diff --git a/.github/workflows/itests.yml b/.github/workflows/itests.yml index 4dcdfb951..542e3183a 100644 --- a/.github/workflows/itests.yml +++ b/.github/workflows/itests.yml @@ -20,18 +20,8 @@ jobs: strategy: fail-fast: false matrix: - dotnet-version: ['6.0', '7.0', '8.0', '9.0'] + dotnet-version: ['8.0', '9.0'] include: - - dotnet-version: '6.0' - display-name: '.NET 6.0' - framework: 'net6' - prefix: 'net6' - install-version: '6.0.x' - - dotnet-version: '7.0' - display-name: '.NET 7.0' - framework: 'net7' - prefix: 'net7' - install-version: '7.0.x' - dotnet-version: '8.0' display-name: '.NET 8.0' framework: 'net8' @@ -111,18 +101,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: ${{ matrix.install-version }} - dotnet-quality: 'ga' # Prefer a GA release, but use the RC if not available - - name: Setup .NET 8 (required) - uses: actions/setup-dotnet@v3 - if: ${{ matrix.install-version != '8.0.x' }} - with: - dotnet-version: '8.0.x' - dotnet-quality: 'ga' - - name: Setup .NET 9 (required) - uses: actions/setup-dotnet@v3 - if: ${{ matrix.install-version != '9.0.x' }} - with: - dotnet-version: '9.0.x' dotnet-quality: 'ga' - name: Build # disable deterministic builds, just for test run. Deterministic builds break coverage for some reason diff --git a/.github/workflows/sdk_build.yml b/.github/workflows/sdk_build.yml index b6e263530..d7adb8905 100644 --- a/.github/workflows/sdk_build.yml +++ b/.github/workflows/sdk_build.yml @@ -44,18 +44,8 @@ jobs: strategy: fail-fast: false matrix: - dotnet-version: ['6.0', '7.0', '8.0', '9.0'] + dotnet-version: ['8.0', '9.0'] include: - - dotnet-version: '6.0' - display-name: '.NET 6.0' - framework: 'net6' - prefix: 'net6' - install-version: '6.0.x' - - dotnet-version: '7.0' - display-name: '.NET 7.0' - framework: 'net7' - prefix: 'net7' - install-version: '7.0.x' - dotnet-version: '8.0' display-name: '.NET 8.0' framework: 'net8' @@ -74,18 +64,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: ${{ matrix.install-version }} - dotnet-quality: 'ga' # Prefer a GA release, but use the RC if not available - - name: Setup .NET 8 (required) - uses: actions/setup-dotnet@v3 - if: ${{ matrix.install-version != '8.0.x' }} - with: - dotnet-version: '8.0.x' - dotnet-quality: 'ga' - - name: Setup .NET 9 (required) - uses: actions/setup-dotnet@v3 - if: ${{ matrix.install-version != '9.0.x' }} - with: - dotnet-version: '9.0.x' dotnet-quality: 'ga' - name: Build # disable deterministic builds, just for test run. Deterministic builds break coverage for some reason diff --git a/Directory.Packages.props b/Directory.Packages.props index efb48fcc4..94e028b64 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,45 +8,45 @@ - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - + diff --git a/examples/Actor/ActorClient/ActorClient.csproj b/examples/Actor/ActorClient/ActorClient.csproj index 0d1d94f55..b0f74447b 100644 --- a/examples/Actor/ActorClient/ActorClient.csproj +++ b/examples/Actor/ActorClient/ActorClient.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 diff --git a/examples/Actor/DemoActor/DemoActor.csproj b/examples/Actor/DemoActor/DemoActor.csproj index 24a42ee0e..d933b0b18 100644 --- a/examples/Actor/DemoActor/DemoActor.csproj +++ b/examples/Actor/DemoActor/DemoActor.csproj @@ -1,7 +1,7 @@  - net6 + net8.0 diff --git a/examples/Actor/IDemoActor/IDemoActor.csproj b/examples/Actor/IDemoActor/IDemoActor.csproj index 9f7744796..a3d7f7f52 100644 --- a/examples/Actor/IDemoActor/IDemoActor.csproj +++ b/examples/Actor/IDemoActor/IDemoActor.csproj @@ -1,7 +1,7 @@  - net6 + net8.0 diff --git a/examples/AspNetCore/ControllerSample/ControllerSample.csproj b/examples/AspNetCore/ControllerSample/ControllerSample.csproj index 6dbe750a6..a7cce44d7 100644 --- a/examples/AspNetCore/ControllerSample/ControllerSample.csproj +++ b/examples/AspNetCore/ControllerSample/ControllerSample.csproj @@ -1,7 +1,7 @@  - net6 + net8.0 diff --git a/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj b/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj index 2319f6a56..730b7ccf0 100644 --- a/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj +++ b/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj @@ -1,7 +1,7 @@ - net6 + net8.0 true diff --git a/examples/AspNetCore/RoutingSample/RoutingSample.csproj b/examples/AspNetCore/RoutingSample/RoutingSample.csproj index 6dbe750a6..a7cce44d7 100644 --- a/examples/AspNetCore/RoutingSample/RoutingSample.csproj +++ b/examples/AspNetCore/RoutingSample/RoutingSample.csproj @@ -1,7 +1,7 @@  - net6 + net8.0 diff --git a/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj b/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj index 01fbc2079..b1bf76002 100644 --- a/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj +++ b/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 diff --git a/examples/Client/ConfigurationApi/ConfigurationApi.csproj b/examples/Client/ConfigurationApi/ConfigurationApi.csproj index 761ebb38f..9fb42957a 100644 --- a/examples/Client/ConfigurationApi/ConfigurationApi.csproj +++ b/examples/Client/ConfigurationApi/ConfigurationApi.csproj @@ -1,7 +1,7 @@ - net6 + net8.0 diff --git a/examples/Client/Cryptography/Cryptography.csproj b/examples/Client/Cryptography/Cryptography.csproj index 525c38562..1b44e1d89 100644 --- a/examples/Client/Cryptography/Cryptography.csproj +++ b/examples/Client/Cryptography/Cryptography.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable latest diff --git a/examples/Client/DistributedLock/DistributedLock.csproj b/examples/Client/DistributedLock/DistributedLock.csproj index 4c04fb907..58edf7977 100644 --- a/examples/Client/DistributedLock/DistributedLock.csproj +++ b/examples/Client/DistributedLock/DistributedLock.csproj @@ -1,14 +1,13 @@ - - - - - - - - net6 - - + + net8.0 + + + + + + + diff --git a/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj b/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj index b1e7647c7..d4a6fda07 100644 --- a/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj +++ b/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 Samples.Client enable diff --git a/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj b/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj index 52b77a3e5..bd6d35776 100644 --- a/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj +++ b/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 Samples.Client enable diff --git a/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj b/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj index 4ad620d00..faf4e2c04 100644 --- a/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj +++ b/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/Client/ServiceInvocation/ServiceInvocation.csproj b/examples/Client/ServiceInvocation/ServiceInvocation.csproj index 7b165835e..093bba075 100644 --- a/examples/Client/ServiceInvocation/ServiceInvocation.csproj +++ b/examples/Client/ServiceInvocation/ServiceInvocation.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 Samples.Client enable diff --git a/examples/Client/StateManagement/StateManagement.csproj b/examples/Client/StateManagement/StateManagement.csproj index 7b165835e..093bba075 100644 --- a/examples/Client/StateManagement/StateManagement.csproj +++ b/examples/Client/StateManagement/StateManagement.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 Samples.Client enable diff --git a/examples/GeneratedActor/ActorClient/ActorClient.csproj b/examples/GeneratedActor/ActorClient/ActorClient.csproj index 88f75663d..6c9e711cf 100644 --- a/examples/GeneratedActor/ActorClient/ActorClient.csproj +++ b/examples/GeneratedActor/ActorClient/ActorClient.csproj @@ -2,8 +2,7 @@ Exe - net6 - 10.0 + net8.0 enable enable diff --git a/examples/GeneratedActor/ActorCommon/ActorCommon.csproj b/examples/GeneratedActor/ActorCommon/ActorCommon.csproj index 2cbc61e2c..275a713f2 100644 --- a/examples/GeneratedActor/ActorCommon/ActorCommon.csproj +++ b/examples/GeneratedActor/ActorCommon/ActorCommon.csproj @@ -1,8 +1,7 @@ - net6 - 10.0 + net8.0 enable enable diff --git a/examples/GeneratedActor/ActorService/ActorService.csproj b/examples/GeneratedActor/ActorService/ActorService.csproj index a74104363..c12468046 100644 --- a/examples/GeneratedActor/ActorService/ActorService.csproj +++ b/examples/GeneratedActor/ActorService/ActorService.csproj @@ -1,8 +1,7 @@ - net6 - 10.0 + net8.0 enable enable diff --git a/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj b/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj index a1350fa79..36e8786be 100644 --- a/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj +++ b/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj b/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj index 25c03a419..72a0410ee 100644 --- a/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj +++ b/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj @@ -6,7 +6,7 @@ Exe - net6 + net8.0 enable 612,618 diff --git a/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj b/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj index 4aae25c46..f33e5a1fd 100644 --- a/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj +++ b/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj b/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj index 91ded8afb..af3a1b2c8 100644 --- a/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj +++ b/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj b/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj index 91ded8afb..af3a1b2c8 100644 --- a/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj +++ b/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj b/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj index dec14a713..042008ceb 100644 --- a/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj +++ b/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable false diff --git a/global.json b/global.json index 139cca3e3..4fcd670e3 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { - "_comment": "This policy allows the 8.0.100 SDK or patches in that family.", + "_comment": "This policy allows the 8.0.404 SDK or patches in that family.", "sdk": { - "version": "9.0.100", + "version": "8.0.404", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/Dapr.AI/Dapr.AI.csproj b/src/Dapr.AI/Dapr.AI.csproj index 8220c5c4d..87ae8bb8c 100644 --- a/src/Dapr.AI/Dapr.AI.csproj +++ b/src/Dapr.AI/Dapr.AI.csproj @@ -1,7 +1,6 @@  - net6;net8 enable enable Dapr.AI diff --git a/src/Dapr.Common/Dapr.Common.csproj b/src/Dapr.Common/Dapr.Common.csproj index dd34d844b..dac090d3e 100644 --- a/src/Dapr.Common/Dapr.Common.csproj +++ b/src/Dapr.Common/Dapr.Common.csproj @@ -1,7 +1,6 @@  - net6;net7;net8;net9 enable enable diff --git a/src/Dapr.Jobs/Models/DaprJobSchedule.cs b/src/Dapr.Jobs/Models/DaprJobSchedule.cs index e00c77f49..5621b6bbc 100644 --- a/src/Dapr.Jobs/Models/DaprJobSchedule.cs +++ b/src/Dapr.Jobs/Models/DaprJobSchedule.cs @@ -76,9 +76,6 @@ public static DaprJobSchedule FromDateTime(DateTimeOffset scheduledTime) /// The systemd Cron-like expression indicating when the job should be triggered. public static DaprJobSchedule FromExpression(string expression) { -#if NET6_0 - ArgumentNullException.ThrowIfNull(expression, nameof(expression)); -#endif return new DaprJobSchedule(expression); } diff --git a/src/Dapr.Protos/Dapr.Protos.csproj b/src/Dapr.Protos/Dapr.Protos.csproj index 5331f229c..8a8804b22 100644 --- a/src/Dapr.Protos/Dapr.Protos.csproj +++ b/src/Dapr.Protos/Dapr.Protos.csproj @@ -1,7 +1,6 @@  - net6;net7;net8;net9 enable enable This package contains the reference protos used by develop services using Dapr. diff --git a/src/Dapr.Workflow/Dapr.Workflow.csproj b/src/Dapr.Workflow/Dapr.Workflow.csproj index f24d41e40..99c23e3dc 100644 --- a/src/Dapr.Workflow/Dapr.Workflow.csproj +++ b/src/Dapr.Workflow/Dapr.Workflow.csproj @@ -2,8 +2,6 @@ - - net6;net7;net8;net9 enable Dapr.Workflow Dapr Workflow Authoring SDK diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a74833a37..e7b1b91fa 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ - net6;net8;net9 + net8;net9 $(RepoRoot)bin\$(Configuration)\prod\$(MSBuildProjectName)\ $(OutputPath)$(MSBuildProjectName).xml diff --git a/test/Dapr.AspNetCore.IntegrationTest/Dapr.AspNetCore.IntegrationTest.csproj b/test/Dapr.AspNetCore.IntegrationTest/Dapr.AspNetCore.IntegrationTest.csproj index d7dd6d52a..5d40e44aa 100644 --- a/test/Dapr.AspNetCore.IntegrationTest/Dapr.AspNetCore.IntegrationTest.csproj +++ b/test/Dapr.AspNetCore.IntegrationTest/Dapr.AspNetCore.IntegrationTest.csproj @@ -28,13 +28,6 @@ - - - - - - - diff --git a/test/Directory.Build.props b/test/Directory.Build.props index e3a49b72f..39b6b97e5 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,7 +2,7 @@ - net6;net7;net8;net9 + net8;net9 $(RepoRoot)bin\$(Configuration)\test\$(MSBuildProjectName)\