diff --git a/Directory.Packages.props b/Directory.Packages.props index d3994391c..13ad629a4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,16 +1,15 @@ true - 9.0.4 + 10.0.0-preview.6.25358.103 + 9.0.4 8.0.15 - 7.0.20 - 6.0.36 2.70.0 1.6.0 1.8.1 1.8.0-beta.1 - 9.0.0 - 6.0.0 + 10.0.0-preview.6.25358.103 + 8.0.0 @@ -58,32 +57,32 @@ - + - - - + + + - - - - + + + + - - + + - + - + diff --git a/build/get-dotnet.sh b/build/get-dotnet.sh index 30b8e6571..4d031272a 100755 --- a/build/get-dotnet.sh +++ b/build/get-dotnet.sh @@ -27,14 +27,11 @@ echo "Downloading install script: $install_script_url => $install_script_path" curl -sSL -o $install_script_path $install_script_url chmod +x $install_script_path -# Install .NET 6 SDK to run 6.0 test targets -$install_script_path -v 6.0.423 -i $dotnet_install_path - -# Install .NET 7 SDK to run 7.0 test targets -$install_script_path -v 7.0.410 -i $dotnet_install_path - # Install .NET 8 SDK to run 8.0 test targets -$install_script_path -v 8.0.301 -i $dotnet_install_path +$install_script_path -v 8.0.412 -i $dotnet_install_path + +# Install .NET 9 SDK to run 9.0 test targets +$install_script_path -v 9.0.303 -i $dotnet_install_path # Install .NET version specified by global.json $install_script_path -v $sdk_version -i $dotnet_install_path diff --git a/examples/Aggregator/Client/Client.csproj b/examples/Aggregator/Client/Client.csproj index 3d1b72315..94116f639 100644 --- a/examples/Aggregator/Client/Client.csproj +++ b/examples/Aggregator/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Aggregator/Server/Server.csproj b/examples/Aggregator/Server/Server.csproj index 14e32a4da..417f16a44 100644 --- a/examples/Aggregator/Server/Server.csproj +++ b/examples/Aggregator/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Blazor/Client/Client.csproj b/examples/Blazor/Client/Client.csproj index 80fa209bb..b7723e6f9 100644 --- a/examples/Blazor/Client/Client.csproj +++ b/examples/Blazor/Client/Client.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Blazor/Server/Server.csproj b/examples/Blazor/Server/Server.csproj index 6823cf0d8..dd2336780 100644 --- a/examples/Blazor/Server/Server.csproj +++ b/examples/Blazor/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 46982f83-f153-443e-b589-4b2bc7b5945e diff --git a/examples/Browser/Server/Server.csproj b/examples/Browser/Server/Server.csproj index e3a9dfcfb..fd97dba4f 100644 --- a/examples/Browser/Server/Server.csproj +++ b/examples/Browser/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 wwwroot\ $(DefaultItemExcludes);$(SpaRoot)node_modules\**;$(SpaRoot)dist\** diff --git a/examples/Certifier/Client/Client.csproj b/examples/Certifier/Client/Client.csproj index 3d14ea270..33edd63ca 100644 --- a/examples/Certifier/Client/Client.csproj +++ b/examples/Certifier/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Certifier/Server/Server.csproj b/examples/Certifier/Server/Server.csproj index febaea474..5c515f784 100644 --- a/examples/Certifier/Server/Server.csproj +++ b/examples/Certifier/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Channeler/Client/Client.csproj b/examples/Channeler/Client/Client.csproj index ccfa0547c..16b30250e 100644 --- a/examples/Channeler/Client/Client.csproj +++ b/examples/Channeler/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Channeler/Server/Server.csproj b/examples/Channeler/Server/Server.csproj index ec6d11829..e7a4d84fe 100644 --- a/examples/Channeler/Server/Server.csproj +++ b/examples/Channeler/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Coder/Client/Client.csproj b/examples/Coder/Client/Client.csproj index 6df630519..1b0a11be4 100644 --- a/examples/Coder/Client/Client.csproj +++ b/examples/Coder/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Coder/Server/Server.csproj b/examples/Coder/Server/Server.csproj index af3ca08a4..f17977338 100644 --- a/examples/Coder/Server/Server.csproj +++ b/examples/Coder/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Coder/Shared/Shared.csproj b/examples/Coder/Shared/Shared.csproj index 65695795b..8ac16f51e 100644 --- a/examples/Coder/Shared/Shared.csproj +++ b/examples/Coder/Shared/Shared.csproj @@ -1,7 +1,7 @@ - net7.0 + net10.0 diff --git a/examples/Compressor/Client/Client.csproj b/examples/Compressor/Client/Client.csproj index 9a6d99f41..34766719d 100644 --- a/examples/Compressor/Client/Client.csproj +++ b/examples/Compressor/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Compressor/Server/Server.csproj b/examples/Compressor/Server/Server.csproj index fc2b70b5b..5c3a6be1a 100644 --- a/examples/Compressor/Server/Server.csproj +++ b/examples/Compressor/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Container/Backend/Backend.csproj b/examples/Container/Backend/Backend.csproj index 99ea5072f..ee8b8a8c8 100644 --- a/examples/Container/Backend/Backend.csproj +++ b/examples/Container/Backend/Backend.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Container/Backend/Dockerfile b/examples/Container/Backend/Dockerfile index 7c0429870..d47d19c94 100644 --- a/examples/Container/Backend/Dockerfile +++ b/examples/Container/Backend/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build-env WORKDIR /app # Copy everything @@ -8,7 +8,7 @@ RUN dotnet restore examples/Container/Backend RUN dotnet publish examples/Container/Backend -c Release -o out # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview WORKDIR /app COPY --from=build-env /app/out . ENTRYPOINT ["dotnet", "Backend.dll"] \ No newline at end of file diff --git a/examples/Container/Frontend/Dockerfile b/examples/Container/Frontend/Dockerfile index 017712b23..4a50f8ec1 100644 --- a/examples/Container/Frontend/Dockerfile +++ b/examples/Container/Frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build-env WORKDIR /app # Copy everything @@ -8,7 +8,7 @@ RUN dotnet restore examples/Container/Frontend RUN dotnet publish examples/Container/Frontend -c Release -o out # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview WORKDIR /app COPY --from=build-env /app/out . ENTRYPOINT ["dotnet", "Frontend.dll"] \ No newline at end of file diff --git a/examples/Container/Frontend/Frontend.csproj b/examples/Container/Frontend/Frontend.csproj index 73a9dd89a..37641461a 100644 --- a/examples/Container/Frontend/Frontend.csproj +++ b/examples/Container/Frontend/Frontend.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 $(NoWarn);CS0618 diff --git a/examples/Counter/Client/Client.csproj b/examples/Counter/Client/Client.csproj index 4ad92fb9d..2b4d310b6 100644 --- a/examples/Counter/Client/Client.csproj +++ b/examples/Counter/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Counter/Server/Server.csproj b/examples/Counter/Server/Server.csproj index dd710e141..f71d570e8 100644 --- a/examples/Counter/Server/Server.csproj +++ b/examples/Counter/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Definer/Client/Client.csproj b/examples/Definer/Client/Client.csproj index f8d8d6e7b..ac785822a 100644 --- a/examples/Definer/Client/Client.csproj +++ b/examples/Definer/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Definer/Server/Server.csproj b/examples/Definer/Server/Server.csproj index 099b6adbd..171b6409b 100644 --- a/examples/Definer/Server/Server.csproj +++ b/examples/Definer/Server/Server.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/examples/Downloader/Client/Client.csproj b/examples/Downloader/Client/Client.csproj index c09a84092..9bce7dde7 100644 --- a/examples/Downloader/Client/Client.csproj +++ b/examples/Downloader/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Downloader/Server/Server.csproj b/examples/Downloader/Server/Server.csproj index f34da753d..70919661c 100644 --- a/examples/Downloader/Server/Server.csproj +++ b/examples/Downloader/Server/Server.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/examples/Error/Client/Client.csproj b/examples/Error/Client/Client.csproj index 0ed7ee380..988990324 100644 --- a/examples/Error/Client/Client.csproj +++ b/examples/Error/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Error/Server/Server.csproj b/examples/Error/Server/Server.csproj index 4563c022e..44fd39ce6 100644 --- a/examples/Error/Server/Server.csproj +++ b/examples/Error/Server/Server.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 diff --git a/examples/Frameworker/Server/Server.csproj b/examples/Frameworker/Server/Server.csproj index fc2b70b5b..5c3a6be1a 100644 --- a/examples/Frameworker/Server/Server.csproj +++ b/examples/Frameworker/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Greeter/Client/Client.csproj b/examples/Greeter/Client/Client.csproj index 9a6d99f41..34766719d 100644 --- a/examples/Greeter/Client/Client.csproj +++ b/examples/Greeter/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Greeter/Server/Server.csproj b/examples/Greeter/Server/Server.csproj index fc2b70b5b..5c3a6be1a 100644 --- a/examples/Greeter/Server/Server.csproj +++ b/examples/Greeter/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Interceptor/Client/Client.csproj b/examples/Interceptor/Client/Client.csproj index 64dacdbc3..8a648b50d 100644 --- a/examples/Interceptor/Client/Client.csproj +++ b/examples/Interceptor/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Interceptor/Server/Server.csproj b/examples/Interceptor/Server/Server.csproj index fc2b70b5b..5c3a6be1a 100644 --- a/examples/Interceptor/Server/Server.csproj +++ b/examples/Interceptor/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Liber/Client/Client.csproj b/examples/Liber/Client/Client.csproj index c8d8a79ec..0f7b22677 100644 --- a/examples/Liber/Client/Client.csproj +++ b/examples/Liber/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Liber/Server/Server.csproj b/examples/Liber/Server/Server.csproj index 5be6023d3..c769801cb 100644 --- a/examples/Liber/Server/Server.csproj +++ b/examples/Liber/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Locator/Client/Client.csproj b/examples/Locator/Client/Client.csproj index 1922a9935..7185a3045 100644 --- a/examples/Locator/Client/Client.csproj +++ b/examples/Locator/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Locator/Server/Server.csproj b/examples/Locator/Server/Server.csproj index f17ea3c6f..c17cc89f3 100644 --- a/examples/Locator/Server/Server.csproj +++ b/examples/Locator/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Mailer/Client/Client.csproj b/examples/Mailer/Client/Client.csproj index 4514682cb..edab55a20 100644 --- a/examples/Mailer/Client/Client.csproj +++ b/examples/Mailer/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Mailer/Server/Server.csproj b/examples/Mailer/Server/Server.csproj index 4236ef3b2..2b68f8777 100644 --- a/examples/Mailer/Server/Server.csproj +++ b/examples/Mailer/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Progressor/Client/Client.csproj b/examples/Progressor/Client/Client.csproj index 32247ad3a..5122004ad 100644 --- a/examples/Progressor/Client/Client.csproj +++ b/examples/Progressor/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Progressor/Server/Server.csproj b/examples/Progressor/Server/Server.csproj index c7bf517a2..e62ce9e56 100644 --- a/examples/Progressor/Server/Server.csproj +++ b/examples/Progressor/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Racer/Client/Client.csproj b/examples/Racer/Client/Client.csproj index 981f718ae..868e54305 100644 --- a/examples/Racer/Client/Client.csproj +++ b/examples/Racer/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Racer/Server/Server.csproj b/examples/Racer/Server/Server.csproj index 6dd7f56cd..86116de71 100644 --- a/examples/Racer/Server/Server.csproj +++ b/examples/Racer/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Reflector/Client/Client.csproj b/examples/Reflector/Client/Client.csproj index ee1105f64..e95bdc6cb 100644 --- a/examples/Reflector/Client/Client.csproj +++ b/examples/Reflector/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Reflector/Server/Server.csproj b/examples/Reflector/Server/Server.csproj index 58b48987c..8d4d2b298 100644 --- a/examples/Reflector/Server/Server.csproj +++ b/examples/Reflector/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Retrier/Client/Client.csproj b/examples/Retrier/Client/Client.csproj index 0535a79a2..3f3a98073 100644 --- a/examples/Retrier/Client/Client.csproj +++ b/examples/Retrier/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Retrier/Server/Server.csproj b/examples/Retrier/Server/Server.csproj index 9ebaefee7..b2fd8052b 100644 --- a/examples/Retrier/Server/Server.csproj +++ b/examples/Retrier/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Spar/Server/Server.csproj b/examples/Spar/Server/Server.csproj index 9682c7811..8b92f95d6 100644 --- a/examples/Spar/Server/Server.csproj +++ b/examples/Spar/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 ClientApp\ $(SpaRoot)node_modules\**;$(SpaRoot)dist\**;$(DefaultItemExcludes) true diff --git a/examples/Tester/Client/Client.csproj b/examples/Tester/Client/Client.csproj index da9910e40..8c1a8e92f 100644 --- a/examples/Tester/Client/Client.csproj +++ b/examples/Tester/Client/Client.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 dotnet-Client-33BD397C-6A11-40D0-AF85-24B9610F7517 diff --git a/examples/Tester/Server/Server.csproj b/examples/Tester/Server/Server.csproj index 266d8597f..f52d4ce7b 100644 --- a/examples/Tester/Server/Server.csproj +++ b/examples/Tester/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Tester/Tests/Tests.csproj b/examples/Tester/Tests/Tests.csproj index 5859b2fb4..09bff55de 100644 --- a/examples/Tester/Tests/Tests.csproj +++ b/examples/Tester/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Ticketer/Client/Client.csproj b/examples/Ticketer/Client/Client.csproj index aa0e18841..875e1e7a7 100644 --- a/examples/Ticketer/Client/Client.csproj +++ b/examples/Ticketer/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Ticketer/Server/Server.csproj b/examples/Ticketer/Server/Server.csproj index 52e46dea4..fd43901f7 100644 --- a/examples/Ticketer/Server/Server.csproj +++ b/examples/Ticketer/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Transcoder/Server/Server.csproj b/examples/Transcoder/Server/Server.csproj index 0d0f2eb3e..194529dc0 100644 --- a/examples/Transcoder/Server/Server.csproj +++ b/examples/Transcoder/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 true $(NoWarn);1591 diff --git a/examples/Transporter/Client/Client.csproj b/examples/Transporter/Client/Client.csproj index 672f25b07..80bf7ef84 100644 --- a/examples/Transporter/Client/Client.csproj +++ b/examples/Transporter/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Transporter/Server/Server.csproj b/examples/Transporter/Server/Server.csproj index fc2b70b5b..5c3a6be1a 100644 --- a/examples/Transporter/Server/Server.csproj +++ b/examples/Transporter/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Uploader/Client/Client.csproj b/examples/Uploader/Client/Client.csproj index 7b7d15087..a77e89c1c 100644 --- a/examples/Uploader/Client/Client.csproj +++ b/examples/Uploader/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Uploader/Server/Server.csproj b/examples/Uploader/Server/Server.csproj index bf8165e50..489af2c02 100644 --- a/examples/Uploader/Server/Server.csproj +++ b/examples/Uploader/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Vigor/Client/Client.csproj b/examples/Vigor/Client/Client.csproj index e77948dc6..889b3148b 100644 --- a/examples/Vigor/Client/Client.csproj +++ b/examples/Vigor/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/examples/Vigor/Server/Server.csproj b/examples/Vigor/Server/Server.csproj index 60cc7e312..5897e5485 100644 --- a/examples/Vigor/Server/Server.csproj +++ b/examples/Vigor/Server/Server.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/examples/Worker/Client/Client.csproj b/examples/Worker/Client/Client.csproj index ede4044ae..5bc6714ad 100644 --- a/examples/Worker/Client/Client.csproj +++ b/examples/Worker/Client/Client.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 dotnet-Client-33BD397C-6A11-40D0-AF85-24B9610F7517 diff --git a/examples/Worker/Server/Server.csproj b/examples/Worker/Server/Server.csproj index 83e22cf3f..82e11db08 100644 --- a/examples/Worker/Server/Server.csproj +++ b/examples/Worker/Server/Server.csproj @@ -1,13 +1,12 @@ - net9.0 + net10.0 - diff --git a/global.json b/global.json index 3be1c15ac..efa5f91c5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.300", + "version": "10.0.100-preview.6.25358.103", "rollForward": "latestFeature" } } diff --git a/nuget.config b/nuget.config index d5ff7157f..3c4259971 100644 --- a/nuget.config +++ b/nuget.config @@ -6,6 +6,7 @@ + diff --git a/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj b/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj index 22c7d13f7..feea8e58d 100644 --- a/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj +++ b/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj b/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj index 0489c6031..676a1f8ec 100644 --- a/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj +++ b/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 Exe $(DefineConstants);GRPC_WEB diff --git a/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj b/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj index 2db58d328..01c73d67b 100644 --- a/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj +++ b/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 Exe diff --git a/perf/benchmarkapps/QpsWorker/QpsWorker.csproj b/perf/benchmarkapps/QpsWorker/QpsWorker.csproj index fbdb88186..80e483b97 100644 --- a/perf/benchmarkapps/QpsWorker/QpsWorker.csproj +++ b/perf/benchmarkapps/QpsWorker/QpsWorker.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable diff --git a/src/Grpc.AspNetCore.HealthChecks/Grpc.AspNetCore.HealthChecks.csproj b/src/Grpc.AspNetCore.HealthChecks/Grpc.AspNetCore.HealthChecks.csproj index ea485f312..7f0f93155 100644 --- a/src/Grpc.AspNetCore.HealthChecks/Grpc.AspNetCore.HealthChecks.csproj +++ b/src/Grpc.AspNetCore.HealthChecks/Grpc.AspNetCore.HealthChecks.csproj @@ -6,7 +6,7 @@ true true - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 $(WarningsNotAsErrors);CA2007 diff --git a/src/Grpc.AspNetCore.Server.ClientFactory/Grpc.AspNetCore.Server.ClientFactory.csproj b/src/Grpc.AspNetCore.Server.ClientFactory/Grpc.AspNetCore.Server.ClientFactory.csproj index e41360758..6b704a6bb 100644 --- a/src/Grpc.AspNetCore.Server.ClientFactory/Grpc.AspNetCore.Server.ClientFactory.csproj +++ b/src/Grpc.AspNetCore.Server.ClientFactory/Grpc.AspNetCore.Server.ClientFactory.csproj @@ -6,7 +6,7 @@ true true - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 $(WarningsNotAsErrors);CA2007 diff --git a/src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj b/src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj index 41aa22c11..3de89f0ad 100644 --- a/src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj +++ b/src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj @@ -6,7 +6,7 @@ true true - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 $(WarningsNotAsErrors);CA2007 diff --git a/src/Grpc.AspNetCore.Server/Grpc.AspNetCore.Server.csproj b/src/Grpc.AspNetCore.Server/Grpc.AspNetCore.Server.csproj index 5c9434c7d..24d945d99 100644 --- a/src/Grpc.AspNetCore.Server/Grpc.AspNetCore.Server.csproj +++ b/src/Grpc.AspNetCore.Server/Grpc.AspNetCore.Server.csproj @@ -6,7 +6,7 @@ true true - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 README.md diff --git a/src/Grpc.AspNetCore.Web/Grpc.AspNetCore.Web.csproj b/src/Grpc.AspNetCore.Web/Grpc.AspNetCore.Web.csproj index 47ce8f2c0..c5c9bd8f1 100644 --- a/src/Grpc.AspNetCore.Web/Grpc.AspNetCore.Web.csproj +++ b/src/Grpc.AspNetCore.Web/Grpc.AspNetCore.Web.csproj @@ -6,7 +6,7 @@ true true - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 README.md diff --git a/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj b/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj index ebee3d50b..c6e3ebcf4 100644 --- a/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj +++ b/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj @@ -5,7 +5,7 @@ gRPC RPC HTTP/2 aspnetcore true - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 README.md diff --git a/src/Grpc.AspNetCore/lib/net6.0/_._ b/src/Grpc.AspNetCore/lib/net10.0/_._ similarity index 100% rename from src/Grpc.AspNetCore/lib/net6.0/_._ rename to src/Grpc.AspNetCore/lib/net10.0/_._ diff --git a/src/Grpc.AspNetCore/lib/net7.0/_._ b/src/Grpc.AspNetCore/lib/net7.0/_._ deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj b/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj index f14250984..0f5f33fbd 100755 --- a/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj +++ b/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj @@ -5,7 +5,7 @@ true true - net462;netstandard2.0;net6.0;net7.0;net8.0 + net462;netstandard2.0;net8.0;net9.0;net10.0 README.md diff --git a/src/Grpc.Net.Client.Web/Grpc.Net.Client.Web.csproj b/src/Grpc.Net.Client.Web/Grpc.Net.Client.Web.csproj index efeaa8396..4b8ade894 100644 --- a/src/Grpc.Net.Client.Web/Grpc.Net.Client.Web.csproj +++ b/src/Grpc.Net.Client.Web/Grpc.Net.Client.Web.csproj @@ -6,7 +6,7 @@ true true - netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0 README.md diff --git a/src/Grpc.Net.Client/Grpc.Net.Client.csproj b/src/Grpc.Net.Client/Grpc.Net.Client.csproj index cb67a091c..e159b2738 100644 --- a/src/Grpc.Net.Client/Grpc.Net.Client.csproj +++ b/src/Grpc.Net.Client/Grpc.Net.Client.csproj @@ -6,7 +6,7 @@ true true - net462;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + net462;netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0 README.md @@ -18,7 +18,7 @@ - + SUPPORT_LOAD_BALANCING;$(DefineConstants) diff --git a/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj b/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj index 13d5b30d7..4b9b1c5eb 100644 --- a/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj +++ b/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj @@ -6,7 +6,7 @@ true true - netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0 README.md diff --git a/src/Grpc.Net.Common/Grpc.Net.Common.csproj b/src/Grpc.Net.Common/Grpc.Net.Common.csproj index 55581ce2a..8fe992aa7 100644 --- a/src/Grpc.Net.Common/Grpc.Net.Common.csproj +++ b/src/Grpc.Net.Common/Grpc.Net.Common.csproj @@ -6,7 +6,7 @@ true true - netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0 + netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0 diff --git a/src/dotnet-grpc/dotnet-grpc.csproj b/src/dotnet-grpc/dotnet-grpc.csproj index c48025ae9..3625ad820 100644 --- a/src/dotnet-grpc/dotnet-grpc.csproj +++ b/src/dotnet-grpc/dotnet-grpc.csproj @@ -4,7 +4,7 @@ gRPC RPC CLI true - net6.0 + net8.0 exe true @@ -25,9 +25,6 @@ - - - diff --git a/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj b/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj index 91868df0f..801711abc 100644 --- a/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj +++ b/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 false true @@ -9,7 +9,7 @@ True - + SUPPORT_LOAD_BALANCING;$(DefineConstants) @@ -52,16 +52,13 @@ - - - - - - + + + diff --git a/test/FunctionalTests/Linker/LinkerTests.cs b/test/FunctionalTests/Linker/LinkerTests.cs index 6c538db1e..fddfe3263 100644 --- a/test/FunctionalTests/Linker/LinkerTests.cs +++ b/test/FunctionalTests/Linker/LinkerTests.cs @@ -36,12 +36,14 @@ public class LinkerTests #if NET9_0_OR_GREATER [Test] + [Ignore("Currently not working on .NET 10 SDK")] public async Task RunWebsiteAndCallWithClient_Aot_Success() { await RunWebsiteAndCallWithClient(publishAot: true); } [Test] + [Ignore("Currently not working on .NET 10 SDK")] public async Task RunWebsiteAndCallWithClient_Trimming_Success() { await RunWebsiteAndCallWithClient(publishAot: false); diff --git a/test/Grpc.AspNetCore.Server.ClientFactory.Tests/Grpc.AspNetCore.Server.ClientFactory.Tests.csproj b/test/Grpc.AspNetCore.Server.ClientFactory.Tests/Grpc.AspNetCore.Server.ClientFactory.Tests.csproj index 3c5fe497b..cf79474bd 100644 --- a/test/Grpc.AspNetCore.Server.ClientFactory.Tests/Grpc.AspNetCore.Server.ClientFactory.Tests.csproj +++ b/test/Grpc.AspNetCore.Server.ClientFactory.Tests/Grpc.AspNetCore.Server.ClientFactory.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 false true diff --git a/test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj b/test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj index fa750b505..ab2bed89b 100644 --- a/test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj +++ b/test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 false true diff --git a/test/Grpc.Core.Api.Tests/Grpc.Core.Api.Tests.csproj b/test/Grpc.Core.Api.Tests/Grpc.Core.Api.Tests.csproj index d0c171e5b..496db3ea6 100755 --- a/test/Grpc.Core.Api.Tests/Grpc.Core.Api.Tests.csproj +++ b/test/Grpc.Core.Api.Tests/Grpc.Core.Api.Tests.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net8.0;net9.0;net10.0 true true diff --git a/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj b/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj index 37558de8e..29aa14868 100755 --- a/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj +++ b/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net8.0;net9.0;net10.0 true diff --git a/test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj b/test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj index d83170b49..f141c93e2 100644 --- a/test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj +++ b/test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj @@ -1,12 +1,12 @@ - net462;net6.0;net7.0;net8.0;net9.0 + net462;net8.0;net9.0;net10.0 false true - + SUPPORT_LOAD_BALANCING;$(DefineConstants) diff --git a/test/Grpc.Net.Client.Web.Tests/Grpc.Net.Client.Web.Tests.csproj b/test/Grpc.Net.Client.Web.Tests/Grpc.Net.Client.Web.Tests.csproj index 8b573508b..1289fc1e9 100644 --- a/test/Grpc.Net.Client.Web.Tests/Grpc.Net.Client.Web.Tests.csproj +++ b/test/Grpc.Net.Client.Web.Tests/Grpc.Net.Client.Web.Tests.csproj @@ -1,7 +1,7 @@ - net462;net6.0;net7.0;net8.0;net9.0 + net462;net8.0;net9.0;net10.0 false true diff --git a/test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj b/test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj index bdd09a4c2..a8240644b 100644 --- a/test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj +++ b/test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj @@ -1,7 +1,7 @@ - net462;net6.0;net7.0;net8.0;net9.0 + net462;net8.0;net9.0;net10.0 false true true diff --git a/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj b/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj index d4085e615..359a70e13 100755 --- a/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj +++ b/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj @@ -1,6 +1,6 @@ - net462;net6.0 + net462;net8.0;net9.0;net10.0 true diff --git a/test/Grpc.StatusProto.Tests/Grpc.StatusProto.Tests.csproj b/test/Grpc.StatusProto.Tests/Grpc.StatusProto.Tests.csproj index ab1751a89..3d9196154 100644 --- a/test/Grpc.StatusProto.Tests/Grpc.StatusProto.Tests.csproj +++ b/test/Grpc.StatusProto.Tests/Grpc.StatusProto.Tests.csproj @@ -1,6 +1,6 @@ - net462;net6.0;net7.0;net8.0;net9.0 + net462;net8.0;net9.0;net10.0 true diff --git a/test/dotnet-grpc.Tests/dotnet-grpc.Tests.csproj b/test/dotnet-grpc.Tests/dotnet-grpc.Tests.csproj index e6ccc8110..78084624d 100644 --- a/test/dotnet-grpc.Tests/dotnet-grpc.Tests.csproj +++ b/test/dotnet-grpc.Tests/dotnet-grpc.Tests.csproj @@ -2,7 +2,7 @@ - net9.0 + net10.0 false Grpc.Dotnet.Cli.Tests diff --git a/testassets/BenchmarkWorkerWebsite/BenchmarkWorkerWebsite.csproj b/testassets/BenchmarkWorkerWebsite/BenchmarkWorkerWebsite.csproj index ce5b40be2..6c5cef36d 100644 --- a/testassets/BenchmarkWorkerWebsite/BenchmarkWorkerWebsite.csproj +++ b/testassets/BenchmarkWorkerWebsite/BenchmarkWorkerWebsite.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 InProcess false diff --git a/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj b/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj index 621f664f4..b923bc454 100644 --- a/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj +++ b/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj @@ -2,7 +2,7 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0;net10.0 InProcess false @@ -12,7 +12,7 @@ - + diff --git a/testassets/InteropTestsClient/InteropTestsClient.csproj b/testassets/InteropTestsClient/InteropTestsClient.csproj index 3ebd216d0..9527fb48c 100644 --- a/testassets/InteropTestsClient/InteropTestsClient.csproj +++ b/testassets/InteropTestsClient/InteropTestsClient.csproj @@ -2,8 +2,8 @@ Exe - net9.0;net8.0;net7.0;net6.0;net462 - net9.0 + net10.0;net9.0;net8.0;net462 + net10.0 diff --git a/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj b/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj index 3e1663dda..2e6d2915a 100644 --- a/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj +++ b/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 BLAZOR_WASM true diff --git a/testassets/InteropTestsGrpcWebWebsite/Dockerfile b/testassets/InteropTestsGrpcWebWebsite/Dockerfile index 9a71faacf..936631ce8 100644 --- a/testassets/InteropTestsGrpcWebWebsite/Dockerfile +++ b/testassets/InteropTestsGrpcWebWebsite/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build-env WORKDIR /app # Copy everything @@ -8,7 +8,7 @@ RUN dotnet restore testassets/InteropTestsGrpcWebWebsite RUN dotnet publish testassets/InteropTestsGrpcWebWebsite -c Release -o out # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview WORKDIR /app COPY --from=build-env /app/out . ENTRYPOINT ["dotnet", "InteropTestsGrpcWebWebsite.dll", "--urls", "http://+:80"] diff --git a/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj b/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj index 100f66fb4..1183a7f28 100644 --- a/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj +++ b/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj b/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj index 1076eb19c..81b6ed2d8 100644 --- a/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj +++ b/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/testassets/InteropTestsWebsite/Dockerfile b/testassets/InteropTestsWebsite/Dockerfile index 59cdeb214..7de972823 100644 --- a/testassets/InteropTestsWebsite/Dockerfile +++ b/testassets/InteropTestsWebsite/Dockerfile @@ -1,14 +1,14 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build-env WORKDIR /app # Copy everything COPY . ./ RUN dotnet --info RUN dotnet restore testassets/InteropTestsWebsite -RUN dotnet publish testassets/InteropTestsWebsite --framework net9.0 -c Release -o out -p:LatestFramework=true +RUN dotnet publish testassets/InteropTestsWebsite --framework net10.0 -c Release -o out -p:LatestFramework=true # Build runtime image -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview WORKDIR /app COPY --from=build-env /app/out . ENTRYPOINT ["dotnet", "InteropTestsWebsite.dll", "--port_http1", "80"] \ No newline at end of file diff --git a/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj b/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj index 6a5c61a1a..57d8f7f55 100644 --- a/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj +++ b/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj @@ -1,8 +1,8 @@ - net9.0 - net9.0 + net10.0 + net10.0 InProcess false diff --git a/testassets/LinkerTestsClient/LinkerTestsClient.csproj b/testassets/LinkerTestsClient/LinkerTestsClient.csproj index 9cb327f97..43c162eb8 100644 --- a/testassets/LinkerTestsClient/LinkerTestsClient.csproj +++ b/testassets/LinkerTestsClient/LinkerTestsClient.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 Exe true $(AppPublishAot) diff --git a/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj b/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj index af85e659e..94c2a1f52 100644 --- a/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj +++ b/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 Exe true $(AppPublishAot)