Skip to content

Commit ef77760

Browse files
JamesNKJamesNK
authored
Multi-target .NET 5 (#987)
1 parent 6df196c commit ef77760

File tree

128 files changed

+887
-343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+887
-343
lines changed

‎build/dependencies.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<GrpcDotNetPackageVersion>2.30.0</GrpcDotNetPackageVersion> <!-- Used by example projects -->
66
<GrpcPackageVersion>2.31.0-pre2</GrpcPackageVersion>
77
<MicrosoftAspNetCoreAppPackageVersion>3.1.3</MicrosoftAspNetCoreAppPackageVersion>
8-
<MicrosoftAspNetCoreBlazorPackageVersion>3.2.0</MicrosoftAspNetCoreBlazorPackageVersion>
8+
<MicrosoftAspNetCoreBlazorPackageVersion>5.0.0-rc.1.20381.8</MicrosoftAspNetCoreBlazorPackageVersion>
9+
<MicrosoftAspNetCoreBlazor31PackageVersion>3.2.0</MicrosoftAspNetCoreBlazor31PackageVersion>
910
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
1011
<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
1112
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>3.0.0</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>

‎build/get-dotnet.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,8 @@ echo "Downloading install script: $install_script_url => $install_script_path"
2727
curl -sSL -o $install_script_path $install_script_url
2828
chmod +x $install_script_path
2929

30+
# Install .NET Core 3.x SDK to run 3.x test targets
31+
$install_script_path -v 3.1.300 -i $dotnet_install_path
32+
33+
# Install .NET version specified by global.json
3034
$install_script_path -v $sdk_version -i $dotnet_install_path

‎build_and_test.sh‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ example_solutions=( $( ls examples/**/*.sln ) )
2727

2828
for example_solution in "${example_solutions[@]}"
2929
do
30-
# dotnet build uses msbuild, and attempts to speed consecutive builds by reusing processes.
31-
# This can become a problem when multiple versions of Grpc.Tools are used between builds.
32-
# The different versions will conflict. Shutdown build processes between builds to avoid conflicts.
33-
# Will be fixed in msbuild 16.5 - https://github.com/microsoft/msbuild/issues/1754
34-
dotnet build-server shutdown
35-
3630
dotnet build $example_solution -c Release
3731
done
3832

@@ -42,20 +36,11 @@ test_projects=( $( ls test/**/*Tests.csproj ) )
4236

4337
for test_project in "${test_projects[@]}"
4438
do
45-
# "dotnet test" is hanging when it writes to console for an unknown reason
46-
# Tracking issue at https://github.com/microsoft/vstest/issues/2080
47-
# Write test output to a text file and then write the text file to console as a workaround
48-
{
49-
dotnet test $test_project -c Release -v n --no-build &> ${test_project##*/}.log.txt &&
50-
echo "Success" &&
51-
cat ${test_project##*/}.log.txt
52-
} || {
53-
echo "Failure" &&
54-
cat ${test_project##*/}.log.txt &&
55-
exit 1
56-
}
39+
# https://github.com/microsoft/vstest/issues/2080#issuecomment-539879345
40+
dotnet test $test_project -c Release -v n --no-build < /dev/null
5741
done
5842

5943
echo "Tests finished"
6044

61-
source grpcweb_interoptests.sh
45+
# Temporarily disable while using nightly .NET SDK build
46+
# source grpcweb_interoptests.sh

‎examples/Blazor/Client/Client.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreBlazorPackageVersion)" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(MicrosoftAspNetCoreBlazorPackageVersion)" PrivateAssets="all" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreBlazorPackageVersion)" PrivateAssets="all" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" PrivateAssets="all" />
1212

1313
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1414
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />

‎examples/Blazor/Server/Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Protobuf Include="..\Proto\count.proto" GrpcServices="Server" Link="Protos\count.proto" />
1010

1111
<PackageReference Include="Microsoft.AspNetCore.Components" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftAspNetCoreBlazorPackageVersion)" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" />
1313
<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcDotNetPackageVersion)" />
1414
<PackageReference Include="Grpc.AspNetCore.Web" Version="$(GrpcDotNetPackageVersion)" />
1515
</ItemGroup>

‎examples/Worker/Client/Client.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Worker">
2-
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
<!--
3+
TODO(JamesNK): SDK temporarily changed from Microsoft.NET.Sdk.Worker to Microsoft.NET.Sdk.Web
4+
because of .NET 5 bug.
5+
-->
6+
37
<PropertyGroup>
48
<TargetFramework>netcoreapp3.1</TargetFramework>
59
<UserSecretsId>dotnet-Client-33BD397C-6A11-40D0-AF85-24B9610F7517</UserSecretsId>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.1.300"
3+
"version": "5.0.100-rc.1.20419.15"
44
}
55
}

‎perf/Grpc.AspNetCore.Microbenchmarks/Client/UnaryClientBenchmarkBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void GlobalSetup()
5656

5757
var handler = TestHttpMessageHandler.Create(async r =>
5858
{
59-
await r.Content.CopyToAsync(Stream.Null);
59+
await r.Content!.CopyToAsync(Stream.Null);
6060

6161
var content = new ByteArrayContent(requestMessage);
6262
content.Headers.ContentType = new MediaTypeHeaderValue("application/grpc");

‎perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎perf/Grpc.AspNetCore.Microbenchmarks/Internal/TestHttpResposneTrailersFeature.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ namespace Grpc.AspNetCore.Microbenchmarks.Internal
2323
{
2424
public class TestHttpResponseTrailersFeature : IHttpResponseTrailersFeature
2525
{
26-
public IHeaderDictionary? Trailers { get; set; }
26+
public IHeaderDictionary Trailers { get; set; } = default!;
2727
}
2828
}

0 commit comments

Comments
 (0)