Skip to content

Issue 223 - Test dotnet 10.0.0 #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
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
13 changes: 9 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- uses: actions/setup-dotnet@v4
with:
dotnet-version: '10.0.x'
dotnet-quality: 'preview'

- name: Run DotNet Tests
run: |
dotnet test --collect:"XPlat Code Coverage"
Expand Down Expand Up @@ -234,7 +239,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
Expand Down Expand Up @@ -432,7 +437,7 @@ jobs:
run: |
mkdir -p /tmp/digests
rm -rf /tmp/digests/* || true

- name: Download x86_64 digests
uses: actions/download-artifact@v4
with:
Expand All @@ -444,13 +449,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
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT-CURRENT-COMMANDS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion DockerfileExtensionDotNet
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions DockerfileRouter
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# 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
# Check for image versions here: https://github.com/dotnet/dotnet-docker/blob/main/README.sdk.md
FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build-env

# Set the working directory
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion extension/src/router_channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ impl RouterChannel {
// Include: Path and Query string, status code, bytes sent, bytes received, duration, time since
// last bytes sent, time since last bytes received
// log::info()
log::info!(
log::trace!(
"{} - {} - BytesSentToApp: {} - BytesRcvdFromApp: {} - Access Log",
app_url,
status_code,
Expand Down
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "10.0.100-preview.1.25120.13",
"rollForward": "latestFeature",
"allowPrerelease": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AWSProjectType>Lambda</AWSProjectType>
Expand Down Expand Up @@ -57,8 +57,8 @@
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.0" />
<PackageReference Include="AWS.Logger.AspNetCore" Version="3.4.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PwrDrvr.LambdaDispatch.Messages\PwrDrvr.LambdaDispatch.Messages.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DebugType>portable</DebugType>
Expand Down
4 changes: 2 additions & 2 deletions src/PwrDrvr.LambdaDispatch.Router/Dispatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public async Task AddRequest(HttpRequest incomingRequest, HttpResponse incomingR
}

// Log an access log entry
_logger.LogInformation("{Method} {Url} {Protocol} {RemoteIP} {UserAgent} - {} Status - {} Bytes Received - {} Bytes Sent - Access Log",
_logger.LogTrace("{Method} {Url} {Protocol} {RemoteIP} {UserAgent} - {} Status - {} Bytes Received - {} Bytes Sent - Access Log",
accessLogProps.Method,
accessLogProps.Uri,
accessLogProps.Protocol,
Expand Down Expand Up @@ -745,7 +745,7 @@ private bool TryBackgroundDispatchOne(PendingRequest pendingRequest, ILambdaConn
RunRequestResult runRequestResult = task.Result;

// Log an access log entry
_logger.LogInformation("{Method} {Url} {Protocol} {RemoteIP} {UserAgent} - {} Status - {} Bytes Received - {} Bytes Sent - Access Log - Background",
_logger.LogTrace("{Method} {Url} {Protocol} {RemoteIP} {UserAgent} - {} Status - {} Bytes Received - {} Bytes Sent - Access Log - Background",
accessLogProps.Method,
accessLogProps.Uri,
accessLogProps.Protocol,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DebugType>portable</DebugType>
Expand Down Expand Up @@ -32,10 +34,10 @@
<PackageReference Include="AWSSDK.Lambda" Version="3.7.305.6" />
<!-- AWSSDK.SecurityToken is not directly referenced but is needed by IRSA / OIDC IAM auth -->
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.300.75" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsTestProject>true</IsTestProject>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<!-- <Optimize>false</Optimize> -->
<!-- <EnablePreviewFeatures>true</EnablePreviewFeatures> -->
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AWSProjectType>Lambda</AWSProjectType>
Expand All @@ -33,7 +33,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
<PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>PwrDrvr.LambdaDispatch.Router.Tests</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-preview.1.25120.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading