Skip to content

Add net6.0 targets #972

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.

Sign up for GitHub

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

Merged
MihaZupan merged 8 commits into from
May 21, 2021
Merged

Add net6.0 targets #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fc4e106
Add net6.0 targets
MihaZupan May 6, 2021
611c970
Update SDK
MihaZupan May 13, 2021
d335726
Merge branch 'main' into test-net6
MihaZupan May 13, 2021
3371f76
Bump to latest arcade SDK
MihaZupan May 13, 2021
a88f00b
Excluse 6.0 target on Auth sample
MihaZupan May 13, 2021
60a70f0
Merge main
MihaZupan May 21, 2021
47aeea8
Bump SDK version to latest
MihaZupan May 21, 2021
675250e
Keep custom Json converters in current 6.0 builds
MihaZupan May 21, 2021
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
4 changes: 0 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rtm.20529.3">
Comment thread
Tratcher marked this conversation as resolved.
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7ef6d50b312217d2f7c17b9697891fa8ab98a19d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21264.2">
Expand Down
4 changes: 0 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,4 @@
-->
<PreReleaseVersionLabel>preview.12</PreReleaseVersionLabel>
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>5.0.0-rtm.20529.3</MicrosoftNETCoreAppPackageVersion>
</PropertyGroup>
</Project>
5 changes: 2 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"sdk": {
"version": "6.0.100-preview.3.21202.5"
Copy link
Copy Markdown
Member Author

@MihaZupan MihaZupan May 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While CI is happy with this, this should further wait for dotnet/sdk#17461 to be fixed so that we can continue working locally.

It was useful that we did this early to spot issues like the AspNetCore bug but it shouldn't be criticial to merge ASAP.

"version": "6.0.100-preview.6.21271.8"
},
"tools": {
"dotnet": "6.0.100-preview.3.21202.5",
"dotnet": "6.0.100-preview.6.21271.8",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppPackageVersion)",
"3.1.14",
"5.0.5"
],
Expand Down
2 changes: 1 addition & 1 deletion samples/BasicYarpSample/BasicYarpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFrameworks>net6.0;net5.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...heus/ReverseProxy.Metrics-Promethius.Sample/ReverseProxy.Metrics.Promethius.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.Code.Sample/ReverseProxy.Code.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.Config.Sample/ReverseProxy.Config.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.ConfigFilter.Sample/ReverseProxy.ConfigFilter.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.Direct.Sample/ReverseProxy.Direct.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.Metrics.Sample/ReverseProxy.Metrics.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.ServiceFabric.Sample/ReverseProxy.ServiceFabric.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<PlatformTarget>x64</PlatformTarget>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReverseProxy.Transforms.Sample/ReverseProxy.Transforms.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.Sample</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public TestEnvironment(
destinationServices => { },
destinationApp =>
{
destinationApp.Use(async (context, next) => await destinationGetDelegate(context));
destinationApp.Run(destinationGetDelegate);
},
configureProxy,
configureProxyApp,
Expand Down
2 changes: 1 addition & 1 deletion test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Yarp.ReverseProxy</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/ReverseProxy.Kubernetes.Tests/Yarp.ReverseProxy.Kubernetes.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/ReverseProxy.ServiceFabric.Tests/Yarp.ReverseProxy.ServiceFabric.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Yarp.ReverseProxy.ServiceFabric</RootNamespace>
<PlatformTarget>x64</PlatformTarget>
Expand Down
2 changes: 1 addition & 1 deletion test/ReverseProxy.Tests.Common/Yarp.ReverseProxy.Tests.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Yarp.ReverseProxy</RootNamespace>
</PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions test/ReverseProxy.Tests/Abstractions/ClusterDiscovery/Contract/ClusterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,16 @@ public void Cluster_CanBeJsonSerialized()

var options = new JsonSerializerOptions
{
#if !NET6_0_OR_GREATER
// Future 6.0 builds will contain the fix to these missing converters
//#if !NET6_0_OR_GREATER
Comment on lines +414 to +415
Copy link
Copy Markdown
Member Author

@MihaZupan MihaZupan May 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Tratcher this PR is now unblocked with the latest SDK+VS version.

I had to revert this #if until we start consuming future 6.0 builds with the json fix.

Converters =
{
// TimeSpans https://github.com/dotnet/runtime/issues/29932
new TimeSpanConverter(),
// Version https://github.com/dotnet/runtime/pull/41384
new VersionConverter()
}
#endif
//#endif
};
var json = JsonSerializer.Serialize(cluster1, options);
var cluster2 = JsonSerializer.Deserialize<ClusterConfig>(json, options);
Expand Down
2 changes: 1 addition & 1 deletion test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Yarp.ReverseProxy</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion testassets/BenchmarkApp/BenchmarkApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion testassets/ReverseProxy.Code/ReverseProxy.Code.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.ReverseProxy.Sample</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion testassets/ReverseProxy.Config/ReverseProxy.Config.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.ReverseProxy.Sample</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>Yarp.ReverseProxy.Sample</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion testassets/TestClient/TestClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion testassets/TestServer/TestServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>SampleServer</RootNamespace>
</PropertyGroup>
Expand Down