From 741a8f7ad9061ac4fcc0fa79393728c3adf51bea Mon Sep 17 00:00:00 2001 From: Phil Ngan Date: Wed, 14 Feb 2024 19:50:15 +1300 Subject: [PATCH 1/9] Converted all projects to net8.0 Exception is batch because Swashbuckle does not support net8 Signed-off-by: Phil Ngan --- actors/csharp/sdk/client/SmartDevice.Client.csproj | 2 +- actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj | 2 +- actors/csharp/sdk/service/SmartDevice.Service.csproj | 2 +- configuration/csharp/http/order-processor/Program.csproj | 2 +- configuration/csharp/sdk/order-processor/Program.csproj | 2 +- pub_sub/csharp/http/checkout/checkout.csproj | 2 +- pub_sub/csharp/http/order-processor/order-processor.csproj | 2 +- pub_sub/csharp/sdk/checkout/checkout.csproj | 2 +- pub_sub/csharp/sdk/order-processor/order-processor.csproj | 2 +- secrets_management/csharp/http/order-processor/Program.csproj | 2 +- secrets_management/csharp/sdk/order-processor/Program.csproj | 2 +- service_invocation/csharp/http/checkout/checkout.csproj | 2 +- .../csharp/http/order-processor/order-processor.csproj | 2 +- state_management/csharp/http/order-processor/Program.csproj | 2 +- state_management/csharp/sdk/order-processor/Program.csproj | 2 +- tutorials/pub-sub/csharp-subscriber/csharp-subscriber.csproj | 2 +- workflows/csharp/sdk/order-processor/WorkflowConsoleApp.csproj | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/actors/csharp/sdk/client/SmartDevice.Client.csproj b/actors/csharp/sdk/client/SmartDevice.Client.csproj index 98c293a6..3d90f307 100644 --- a/actors/csharp/sdk/client/SmartDevice.Client.csproj +++ b/actors/csharp/sdk/client/SmartDevice.Client.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Exe diff --git a/actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj b/actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj index 71be0b00..2c435c65 100644 --- a/actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj +++ b/actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj @@ -1,7 +1,7 @@ - net6;net7 + net8.0 enable enable diff --git a/actors/csharp/sdk/service/SmartDevice.Service.csproj b/actors/csharp/sdk/service/SmartDevice.Service.csproj index bf0f9066..560bfd0a 100644 --- a/actors/csharp/sdk/service/SmartDevice.Service.csproj +++ b/actors/csharp/sdk/service/SmartDevice.Service.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/configuration/csharp/http/order-processor/Program.csproj b/configuration/csharp/http/order-processor/Program.csproj index 7919f638..279910f4 100644 --- a/configuration/csharp/http/order-processor/Program.csproj +++ b/configuration/csharp/http/order-processor/Program.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Linux diff --git a/configuration/csharp/sdk/order-processor/Program.csproj b/configuration/csharp/sdk/order-processor/Program.csproj index dd54cdbe..4a755f31 100644 --- a/configuration/csharp/sdk/order-processor/Program.csproj +++ b/configuration/csharp/sdk/order-processor/Program.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/pub_sub/csharp/http/checkout/checkout.csproj b/pub_sub/csharp/http/checkout/checkout.csproj index 42ba9218..9e0331cf 100644 --- a/pub_sub/csharp/http/checkout/checkout.csproj +++ b/pub_sub/csharp/http/checkout/checkout.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable enable diff --git a/pub_sub/csharp/http/order-processor/order-processor.csproj b/pub_sub/csharp/http/order-processor/order-processor.csproj index 8f1d827c..b84fb2bf 100644 --- a/pub_sub/csharp/http/order-processor/order-processor.csproj +++ b/pub_sub/csharp/http/order-processor/order-processor.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Linux diff --git a/pub_sub/csharp/sdk/checkout/checkout.csproj b/pub_sub/csharp/sdk/checkout/checkout.csproj index dd54cdbe..4a755f31 100644 --- a/pub_sub/csharp/sdk/checkout/checkout.csproj +++ b/pub_sub/csharp/sdk/checkout/checkout.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/pub_sub/csharp/sdk/order-processor/order-processor.csproj b/pub_sub/csharp/sdk/order-processor/order-processor.csproj index adbe897a..9280d33d 100644 --- a/pub_sub/csharp/sdk/order-processor/order-processor.csproj +++ b/pub_sub/csharp/sdk/order-processor/order-processor.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Linux diff --git a/secrets_management/csharp/http/order-processor/Program.csproj b/secrets_management/csharp/http/order-processor/Program.csproj index 42ba9218..9e0331cf 100644 --- a/secrets_management/csharp/http/order-processor/Program.csproj +++ b/secrets_management/csharp/http/order-processor/Program.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable enable diff --git a/secrets_management/csharp/sdk/order-processor/Program.csproj b/secrets_management/csharp/sdk/order-processor/Program.csproj index dd54cdbe..4a755f31 100644 --- a/secrets_management/csharp/sdk/order-processor/Program.csproj +++ b/secrets_management/csharp/sdk/order-processor/Program.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/service_invocation/csharp/http/checkout/checkout.csproj b/service_invocation/csharp/http/checkout/checkout.csproj index 42ba9218..9e0331cf 100644 --- a/service_invocation/csharp/http/checkout/checkout.csproj +++ b/service_invocation/csharp/http/checkout/checkout.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable enable diff --git a/service_invocation/csharp/http/order-processor/order-processor.csproj b/service_invocation/csharp/http/order-processor/order-processor.csproj index 8f1d827c..b84fb2bf 100644 --- a/service_invocation/csharp/http/order-processor/order-processor.csproj +++ b/service_invocation/csharp/http/order-processor/order-processor.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Linux diff --git a/state_management/csharp/http/order-processor/Program.csproj b/state_management/csharp/http/order-processor/Program.csproj index 42ba9218..9e0331cf 100644 --- a/state_management/csharp/http/order-processor/Program.csproj +++ b/state_management/csharp/http/order-processor/Program.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable enable diff --git a/state_management/csharp/sdk/order-processor/Program.csproj b/state_management/csharp/sdk/order-processor/Program.csproj index dd54cdbe..4a755f31 100644 --- a/state_management/csharp/sdk/order-processor/Program.csproj +++ b/state_management/csharp/sdk/order-processor/Program.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 diff --git a/tutorials/pub-sub/csharp-subscriber/csharp-subscriber.csproj b/tutorials/pub-sub/csharp-subscriber/csharp-subscriber.csproj index 29239022..035e49fb 100644 --- a/tutorials/pub-sub/csharp-subscriber/csharp-subscriber.csproj +++ b/tutorials/pub-sub/csharp-subscriber/csharp-subscriber.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Linux diff --git a/workflows/csharp/sdk/order-processor/WorkflowConsoleApp.csproj b/workflows/csharp/sdk/order-processor/WorkflowConsoleApp.csproj index 691027bf..0d42d9f1 100644 --- a/workflows/csharp/sdk/order-processor/WorkflowConsoleApp.csproj +++ b/workflows/csharp/sdk/order-processor/WorkflowConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8.0 enable latest 612,618 From 25d881526c607955d211601a6184287f3a68a3c7 Mon Sep 17 00:00:00 2001 From: Phil Ngan Date: Wed, 14 Feb 2024 19:51:43 +1300 Subject: [PATCH 2/9] Reverted batch project to net6.0 Batch uses Swashbuckle net6 dlls Signed-off-by: Phil Ngan --- bindings/csharp/sdk/batch/batch.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/csharp/sdk/batch/batch.csproj b/bindings/csharp/sdk/batch/batch.csproj index 19dd645d..142c5366 100644 --- a/bindings/csharp/sdk/batch/batch.csproj +++ b/bindings/csharp/sdk/batch/batch.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net6.0 enable enable From d60e5bac8ede63fa17f6b180c6c2d767893ce189 Mon Sep 17 00:00:00 2001 From: Phil Ngan Date: Wed, 14 Feb 2024 19:54:27 +1300 Subject: [PATCH 3/9] gitignore Debug/ folders Signed-off-by: Phil Ngan --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 732a675d..5d44b193 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ release.properties mvnw packages **/__pycache__/ +Debug/ # IDE generated files and directories *.iml From e179b3ecb8dae5aed5c993c9683ffc690e6edb07 Mon Sep 17 00:00:00 2001 From: Phil Ngan Date: Wed, 14 Feb 2024 19:58:51 +1300 Subject: [PATCH 4/9] Install sdk net8 With special net6 install for batch project Signed-off-by: Phil Ngan --- .github/workflows/validate_csharp_quicstarts.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate_csharp_quicstarts.yaml b/.github/workflows/validate_csharp_quicstarts.yaml index 6098fcdc..328aa799 100644 --- a/.github/workflows/validate_csharp_quicstarts.yaml +++ b/.github/workflows/validate_csharp_quicstarts.yaml @@ -79,7 +79,8 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 7.0.x + 6.0.x + 8.0.x - name: Set up Dapr CLI - Mac/Linux if: matrix.os != 'windows-latest' run: wget -q ${{ env.DAPR_INSTALL_URL }}/install.sh -O - | /bin/bash -s ${{ env.DAPR_CLI_VERSION }} From 35c27991eef15b0d7866709149a3422c731c3349 Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Sat, 17 Feb 2024 01:35:52 -0800 Subject: [PATCH 5/9] Updated healthz output match in test, and fixed up test paths Signed-off-by: Paul Yuknewicz --- actors/csharp/sdk/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/actors/csharp/sdk/README.md b/actors/csharp/sdk/README.md index 778e40ad..7fc5ce11 100644 --- a/actors/csharp/sdk/README.md +++ b/actors/csharp/sdk/README.md @@ -34,15 +34,15 @@ Run the `SmartDevice.Service`, which will start service itself and the Dapr side ```bash -cd actors/csharp/sdk/service +cd service dapr run --app-id actorservice --app-port 5001 --app-protocol http --dapr-http-port 56001 --resources-path ../../../resources -- dotnet run --urls=http://localhost:5001/ ``` @@ -70,13 +70,13 @@ name: Run actor client expected_stdout_lines: - "Device 2 state: Location: Second Floor, Status: Ready" expected_stderr_lines: -working_dir: ./client +working_dir: . output_match_mode: substring background: true sleep: 60 --> ```bash -cd ./actors/csharp/sdk/client +cd client dapr run --app-id actorclient -- dotnet run ``` From 54473eaa8658939d4d51e3a5d0f93c6ecb974ec0 Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Sat, 17 Feb 2024 01:21:49 -0800 Subject: [PATCH 6/9] Updating Actors readme test to pass with new healthz output string Signed-off-by: Paul Yuknewicz --- actors/csharp/sdk/sdk.sln | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 actors/csharp/sdk/sdk.sln diff --git a/actors/csharp/sdk/sdk.sln b/actors/csharp/sdk/sdk.sln new file mode 100644 index 00000000..878be56a --- /dev/null +++ b/actors/csharp/sdk/sdk.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartDevice.Service", "service\SmartDevice.Service.csproj", "{3E9760D4-A707-487F-8B73-3ECB080749C0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartDevice.Client", "client\SmartDevice.Client.csproj", "{044F6311-35DC-4A94-A99A-35CB59913AFF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartDevice.Interfaces", "interfaces\SmartDevice.Interfaces.csproj", "{D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3E9760D4-A707-487F-8B73-3ECB080749C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E9760D4-A707-487F-8B73-3ECB080749C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E9760D4-A707-487F-8B73-3ECB080749C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E9760D4-A707-487F-8B73-3ECB080749C0}.Release|Any CPU.Build.0 = Release|Any CPU + {044F6311-35DC-4A94-A99A-35CB59913AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {044F6311-35DC-4A94-A99A-35CB59913AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {044F6311-35DC-4A94-A99A-35CB59913AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {044F6311-35DC-4A94-A99A-35CB59913AFF}.Release|Any CPU.Build.0 = Release|Any CPU + {D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {409D8B04-7025-42BC-BC2A-AF3F6A089623} + EndGlobalSection +EndGlobal From 0bd379026fd8c59b90437ea29ca7f3ebff307ea8 Mon Sep 17 00:00:00 2001 From: Paul Yuknewicz Date: Sat, 17 Feb 2024 02:07:28 -0800 Subject: [PATCH 7/9] Updated batch project for .net8, removing dead swashbuckle references Signed-off-by: Paul Yuknewicz --- .github/env/global.env | 2 +- bindings/csharp/http/batch/batch.csproj | 6 +----- bindings/csharp/sdk/batch/batch.csproj | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/env/global.env b/.github/env/global.env index fec526fb..51b339fa 100644 --- a/.github/env/global.env +++ b/.github/env/global.env @@ -1,5 +1,5 @@ DAPR_CLI_VERSION: 1.12.0 - DAPR_RUNTIME_VERSION: 1.13.0-rc.2 + DAPR_RUNTIME_VERSION: 1.13.0-rc.4 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/ DAPR_DEFAULT_IMAGE_REGISTRY: ghcr MACOS_PYTHON_VERSION: 3.10 diff --git a/bindings/csharp/http/batch/batch.csproj b/bindings/csharp/http/batch/batch.csproj index 85b297d5..6a0fd79d 100644 --- a/bindings/csharp/http/batch/batch.csproj +++ b/bindings/csharp/http/batch/batch.csproj @@ -2,13 +2,9 @@ Exe - net6.0 + net8.0 enable enable - - - - \ No newline at end of file diff --git a/bindings/csharp/sdk/batch/batch.csproj b/bindings/csharp/sdk/batch/batch.csproj index 142c5366..3108167d 100644 --- a/bindings/csharp/sdk/batch/batch.csproj +++ b/bindings/csharp/sdk/batch/batch.csproj @@ -2,13 +2,12 @@ Exe - net6.0 + net8.0 enable enable -