diff --git a/Directory.Build.props b/Directory.Build.props index e30431ee5..dfaecc5d9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,4 @@ - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 9f0387b43..6acf57e53 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -26,8 +26,8 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 0ba3b4266..000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,38 +0,0 @@ - - - 0.13.1 - 1.46.0 - 3.23.1 - 2.55.0 - 2.46.6 - 2.59.0 - 8.0.0 - 7.0.5 - 6.0.11 - 1.5.5 - 16.9.0 - 8.0.0-preview.23525.2 - 0.2.0-alpha.21255.1 - 2.1.1 - 8.0.0 - 6.0.0 - 17.6.2 - 1.1.1 - 4.6.0 - 4.16.1 - 13.0.3 - 3.13.3 - 4.5.0 - 1.3.0 - 1.0.0-rc9.4 - 1.0.140 - 2.0.0-beta4.22272.1 - 0.4.0-alpha.22272.1 - 6.0.1 - 5.0.1 - 4.5.3 - 7.0.0 - 4.7.0 - 4.6.0 - - diff --git a/build/sources.props b/build/sources.props deleted file mode 100644 index 9ae061e9d..000000000 --- a/build/sources.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json; - - - $(RestoreSources); - $(MSBuildThisFileDirectory)feed; - - - - $(RestoreSources); - https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev; - - - diff --git a/examples/Aggregator/Client/Client.csproj b/examples/Aggregator/Client/Client.csproj index 82725e6b4..9766a3ba9 100644 --- a/examples/Aggregator/Client/Client.csproj +++ b/examples/Aggregator/Client/Client.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/examples/Aggregator/Server/Program.cs b/examples/Aggregator/Server/Program.cs index 47ff917cb..b4e08703c 100644 --- a/examples/Aggregator/Server/Program.cs +++ b/examples/Aggregator/Server/Program.cs @@ -28,14 +28,23 @@ if (bool.TryParse(builder.Configuration["EnableOpenTelemetry"], out var enableOpenTelemetry) && enableOpenTelemetry) { - builder.Services.AddOpenTelemetryTracing(telemetry => - { - telemetry.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("aggregator")); - telemetry.AddZipkinExporter(); - telemetry.AddGrpcClientInstrumentation(); - telemetry.AddHttpClientInstrumentation(); - telemetry.AddAspNetCoreInstrumentation(); - }); + builder.Services.AddOpenTelemetry() + .WithTracing(tracing => + { + tracing.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("aggregator")); + + if (builder.Environment.IsDevelopment()) + { + // We want to view all traces in development + tracing.SetSampler(new AlwaysOnSampler()); + } + + tracing.AddAspNetCoreInstrumentation() + .AddGrpcClientInstrumentation() + .AddHttpClientInstrumentation(); + + tracing.AddZipkinExporter(); + }); } // These clients will call back to the server diff --git a/examples/Aggregator/Server/Server.csproj b/examples/Aggregator/Server/Server.csproj index ce7833801..2d90e0ffb 100644 --- a/examples/Aggregator/Server/Server.csproj +++ b/examples/Aggregator/Server/Server.csproj @@ -9,13 +9,13 @@ - + - - - - - + + + + + diff --git a/examples/Blazor/Client/Client.csproj b/examples/Blazor/Client/Client.csproj index 835cb8d6a..b035bfcde 100644 --- a/examples/Blazor/Client/Client.csproj +++ b/examples/Blazor/Client/Client.csproj @@ -5,13 +5,13 @@ - - + + - - - - + + + + diff --git a/examples/Blazor/Server/Server.csproj b/examples/Blazor/Server/Server.csproj index 4469974ae..a9ead59e4 100644 --- a/examples/Blazor/Server/Server.csproj +++ b/examples/Blazor/Server/Server.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/examples/Browser/Server/Server.csproj b/examples/Browser/Server/Server.csproj index fd1f75795..e0de0c89f 100644 --- a/examples/Browser/Server/Server.csproj +++ b/examples/Browser/Server/Server.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/examples/Certifier/Client/Client.csproj b/examples/Certifier/Client/Client.csproj index 169262cbc..305a3ffec 100644 --- a/examples/Certifier/Client/Client.csproj +++ b/examples/Certifier/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + PreserveNewest diff --git a/examples/Certifier/Server/Server.csproj b/examples/Certifier/Server/Server.csproj index d5892760e..21dd2d465 100644 --- a/examples/Certifier/Server/Server.csproj +++ b/examples/Certifier/Server/Server.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/Channeler/Client/Client.csproj b/examples/Channeler/Client/Client.csproj index d8ec85d21..baf93058a 100644 --- a/examples/Channeler/Client/Client.csproj +++ b/examples/Channeler/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Channeler/Server/Server.csproj b/examples/Channeler/Server/Server.csproj index acf3349ba..01a0f54ee 100644 --- a/examples/Channeler/Server/Server.csproj +++ b/examples/Channeler/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Coder/Client/Client.csproj b/examples/Coder/Client/Client.csproj index 0e3eb72e9..c0f322c33 100644 --- a/examples/Coder/Client/Client.csproj +++ b/examples/Coder/Client/Client.csproj @@ -8,6 +8,6 @@ - + diff --git a/examples/Coder/Server/Server.csproj b/examples/Coder/Server/Server.csproj index 1a0268fbf..5ff1ffe54 100644 --- a/examples/Coder/Server/Server.csproj +++ b/examples/Coder/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Coder/Shared/Shared.csproj b/examples/Coder/Shared/Shared.csproj index abf200964..65695795b 100644 --- a/examples/Coder/Shared/Shared.csproj +++ b/examples/Coder/Shared/Shared.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/Compressor/Client/Client.csproj b/examples/Compressor/Client/Client.csproj index b89acddf0..8e1210c5b 100644 --- a/examples/Compressor/Client/Client.csproj +++ b/examples/Compressor/Client/Client.csproj @@ -8,8 +8,8 @@ - - - + + + diff --git a/examples/Compressor/Server/Server.csproj b/examples/Compressor/Server/Server.csproj index 404c76f13..680f20ede 100644 --- a/examples/Compressor/Server/Server.csproj +++ b/examples/Compressor/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Container/Backend/Backend.csproj b/examples/Container/Backend/Backend.csproj index 1be09dd9b..fcea85f43 100644 --- a/examples/Container/Backend/Backend.csproj +++ b/examples/Container/Backend/Backend.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/examples/Container/Frontend/Frontend.csproj b/examples/Container/Frontend/Frontend.csproj index 1efa3abb6..20b98a480 100644 --- a/examples/Container/Frontend/Frontend.csproj +++ b/examples/Container/Frontend/Frontend.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/examples/Counter/Client/Client.csproj b/examples/Counter/Client/Client.csproj index a54cb8700..107cacb53 100644 --- a/examples/Counter/Client/Client.csproj +++ b/examples/Counter/Client/Client.csproj @@ -8,8 +8,8 @@ - - - + + + diff --git a/examples/Counter/Server/Server.csproj b/examples/Counter/Server/Server.csproj index 6f464220c..31b325a93 100644 --- a/examples/Counter/Server/Server.csproj +++ b/examples/Counter/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Downloader/Client/Client.csproj b/examples/Downloader/Client/Client.csproj index 9b90b6467..db9574e88 100644 --- a/examples/Downloader/Client/Client.csproj +++ b/examples/Downloader/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Downloader/Server/Server.csproj b/examples/Downloader/Server/Server.csproj index a1800480e..18b2d741c 100644 --- a/examples/Downloader/Server/Server.csproj +++ b/examples/Downloader/Server/Server.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/Frameworker/Client/Client.csproj b/examples/Frameworker/Client/Client.csproj index 7d1b0eded..0bb7e7c64 100644 --- a/examples/Frameworker/Client/Client.csproj +++ b/examples/Frameworker/Client/Client.csproj @@ -8,10 +8,10 @@ - - - + + + - + diff --git a/examples/Frameworker/Server/Server.csproj b/examples/Frameworker/Server/Server.csproj index 404c76f13..680f20ede 100644 --- a/examples/Frameworker/Server/Server.csproj +++ b/examples/Frameworker/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Greeter/Client/Client.csproj b/examples/Greeter/Client/Client.csproj index b89acddf0..8e1210c5b 100644 --- a/examples/Greeter/Client/Client.csproj +++ b/examples/Greeter/Client/Client.csproj @@ -8,8 +8,8 @@ - - - + + + diff --git a/examples/Greeter/Server/Server.csproj b/examples/Greeter/Server/Server.csproj index 404c76f13..680f20ede 100644 --- a/examples/Greeter/Server/Server.csproj +++ b/examples/Greeter/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Interceptor/Client/Client.csproj b/examples/Interceptor/Client/Client.csproj index 3277b8fd0..472ada4fd 100644 --- a/examples/Interceptor/Client/Client.csproj +++ b/examples/Interceptor/Client/Client.csproj @@ -8,10 +8,10 @@ - - - - - + + + + + diff --git a/examples/Interceptor/Server/Server.csproj b/examples/Interceptor/Server/Server.csproj index 404c76f13..680f20ede 100644 --- a/examples/Interceptor/Server/Server.csproj +++ b/examples/Interceptor/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Liber/Client/Client.csproj b/examples/Liber/Client/Client.csproj index e1a0536da..9f1e8dc8f 100644 --- a/examples/Liber/Client/Client.csproj +++ b/examples/Liber/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Liber/Common/Common.csproj b/examples/Liber/Common/Common.csproj index 3c6c47e33..6cba9e5e1 100644 --- a/examples/Liber/Common/Common.csproj +++ b/examples/Liber/Common/Common.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/Liber/Server/Server.csproj b/examples/Liber/Server/Server.csproj index 1b15eae08..2d35cfd27 100644 --- a/examples/Liber/Server/Server.csproj +++ b/examples/Liber/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Locator/Client/Client.csproj b/examples/Locator/Client/Client.csproj index 4919c103f..e5ef1144e 100644 --- a/examples/Locator/Client/Client.csproj +++ b/examples/Locator/Client/Client.csproj @@ -9,8 +9,8 @@ - - - + + + diff --git a/examples/Locator/Server/Server.csproj b/examples/Locator/Server/Server.csproj index a0d383bff..449017aa1 100644 --- a/examples/Locator/Server/Server.csproj +++ b/examples/Locator/Server/Server.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/Mailer/Client/Client.csproj b/examples/Mailer/Client/Client.csproj index 9532b3522..170d78b8f 100644 --- a/examples/Mailer/Client/Client.csproj +++ b/examples/Mailer/Client/Client.csproj @@ -8,8 +8,8 @@ - - - + + + diff --git a/examples/Mailer/Server/Server.csproj b/examples/Mailer/Server/Server.csproj index 58f6ab39a..1309342ae 100644 --- a/examples/Mailer/Server/Server.csproj +++ b/examples/Mailer/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Progressor/Client/Client.csproj b/examples/Progressor/Client/Client.csproj index 9019c3996..632226100 100644 --- a/examples/Progressor/Client/Client.csproj +++ b/examples/Progressor/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Progressor/Server/Server.csproj b/examples/Progressor/Server/Server.csproj index b4d26a186..2da2c884e 100644 --- a/examples/Progressor/Server/Server.csproj +++ b/examples/Progressor/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/README.md b/examples/README.md index 00d5c1887..b8c25e053 100644 --- a/examples/README.md +++ b/examples/README.md @@ -4,7 +4,7 @@ Examples of basic gRPC scenarios with gRPC for .NET. If you are brand new to gRPC on .NET a good place to start is the getting started tutorial: [Create a gRPC client and server in ASP.NET Core](https://docs.microsoft.com/aspnet/core/tutorials/grpc/grpc-start) -**NOTE:** The example projects use version numbers from [dependencies.props](../build/dependencies.props) when referencing packages. For example: ``. Example projects that are copied outside of the repository must update package versions to run correctly. +**NOTE:** The example projects use version numbers from [Directory.Packages.props](../Directory.Packages.props) when referencing packages. For example: ``. Example projects that are copied outside of the repository must update package versions to run correctly. ## [Greeter](./Greeter) diff --git a/examples/Racer/Client/Client.csproj b/examples/Racer/Client/Client.csproj index e756589ac..90db58512 100644 --- a/examples/Racer/Client/Client.csproj +++ b/examples/Racer/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Racer/Server/Server.csproj b/examples/Racer/Server/Server.csproj index 3105ac87e..59f5c52aa 100644 --- a/examples/Racer/Server/Server.csproj +++ b/examples/Racer/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Reflector/Client/Client.csproj b/examples/Reflector/Client/Client.csproj index 8cc7bcbd1..4e1ac31a2 100644 --- a/examples/Reflector/Client/Client.csproj +++ b/examples/Reflector/Client/Client.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/examples/Reflector/Server/Server.csproj b/examples/Reflector/Server/Server.csproj index e3ed5054b..e24a3b947 100644 --- a/examples/Reflector/Server/Server.csproj +++ b/examples/Reflector/Server/Server.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/Retrier/Client/Client.csproj b/examples/Retrier/Client/Client.csproj index e6bf2e9d7..046507e85 100644 --- a/examples/Retrier/Client/Client.csproj +++ b/examples/Retrier/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Retrier/Server/Server.csproj b/examples/Retrier/Server/Server.csproj index 1c5f79704..67ba04a00 100644 --- a/examples/Retrier/Server/Server.csproj +++ b/examples/Retrier/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Spar/Server/Server.csproj b/examples/Spar/Server/Server.csproj index 2962d6b62..a32b09140 100644 --- a/examples/Spar/Server/Server.csproj +++ b/examples/Spar/Server/Server.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/examples/Tester/Client/Client.csproj b/examples/Tester/Client/Client.csproj index 9777f34f0..7e43e143b 100644 --- a/examples/Tester/Client/Client.csproj +++ b/examples/Tester/Client/Client.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/examples/Tester/Common/Common.csproj b/examples/Tester/Common/Common.csproj index c1873ff2b..5b14c9662 100644 --- a/examples/Tester/Common/Common.csproj +++ b/examples/Tester/Common/Common.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/examples/Tester/Server/Server.csproj b/examples/Tester/Server/Server.csproj index 3891f91f1..fb4baa57e 100644 --- a/examples/Tester/Server/Server.csproj +++ b/examples/Tester/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Tester/Tests/Tests.csproj b/examples/Tester/Tests/Tests.csproj index 22fa8ebba..d84a0288d 100644 --- a/examples/Tester/Tests/Tests.csproj +++ b/examples/Tester/Tests/Tests.csproj @@ -7,13 +7,13 @@ - - - + + + - - - + + + diff --git a/examples/Ticketer/Client/Client.csproj b/examples/Ticketer/Client/Client.csproj index 4bb790dd2..ddfba064c 100644 --- a/examples/Ticketer/Client/Client.csproj +++ b/examples/Ticketer/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Ticketer/Server/Server.csproj b/examples/Ticketer/Server/Server.csproj index 9e5161a07..7dbccdcbe 100644 --- a/examples/Ticketer/Server/Server.csproj +++ b/examples/Ticketer/Server/Server.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/Transcoder/Server/Server.csproj b/examples/Transcoder/Server/Server.csproj index ef6ecb4e2..79ccd89ff 100644 --- a/examples/Transcoder/Server/Server.csproj +++ b/examples/Transcoder/Server/Server.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/examples/Transporter/Client/Client.csproj b/examples/Transporter/Client/Client.csproj index 3b90dcb95..7252a42eb 100644 --- a/examples/Transporter/Client/Client.csproj +++ b/examples/Transporter/Client/Client.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/examples/Transporter/Server/Server.csproj b/examples/Transporter/Server/Server.csproj index 404c76f13..680f20ede 100644 --- a/examples/Transporter/Server/Server.csproj +++ b/examples/Transporter/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Uploader/Client/Client.csproj b/examples/Uploader/Client/Client.csproj index f7af02533..b25c76e98 100644 --- a/examples/Uploader/Client/Client.csproj +++ b/examples/Uploader/Client/Client.csproj @@ -8,8 +8,8 @@ - - - + + + diff --git a/examples/Uploader/Server/Server.csproj b/examples/Uploader/Server/Server.csproj index d4a653221..3ee3e6d55 100644 --- a/examples/Uploader/Server/Server.csproj +++ b/examples/Uploader/Server/Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Vigor/Client/Client.csproj b/examples/Vigor/Client/Client.csproj index 9d8c63356..099181b74 100644 --- a/examples/Vigor/Client/Client.csproj +++ b/examples/Vigor/Client/Client.csproj @@ -6,11 +6,11 @@ - + - - - + + + diff --git a/examples/Vigor/Server/Server.csproj b/examples/Vigor/Server/Server.csproj index 1d7f1ab1c..81518c4ca 100644 --- a/examples/Vigor/Server/Server.csproj +++ b/examples/Vigor/Server/Server.csproj @@ -5,7 +5,7 @@ - + diff --git a/examples/Worker/Client/Client.csproj b/examples/Worker/Client/Client.csproj index d0fe2e84d..0166c8625 100644 --- a/examples/Worker/Client/Client.csproj +++ b/examples/Worker/Client/Client.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/examples/Worker/Server/Server.csproj b/examples/Worker/Server/Server.csproj index b1962ad5f..0307d536f 100644 --- a/examples/Worker/Server/Server.csproj +++ b/examples/Worker/Server/Server.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/nuget.config b/nuget.config new file mode 100644 index 000000000..4582ceb5e --- /dev/null +++ b/nuget.config @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj b/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj index c7928aa33..45b95f9f0 100644 --- a/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj +++ b/perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj b/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj index 4c03808ed..1577f2652 100644 --- a/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj +++ b/perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj @@ -37,14 +37,10 @@ PreserveNewest - - - - - + + + + @@ -53,8 +49,8 @@ - - + + diff --git a/perf/benchmarkapps/GrpcClient/GrpcClient.csproj b/perf/benchmarkapps/GrpcClient/GrpcClient.csproj index 1cfa79873..2883361de 100644 --- a/perf/benchmarkapps/GrpcClient/GrpcClient.csproj +++ b/perf/benchmarkapps/GrpcClient/GrpcClient.csproj @@ -23,15 +23,15 @@ - - - - - - - - - + + + + + + + + + @@ -51,7 +51,7 @@ - + diff --git a/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj b/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj index 15e8096b6..4a9ec3872 100644 --- a/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj +++ b/perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/perf/benchmarkapps/QpsWorker/QpsWorker.csproj b/perf/benchmarkapps/QpsWorker/QpsWorker.csproj index 550a2c90e..53026e188 100644 --- a/perf/benchmarkapps/QpsWorker/QpsWorker.csproj +++ b/perf/benchmarkapps/QpsWorker/QpsWorker.csproj @@ -10,8 +10,8 @@ - - + + 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 2762fbff7..d74e86d4b 100644 --- a/src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj +++ b/src/Grpc.AspNetCore.Server.Reflection/Grpc.AspNetCore.Server.Reflection.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj b/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj index daed66c6d..b1ddeab61 100644 --- a/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj +++ b/src/Grpc.AspNetCore/Grpc.AspNetCore.csproj @@ -25,9 +25,9 @@ - + - + diff --git a/src/Grpc.Auth/Grpc.Auth.csproj b/src/Grpc.Auth/Grpc.Auth.csproj index af058881c..3c8c2b847 100755 --- a/src/Grpc.Auth/Grpc.Auth.csproj +++ b/src/Grpc.Auth/Grpc.Auth.csproj @@ -18,7 +18,7 @@ - + @@ -26,12 +26,4 @@ - - - - all - runtime; build; native; contentfiles; analyzers - - - diff --git a/src/Grpc.Core.Api/Grpc.Core.Api.csproj b/src/Grpc.Core.Api/Grpc.Core.Api.csproj index bb6756d1e..cc69897ef 100755 --- a/src/Grpc.Core.Api/Grpc.Core.Api.csproj +++ b/src/Grpc.Core.Api/Grpc.Core.Api.csproj @@ -20,7 +20,7 @@ - + @@ -28,12 +28,4 @@ - - - - all - runtime; build; native; contentfiles; analyzers - - - diff --git a/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj b/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj index d3e02fc34..f7b92dc1a 100755 --- a/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj +++ b/src/Grpc.HealthCheck/Grpc.HealthCheck.csproj @@ -18,8 +18,8 @@ - - + + 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 dd2c5ed84..efeaa8396 100644 --- a/src/Grpc.Net.Client.Web/Grpc.Net.Client.Web.csproj +++ b/src/Grpc.Net.Client.Web/Grpc.Net.Client.Web.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Grpc.Net.Client/Grpc.Net.Client.csproj b/src/Grpc.Net.Client/Grpc.Net.Client.csproj index fd081925b..b97499188 100644 --- a/src/Grpc.Net.Client/Grpc.Net.Client.csproj +++ b/src/Grpc.Net.Client/Grpc.Net.Client.csproj @@ -11,11 +11,11 @@ - + - + @@ -23,7 +23,7 @@ - + diff --git a/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj b/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj index d81cf9925..0c77d633e 100644 --- a/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj +++ b/src/Grpc.Net.ClientFactory/Grpc.Net.ClientFactory.csproj @@ -26,6 +26,6 @@ - + diff --git a/src/Grpc.Reflection/Grpc.Reflection.csproj b/src/Grpc.Reflection/Grpc.Reflection.csproj index 63b23d665..1d33ebacb 100755 --- a/src/Grpc.Reflection/Grpc.Reflection.csproj +++ b/src/Grpc.Reflection/Grpc.Reflection.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/dotnet-grpc/dotnet-grpc.csproj b/src/dotnet-grpc/dotnet-grpc.csproj index 3367a3273..3b246baeb 100644 --- a/src/dotnet-grpc/dotnet-grpc.csproj +++ b/src/dotnet-grpc/dotnet-grpc.csproj @@ -22,11 +22,11 @@ - - - - - + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 9f4cf5816..dd9105147 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj b/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj index 75868d72c..7ca90678c 100644 --- a/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj +++ b/test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj @@ -42,7 +42,7 @@ - + PreserveNewest @@ -59,13 +59,13 @@ - + - + - + diff --git a/test/FunctionalTests/Linker/LinkerTests.cs b/test/FunctionalTests/Linker/LinkerTests.cs index b69e7a192..8e26122bf 100644 --- a/test/FunctionalTests/Linker/LinkerTests.cs +++ b/test/FunctionalTests/Linker/LinkerTests.cs @@ -139,7 +139,7 @@ private static string GetRuntimeIdentifier() var architecture = RuntimeInformation.OSArchitecture.ToString().ToLower(); if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - return "win10-" + architecture; + return "win-" + architecture; } if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { 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 f47fd586c..00b441816 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 @@ -24,9 +24,9 @@ - - - + + + 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 48e5ac1c7..747ba71af 100644 --- a/test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj +++ b/test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj @@ -37,8 +37,8 @@ - - + + diff --git a/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj b/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj index b21a318f8..8459bec05 100755 --- a/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj +++ b/test/Grpc.HealthCheck.Tests/Grpc.HealthCheck.Tests.csproj @@ -8,7 +8,7 @@ - + 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 dd56315b6..adc6008ca 100644 --- a/test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj +++ b/test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj @@ -38,10 +38,10 @@ - - - - + + + + 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 6a9f3b384..50163ccb4 100644 --- a/test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj +++ b/test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj b/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj index 5a7ca19ad..365b569f2 100755 --- a/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj +++ b/test/Grpc.Reflection.Tests/Grpc.Reflection.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj b/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj index 8b84a4522..faf0d8bc5 100644 --- a/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj +++ b/testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj @@ -12,7 +12,7 @@ - + diff --git a/testassets/InteropTestsClient/InteropTestsClient.csproj b/testassets/InteropTestsClient/InteropTestsClient.csproj index 083dd338c..8912d97e9 100644 --- a/testassets/InteropTestsClient/InteropTestsClient.csproj +++ b/testassets/InteropTestsClient/InteropTestsClient.csproj @@ -29,15 +29,15 @@ PreserveNewest - - - - - - - - - + + + + + + + + + @@ -47,9 +47,9 @@ - - - + + + diff --git a/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj b/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj index 56a80374c..aa7946604 100644 --- a/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj +++ b/testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj @@ -18,13 +18,13 @@ - - + + - + - - + + diff --git a/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj b/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj index 04977bb5b..21eb23201 100644 --- a/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj +++ b/testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj @@ -5,7 +5,7 @@ - + diff --git a/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj b/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj index ccf03cdba..47f83aa54 100644 --- a/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj +++ b/testassets/InteropTestsNativeServer/InteropTestsNativeServer.csproj @@ -12,11 +12,11 @@ PreserveNewest - + - - - + + + diff --git a/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj b/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj index 477f330fd..ec4a60184 100644 --- a/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj +++ b/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/testassets/LinkerTestsClient/LinkerTestsClient.csproj b/testassets/LinkerTestsClient/LinkerTestsClient.csproj index de774718b..46c1308c3 100644 --- a/testassets/LinkerTestsClient/LinkerTestsClient.csproj +++ b/testassets/LinkerTestsClient/LinkerTestsClient.csproj @@ -15,10 +15,10 @@ - - - - + + + + diff --git a/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj b/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj index 7c85bbef4..ed6d46389 100644 --- a/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj +++ b/testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj @@ -4,11 +4,12 @@ net8.0 Exe true - full + false @@ -18,8 +19,8 @@ - - + +