Skip to content

Commit b9cb880

Browse files
JamesNKcaptainsafia
JamesNK
and
captainsafia
authored
Update all solution projects to .NET 6 (#1503)
Co-authored-by: Safia Abdalla <[email protected]>
1 parent 0d5a300 commit b9cb880

File tree

13 files changed

+23
-18
lines changed

13 files changed

+23
-18
lines changed

‎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>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<ProjectReference Include="..\..\..\src\Grpc.AspNetCore.Web\Grpc.AspNetCore.Web.csproj" />
4141
</ItemGroup>
4242

43-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
43+
<ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">
4444
<ProjectReference Include="..\..\..\src\Grpc.AspNetCore.Server\Grpc.AspNetCore.Server.csproj" />
4545

4646
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />

‎perf/benchmarkapps/GrpcClient/GrpcClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<ProjectReference Include="..\..\..\src\Grpc.AspNetCore.Web\Grpc.AspNetCore.Web.csproj" />
4343
</ItemGroup>
4444

45-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
45+
<ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">
4646
<ProjectReference Include="..\..\..\src\Grpc.Net.Client\Grpc.Net.Client.csproj" />
4747

4848
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />

‎perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎testassets/BenchmarkWorkerWebsite/BenchmarkWorkerWebsite.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
77
</PropertyGroup>

‎testassets/FunctionalTestsWebsite/FunctionalTestsWebsite.csproj‎

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

33
<PropertyGroup>
44
<!-- Multi-target because this website is referenced by Grpc.AspNetCore.FunctionalTests which also multi-targets -->
5-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
66
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
77
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
88
</PropertyGroup>

‎testassets/InteropTestsClient/InteropTestsClient.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks Condition="'$(LatestFramework)'!='true'">net6.0;net5.0;net472</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(LatestFramework)'=='true'">net5.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(LatestFramework)'=='true'">net6.0</TargetFrameworks>
77
</PropertyGroup>
88

99
<ItemGroup>
@@ -43,8 +43,13 @@
4343
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
4444
</ItemGroup>
4545

46-
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
46+
<ItemGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))">
4747
<ProjectReference Include="..\..\src\Grpc.Net.Client.Web\Grpc.Net.Client.Web.csproj" />
4848
</ItemGroup>
4949

50+
<!-- Ensure TargetFrameworkVersion also has a value so VersionGreaterThanOrEquals doesn't break -->
51+
<PropertyGroup Condition="'$(TargetFrameworkVersion)' == ''">
52+
<TargetFrameworkVersion >v0.0</TargetFrameworkVersion>
53+
</PropertyGroup>
54+
5055
</Project>

‎testassets/InteropTestsGrpcWebClient/InteropTestsGrpcWebClient.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<DefineConstants>BLAZOR_WASM</DefineConstants>
66
</PropertyGroup>
77

@@ -17,8 +17,8 @@
1717
<ProjectReference Include="..\..\src\Grpc.Net.Client.Web\Grpc.Net.Client.Web.csproj" />
1818
<ProjectReference Include="..\..\src\Grpc.Net.Client\Grpc.Net.Client.csproj" />
1919

20-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreApp5PackageVersion)" />
21-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreApp5PackageVersion)" PrivateAssets="all" />
20+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
21+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="all" />
2222

2323
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
2424

‎testassets/InteropTestsGrpcWebWebsite/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN dotnet restore testassets/InteropTestsGrpcWebWebsite
88
RUN dotnet publish testassets/InteropTestsGrpcWebWebsite -c Release -o out
99

1010
# Build runtime image
11-
FROM mcr.microsoft.com/dotnet/aspnet:5.0
11+
FROM mcr.microsoft.com/dotnet/aspnet:6.0
1212
WORKDIR /app
1313
COPY --from=build-env /app/out .
1414
ENTRYPOINT ["dotnet", "InteropTestsGrpcWebWebsite.dll"]

‎testassets/InteropTestsGrpcWebWebsite/InteropTestsGrpcWebWebsite.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftAspNetCoreApp5PackageVersion)" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
99
</ItemGroup>
1010

1111
<ItemGroup>

0 commit comments

Comments
 (0)