From cffbe293d32ea2666d93da9df72be456d68bad55 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 16 Nov 2024 22:41:54 -0500 Subject: [PATCH 1/3] Issue-223 - Test dotnet 9.0 --- DEVELOPMENT-CURRENT-COMMANDS.md | 4 ++-- DockerfileExtensionDotNet | 2 +- DockerfileRouter | 2 +- global.json | 5 +++++ .../PwrDrvr.LambdaDispatch.Extension.csproj | 6 +++--- .../PwrDrvr.LambdaDispatch.Messages.csproj | 2 +- .../PwrDrvr.LambdaDispatch.Router.csproj | 10 +++++----- .../PwrDrvr.LambdaDispatch.Extension.Tests.csproj | 2 +- .../PwrDrvr.LambdaDispatch.HttpTestClient.csproj | 2 +- .../PwrDrvr.LambdaDispatch.Router.TestClient.csproj | 6 +++--- .../PwrDrvr.LambdaDispatch.Router.Tests.csproj | 2 +- 11 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 global.json diff --git a/DEVELOPMENT-CURRENT-COMMANDS.md b/DEVELOPMENT-CURRENT-COMMANDS.md index e99f3bea..2c39ad1b 100644 --- a/DEVELOPMENT-CURRENT-COMMANDS.md +++ b/DEVELOPMENT-CURRENT-COMMANDS.md @@ -18,7 +18,7 @@ NUMBER_OF_WORKERS=4 node dist/app.cjs dotnet build -c Release src/PwrDrvr.LambdaDispatch.Router -BUILD_TIME=$(date) GIT_HASH=$(git rev-parse --short HEAD) LAMBDA_DISPATCH_MinWorkerThreads=1 LAMBDA_DISPATCH_MaxWorkerThreads=4 DOTNET_ThreadPool_UnfairSemaphoreSpinLimit=0 LAMBDA_DISPATCH_InstanceCountMultiplier=4 LAMBDA_DISPATCH_MaxConcurrentCount=20 LAMBDA_DISPATCH_AllowInsecureControlChannel=true LAMBDA_DISPATCH_PreferredControlChannelScheme=http LAMBDA_DISPATCH_FunctionName=dogs AWS_LAMBDA_SERVICE_URL=http://localhost:5051 AWS_REGION=us-east-2 AWS_ACCESS_KEY_ID=test-access-key-id AWS_SECRET_ACCESS_KEY=test-secret-access-key AWS_SESSION_TOKEN=test-session-token src/PwrDrvr.LambdaDispatch.Router/bin/Release/net8.0/PwrDrvr.LambdaDispatch.Router 2>&1 | tee router.log +BUILD_TIME=$(date) GIT_HASH=$(git rev-parse --short HEAD) LAMBDA_DISPATCH_MinWorkerThreads=1 LAMBDA_DISPATCH_MaxWorkerThreads=4 DOTNET_ThreadPool_UnfairSemaphoreSpinLimit=0 LAMBDA_DISPATCH_InstanceCountMultiplier=4 LAMBDA_DISPATCH_MaxConcurrentCount=20 LAMBDA_DISPATCH_AllowInsecureControlChannel=true LAMBDA_DISPATCH_PreferredControlChannelScheme=http LAMBDA_DISPATCH_FunctionName=dogs AWS_LAMBDA_SERVICE_URL=http://localhost:5051 AWS_REGION=us-east-2 AWS_ACCESS_KEY_ID=test-access-key-id AWS_SECRET_ACCESS_KEY=test-secret-access-key AWS_SESSION_TOKEN=test-session-token src/PwrDrvr.LambdaDispatch.Router/bin/Release/net9.0/PwrDrvr.LambdaDispatch.Router 2>&1 | tee router.log # extension @@ -37,7 +37,7 @@ date # d-router - fix-scale-down-timer branch -BUILD_TIME=$(date) GIT_HASH=$(git rev-parse --short HEAD) LAMBDA_DISPATCH_MaxWorkerThreads=2 DOTNET_ThreadPool_UnfairSemaphoreSpinLimit=0 LAMBDA_DISPATCH_InstanceCountMultiplier=2 LAMBDA_DISPATCH_MaxConcurrentCount=10 LAMBDA_DISPATCH_AllowInsecureControlChannel=true LAMBDA_DISPATCH_PreferredControlChannelScheme=http LAMBDA_DISPATCH_FunctionName=dogs AWS_LAMBDA_SERVICE_URL=http://localhost:5051 AWS_REGION=us-east-2 AWS_ACCESS_KEY_ID=test-access-key-id AWS_SECRET_ACCESS_KEY=test-secret-access-key AWS_SESSION_TOKEN=test-session-token src/PwrDrvr.LambdaDispatch.Router/bin/Release/net8.0/PwrDrvr.LambdaDispatch.Router 2>&1 > router.log +BUILD_TIME=$(date) GIT_HASH=$(git rev-parse --short HEAD) LAMBDA_DISPATCH_MaxWorkerThreads=2 DOTNET_ThreadPool_UnfairSemaphoreSpinLimit=0 LAMBDA_DISPATCH_InstanceCountMultiplier=2 LAMBDA_DISPATCH_MaxConcurrentCount=10 LAMBDA_DISPATCH_AllowInsecureControlChannel=true LAMBDA_DISPATCH_PreferredControlChannelScheme=http LAMBDA_DISPATCH_FunctionName=dogs AWS_LAMBDA_SERVICE_URL=http://localhost:5051 AWS_REGION=us-east-2 AWS_ACCESS_KEY_ID=test-access-key-id AWS_SECRET_ACCESS_KEY=test-secret-access-key AWS_SESSION_TOKEN=test-session-token src/PwrDrvr.LambdaDispatch.Router/bin/Release/net9.0/PwrDrvr.LambdaDispatch.Router 2>&1 > router.log # d-demoapp diff --git a/DockerfileExtensionDotNet b/DockerfileExtensionDotNet index 3c58f809..70bcec98 100644 --- a/DockerfileExtensionDotNet +++ b/DockerfileExtensionDotNet @@ -1,6 +1,6 @@ # Use the official .NET 8 SDK image as the build environment # Build with whatever CPU the host OS has -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env # Needed for Native AOT compilation RUN apt update diff --git a/DockerfileRouter b/DockerfileRouter index 9c476cbd..29b87103 100644 --- a/DockerfileRouter +++ b/DockerfileRouter @@ -1,6 +1,6 @@ # Use the official .NET 8 SDK image as the build environment # Build with whatever CPU the host OS has -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env # Set the working directory WORKDIR /app diff --git a/global.json b/global.json new file mode 100644 index 00000000..65324522 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "9.0.100" + } +} diff --git a/src/PwrDrvr.LambdaDispatch.Extension/PwrDrvr.LambdaDispatch.Extension.csproj b/src/PwrDrvr.LambdaDispatch.Extension/PwrDrvr.LambdaDispatch.Extension.csproj index 4c8ddea7..0c8b1111 100644 --- a/src/PwrDrvr.LambdaDispatch.Extension/PwrDrvr.LambdaDispatch.Extension.csproj +++ b/src/PwrDrvr.LambdaDispatch.Extension/PwrDrvr.LambdaDispatch.Extension.csproj @@ -5,7 +5,7 @@ portable true Exe - net8.0 + net9.0 enable enable Lambda @@ -57,8 +57,8 @@ - - + + diff --git a/src/PwrDrvr.LambdaDispatch.Messages/PwrDrvr.LambdaDispatch.Messages.csproj b/src/PwrDrvr.LambdaDispatch.Messages/PwrDrvr.LambdaDispatch.Messages.csproj index 3bd9c770..cd267a9b 100644 --- a/src/PwrDrvr.LambdaDispatch.Messages/PwrDrvr.LambdaDispatch.Messages.csproj +++ b/src/PwrDrvr.LambdaDispatch.Messages/PwrDrvr.LambdaDispatch.Messages.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable portable diff --git a/src/PwrDrvr.LambdaDispatch.Router/PwrDrvr.LambdaDispatch.Router.csproj b/src/PwrDrvr.LambdaDispatch.Router/PwrDrvr.LambdaDispatch.Router.csproj index 49c531fe..49bec0f4 100644 --- a/src/PwrDrvr.LambdaDispatch.Router/PwrDrvr.LambdaDispatch.Router.csproj +++ b/src/PwrDrvr.LambdaDispatch.Router/PwrDrvr.LambdaDispatch.Router.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable portable @@ -32,10 +32,10 @@ - - - - + + + + diff --git a/test/PwrDrvr.LambdaDispatch.Extension.Tests/PwrDrvr.LambdaDispatch.Extension.Tests.csproj b/test/PwrDrvr.LambdaDispatch.Extension.Tests/PwrDrvr.LambdaDispatch.Extension.Tests.csproj index a2373ac2..799273e4 100644 --- a/test/PwrDrvr.LambdaDispatch.Extension.Tests/PwrDrvr.LambdaDispatch.Extension.Tests.csproj +++ b/test/PwrDrvr.LambdaDispatch.Extension.Tests/PwrDrvr.LambdaDispatch.Extension.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable enable true diff --git a/test/PwrDrvr.LambdaDispatch.HttpTestClient/PwrDrvr.LambdaDispatch.HttpTestClient.csproj b/test/PwrDrvr.LambdaDispatch.HttpTestClient/PwrDrvr.LambdaDispatch.HttpTestClient.csproj index 2fc2dd63..abd7018f 100644 --- a/test/PwrDrvr.LambdaDispatch.HttpTestClient/PwrDrvr.LambdaDispatch.HttpTestClient.csproj +++ b/test/PwrDrvr.LambdaDispatch.HttpTestClient/PwrDrvr.LambdaDispatch.HttpTestClient.csproj @@ -3,7 +3,7 @@ true Exe - net8.0 + net9.0 enable enable diff --git a/test/PwrDrvr.LambdaDispatch.Router.TestClient/PwrDrvr.LambdaDispatch.Router.TestClient.csproj b/test/PwrDrvr.LambdaDispatch.Router.TestClient/PwrDrvr.LambdaDispatch.Router.TestClient.csproj index 08e6adb0..2a907707 100644 --- a/test/PwrDrvr.LambdaDispatch.Router.TestClient/PwrDrvr.LambdaDispatch.Router.TestClient.csproj +++ b/test/PwrDrvr.LambdaDispatch.Router.TestClient/PwrDrvr.LambdaDispatch.Router.TestClient.csproj @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ portable true Exe - net8.0 + net9.0 enable enable Lambda @@ -33,7 +33,7 @@ - + diff --git a/test/PwrDrvr.LambdaDispatch.Router.Tests/PwrDrvr.LambdaDispatch.Router.Tests.csproj b/test/PwrDrvr.LambdaDispatch.Router.Tests/PwrDrvr.LambdaDispatch.Router.Tests.csproj index 9a00a60a..63e952b5 100644 --- a/test/PwrDrvr.LambdaDispatch.Router.Tests/PwrDrvr.LambdaDispatch.Router.Tests.csproj +++ b/test/PwrDrvr.LambdaDispatch.Router.Tests/PwrDrvr.LambdaDispatch.Router.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 PwrDrvr.LambdaDispatch.Router.Tests enable enable From 2ae33c9595d18b33f61b9962b9fa755dc45d2d5b Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 16 Nov 2024 22:55:30 -0500 Subject: [PATCH 2/3] Issue-223 - Setup dotnet-9 for tests --- .github/workflows/build.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a9d87344..d8149179 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,6 +26,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.100' + - name: Run DotNet Tests run: | dotnet test --collect:"XPlat Code Coverage" From c474e6aee56c245148402542234dd2c5508c33a8 Mon Sep 17 00:00:00 2001 From: Harold Hunt Date: Sat, 15 Mar 2025 15:25:12 -0400 Subject: [PATCH 3/3] Update to 9.0.201 --- .github/workflows/build.yaml | 10 +++++----- global.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d8149179..673b4b15 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.100' + dotnet-version: '9.0.201' - name: Run DotNet Tests run: | @@ -238,7 +238,7 @@ jobs: cp -r /tmp/digests-router-amd64/private/* /tmp/digests-router/private/ || true cp -r /tmp/digests-router-arm64/public/* /tmp/digests-router/public/ || true cp -r /tmp/digests-router-arm64/private/* /tmp/digests-router/private/ || true - + # List files to verify echo "Public digests:" ls -la /tmp/digests-router/public/ || true @@ -436,7 +436,7 @@ jobs: run: | mkdir -p /tmp/digests rm -rf /tmp/digests/* || true - + - name: Download x86_64 digests uses: actions/download-artifact@v4 with: @@ -448,13 +448,13 @@ jobs: with: name: digests-extension-aarch64 path: /tmp/digests-aarch64 - + - name: Merge digests run: | # Copy files from platform-specific folders to the main folder cp -r /tmp/digests-x86_64/* /tmp/digests/ || true cp -r /tmp/digests-aarch64/* /tmp/digests/ || true - + # List files to verify echo "Extension digests:" ls -la /tmp/digests/ || true diff --git a/global.json b/global.json index 65324522..4667f91b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "9.0.100" + "version": "9.0.201" } }