diff --git a/.github/workflows/itests.yml b/.github/workflows/itests.yml index 0c96fa9ca..2ebbd04e3 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' @@ -50,7 +40,7 @@ jobs: GOPROXY: https://proxy.golang.org DAPR_CLI_VER: 1.15.0 DAPR_RUNTIME_VER: 1.15.3 - DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.14/install/install.sh + DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.15/install/install.sh DAPR_CLI_REF: '' steps: - name: Set up Dapr CLI @@ -124,9 +114,11 @@ jobs: with: dotnet-version: '9.0.x' dotnet-quality: 'ga' + - name: Restore dependencies + run: dotnet restore - name: Build # disable deterministic builds, just for test run. Deterministic builds break coverage for some reason - run: dotnet build --configuration release /p:GITHUB_ACTIONS=false + run: dotnet build --configuration release --no-restore /p:GITHUB_ACTIONS=false - name: Run General Tests id: tests continue-on-error: true # proceed if tests fail, the report step will report the failure with more details. diff --git a/.github/workflows/sdk_build.yml b/.github/workflows/sdk_build.yml index b6e263530..7fc5eb671 100644 --- a/.github/workflows/sdk_build.yml +++ b/.github/workflows/sdk_build.yml @@ -28,8 +28,10 @@ jobs: with: dotnet-version: 9.0.x dotnet-quality: 'ga' + - name: Restore dependencies + run: dotnet restore - name: Build - run: dotnet build --configuration release + run: dotnet build --configuration release --no-restore - name: Generate Packages run: dotnet pack --configuration release - name: Upload packages @@ -44,18 +46,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' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7712340a5..041f58f6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -54,13 +54,13 @@ This section describes the guidelines for contributing code / docs to Dapr. All contributions come through pull requests. To submit a proposed change, we recommend following this workflow: 1. Make sure there's an issue (bug or proposal) raised, which sets the expectations for the contribution you are about to make. -1. Fork the relevant repo and create a new branch -1. Create your change +2. Fork the relevant repo and create a new branch +3. Create your change - Code changes require tests -1. Update relevant documentation for the change -1. Commit and open a PR -1. Wait for the CI process to finish and make sure all checks are green -1. A maintainer of the project will be assigned, and you can expect a review within a few days +4. Update relevant documentation for the change +5. Commit and open a PR +6. Wait for the CI process to finish and make sure all checks are green +7. A maintainer of the project will be assigned, and you can expect a review within a few days #### Use work-in-progress PRs for early feedback diff --git a/README.md b/README.md index 948516fe2..faec504b0 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,21 @@ This repo builds the following packages: - Dapr.AspNetCore - Dapr.Actors - Dapr.Actors.AspNetCore +- Dapr.Actors.Generators +- Dapr.AI +- Dapr.Jobs +- Dapr.Messaging - Dapr.Extensions.Configuration - Dapr.Workflow +It also builds the following packages which are not intended for public use and contain common types used in the packages above: +- Dapr.Common +- Dapr.Protos + + ### Prerequisites -Each project is a normal C# project. At minimum, you need [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) to build, test, and generate NuGet packages. +Each project is a normal C# project. At minimum, you need [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0) to build, test, and generate NuGet packages. Also make sure to reference the [.NET SDK contribution guide](https://docs.dapr.io/contributing/sdk-contrib/dotnet-contributing/) @@ -59,7 +68,7 @@ On macOS or Linux we recommend [Visual Studio Code](https://code.visualstudio.co **Windows:** -On Windows, we recommend installing [the latest Visual Studio 2019](https://www.visualstudio.com/vs/) which will set you up with all the .NET build tools and allow you to open the solution files. Community Edition is free and can be used to build everything here. +On Windows, we recommend installing [the latest Visual Studio 2022](https://www.visualstudio.com/vs/) which will set you up with all the .NET build tools and allow you to open the solution files. Community Edition is free and can be used to build everything here. Make sure you [update Visual Studio to the most recent release](https://docs.microsoft.com/visualstudio/install/update-visual-studio). diff --git a/examples/AI/ConversationalAI/ConversationalAI.csproj b/examples/AI/ConversationalAI/ConversationalAI.csproj index 976265a5c..182363d2e 100644 --- a/examples/AI/ConversationalAI/ConversationalAI.csproj +++ b/examples/AI/ConversationalAI/ConversationalAI.csproj @@ -1,7 +1,6 @@  - net8.0 enable enable diff --git a/examples/Actor/ActorClient/ActorClient.csproj b/examples/Actor/ActorClient/ActorClient.csproj index 0d1d94f55..43aa659b1 100644 --- a/examples/Actor/ActorClient/ActorClient.csproj +++ b/examples/Actor/ActorClient/ActorClient.csproj @@ -2,7 +2,6 @@ Exe - net6 diff --git a/examples/Actor/DemoActor/DemoActor.csproj b/examples/Actor/DemoActor/DemoActor.csproj index 24a42ee0e..4ed29d66e 100644 --- a/examples/Actor/DemoActor/DemoActor.csproj +++ b/examples/Actor/DemoActor/DemoActor.csproj @@ -1,9 +1,5 @@  - - net6 - - true true diff --git a/examples/Actor/IDemoActor/IDemoActor.csproj b/examples/Actor/IDemoActor/IDemoActor.csproj index 9f7744796..8b8a84b21 100644 --- a/examples/Actor/IDemoActor/IDemoActor.csproj +++ b/examples/Actor/IDemoActor/IDemoActor.csproj @@ -1,9 +1,5 @@  - - net6 - - diff --git a/examples/AspNetCore/ControllerSample/ControllerSample.csproj b/examples/AspNetCore/ControllerSample/ControllerSample.csproj index 6dbe750a6..061510f94 100644 --- a/examples/AspNetCore/ControllerSample/ControllerSample.csproj +++ b/examples/AspNetCore/ControllerSample/ControllerSample.csproj @@ -1,9 +1,5 @@  - - net6 - - diff --git a/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj b/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj index 2319f6a56..5e1a27edf 100644 --- a/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj +++ b/examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj @@ -1,7 +1,6 @@ - net6 true diff --git a/examples/AspNetCore/RoutingSample/RoutingSample.csproj b/examples/AspNetCore/RoutingSample/RoutingSample.csproj index 6dbe750a6..061510f94 100644 --- a/examples/AspNetCore/RoutingSample/RoutingSample.csproj +++ b/examples/AspNetCore/RoutingSample/RoutingSample.csproj @@ -1,9 +1,5 @@  - - net6 - - diff --git a/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj b/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj index 01fbc2079..ce47841be 100644 --- a/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj +++ b/examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj @@ -2,7 +2,6 @@ Exe - net6 diff --git a/examples/Client/ConfigurationApi/ConfigurationApi.csproj b/examples/Client/ConfigurationApi/ConfigurationApi.csproj index 761ebb38f..d74bcdd5b 100644 --- a/examples/Client/ConfigurationApi/ConfigurationApi.csproj +++ b/examples/Client/ConfigurationApi/ConfigurationApi.csproj @@ -1,10 +1,4 @@ - - - net6 - - - diff --git a/examples/Client/Cryptography/Cryptography.csproj b/examples/Client/Cryptography/Cryptography.csproj index 525c38562..1a1b1eeb4 100644 --- a/examples/Client/Cryptography/Cryptography.csproj +++ b/examples/Client/Cryptography/Cryptography.csproj @@ -2,7 +2,6 @@ Exe - net6.0 enable enable latest diff --git a/examples/Client/DistributedLock/DistributedLock.csproj b/examples/Client/DistributedLock/DistributedLock.csproj index 4c04fb907..6c0019483 100644 --- a/examples/Client/DistributedLock/DistributedLock.csproj +++ b/examples/Client/DistributedLock/DistributedLock.csproj @@ -1,14 +1,7 @@ - - - - net6 - - - diff --git a/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj b/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj index b1e7647c7..bccce505e 100644 --- a/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj +++ b/examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj @@ -2,7 +2,6 @@ Exe - net6 Samples.Client enable diff --git a/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj b/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj index 52b77a3e5..93500fa1f 100644 --- a/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj +++ b/examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj @@ -2,7 +2,6 @@ Exe - net6 Samples.Client enable diff --git a/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj b/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj index 4ad620d00..77e84dbbf 100644 --- a/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj +++ b/examples/Client/PublishSubscribe/StreamingSubscriptionExample/StreamingSubscriptionExample.csproj @@ -2,7 +2,6 @@ Exe - net6.0 enable enable diff --git a/examples/Client/ServiceInvocation/ServiceInvocation.csproj b/examples/Client/ServiceInvocation/ServiceInvocation.csproj index 7b165835e..e292e4aeb 100644 --- a/examples/Client/ServiceInvocation/ServiceInvocation.csproj +++ b/examples/Client/ServiceInvocation/ServiceInvocation.csproj @@ -2,7 +2,6 @@ Exe - net6 Samples.Client enable diff --git a/examples/Client/StateManagement/StateManagement.csproj b/examples/Client/StateManagement/StateManagement.csproj index 7b165835e..e292e4aeb 100644 --- a/examples/Client/StateManagement/StateManagement.csproj +++ b/examples/Client/StateManagement/StateManagement.csproj @@ -2,7 +2,6 @@ Exe - net6 Samples.Client enable diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props index 00ec8e6c6..95483b7a0 100644 --- a/examples/Directory.Build.props +++ b/examples/Directory.Build.props @@ -2,6 +2,7 @@ + net8;net9 $(RepoRoot)bin\$(Configuration)\examples\$(MSBuildProjectName)\ diff --git a/examples/GeneratedActor/ActorClient/ActorClient.csproj b/examples/GeneratedActor/ActorClient/ActorClient.csproj index 88f75663d..18969e41a 100644 --- a/examples/GeneratedActor/ActorClient/ActorClient.csproj +++ b/examples/GeneratedActor/ActorClient/ActorClient.csproj @@ -2,8 +2,6 @@ Exe - net6 - 10.0 enable enable diff --git a/examples/GeneratedActor/ActorCommon/ActorCommon.csproj b/examples/GeneratedActor/ActorCommon/ActorCommon.csproj index 2cbc61e2c..498e5e507 100644 --- a/examples/GeneratedActor/ActorCommon/ActorCommon.csproj +++ b/examples/GeneratedActor/ActorCommon/ActorCommon.csproj @@ -1,8 +1,6 @@ - net6 - 10.0 enable enable diff --git a/examples/GeneratedActor/ActorService/ActorService.csproj b/examples/GeneratedActor/ActorService/ActorService.csproj index a74104363..29b94ca7b 100644 --- a/examples/GeneratedActor/ActorService/ActorService.csproj +++ b/examples/GeneratedActor/ActorService/ActorService.csproj @@ -1,8 +1,6 @@ - net6 - 10.0 enable enable diff --git a/examples/Jobs/JobsSample/JobsSample.csproj b/examples/Jobs/JobsSample/JobsSample.csproj index 4663d1d5b..642c299ef 100644 --- a/examples/Jobs/JobsSample/JobsSample.csproj +++ b/examples/Jobs/JobsSample/JobsSample.csproj @@ -1,7 +1,6 @@ - net8.0 enable enable diff --git a/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj b/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj index a1350fa79..be70a1b25 100644 --- a/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj +++ b/examples/Workflow/WorkflowAsyncOperations/WorkflowAsyncOperations.csproj @@ -2,7 +2,6 @@ Exe - net6.0 enable enable diff --git a/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj b/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj index 25c03a419..9b38483c5 100644 --- a/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj +++ b/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj @@ -6,7 +6,6 @@ Exe - net6 enable 612,618 diff --git a/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj b/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj index 4aae25c46..59d76d46e 100644 --- a/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj +++ b/examples/Workflow/WorkflowExternalInteraction/WorkflowExternalInteraction.csproj @@ -2,7 +2,6 @@ Exe - net6.0 enable enable diff --git a/examples/Workflow/WorkflowFanOutFanIn/WorkflowFanOutFanIn.csproj b/examples/Workflow/WorkflowFanOutFanIn/WorkflowFanOutFanIn.csproj index af3a1b2c8..ba92ee6ec 100644 --- a/examples/Workflow/WorkflowFanOutFanIn/WorkflowFanOutFanIn.csproj +++ b/examples/Workflow/WorkflowFanOutFanIn/WorkflowFanOutFanIn.csproj @@ -2,7 +2,6 @@ Exe - net8.0 enable enable diff --git a/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj b/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj index 91ded8afb..ba92ee6ec 100644 --- a/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj +++ b/examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj @@ -2,7 +2,6 @@ Exe - net6.0 enable enable diff --git a/examples/Workflow/WorkflowSubworkflow/WorkflowSubworkflow.csproj b/examples/Workflow/WorkflowSubworkflow/WorkflowSubworkflow.csproj index af3a1b2c8..ba92ee6ec 100644 --- a/examples/Workflow/WorkflowSubworkflow/WorkflowSubworkflow.csproj +++ b/examples/Workflow/WorkflowSubworkflow/WorkflowSubworkflow.csproj @@ -2,7 +2,6 @@ Exe - net8.0 enable enable diff --git a/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj b/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj index 91ded8afb..ba92ee6ec 100644 --- a/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj +++ b/examples/Workflow/WorkflowTaskChaining/WorkflowTaskChaining.csproj @@ -2,7 +2,6 @@ Exe - net6.0 enable enable diff --git a/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj b/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj index dec14a713..d0f391a25 100644 --- a/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj +++ b/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj @@ -1,7 +1,6 @@  - net6.0 enable false diff --git a/global.json b/global.json index 139cca3e3..b86bbe43e 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { - "_comment": "This policy allows the 8.0.100 SDK or patches in that family.", + "_comment": "This policy allows the 9.0.100 SDK or patches in that family.", "sdk": { "version": "9.0.100", "rollForward": "latestFeature" 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.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..088595463 100644 --- a/src/Dapr.Workflow/Dapr.Workflow.csproj +++ b/src/Dapr.Workflow/Dapr.Workflow.csproj @@ -1,14 +1,10 @@  - - - net6;net7;net8;net9 enable Dapr.Workflow Dapr Workflow Authoring SDK Dapr Workflow SDK for building workflows as code with Dapr - 0.3.0 alpha 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/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)\