From fc4e10603a86d00e9aa564059947699b936aa08c Mon Sep 17 00:00:00 2001 From: MihaZupan Date: Thu, 6 May 2021 18:44:55 +0200 Subject: [PATCH 1/6] Add net6.0 targets --- eng/Version.Details.xml | 8 ++++++-- eng/Versions.props | 3 ++- global.json | 3 ++- samples/BasicYarpSample/BasicYarpSample.csproj | 2 +- .../ReverseProxy.Metrics.Promethius.Sample.csproj | 2 +- .../ReverseProxy.Auth.Sample.csproj | 2 +- .../ReverseProxy.Code.Sample.csproj | 2 +- .../ReverseProxy.Config.Sample.csproj | 2 +- .../ReverseProxy.ConfigFilter.Sample.csproj | 2 +- .../ReverseProxy.Direct.Sample.csproj | 2 +- .../ReverseProxy.Metrics.Sample.csproj | 2 +- .../ReverseProxy.ServiceFabric.Sample.csproj | 2 +- .../ReverseProxy.Transforms.Sample.csproj | 2 +- .../Common/TestEnvironment.cs | 2 +- .../Yarp.ReverseProxy.FunctionalTests.csproj | 2 +- .../Yarp.ReverseProxy.Kubernetes.Tests.csproj | 2 +- .../Yarp.ReverseProxy.ServiceFabric.Tests.csproj | 2 +- .../Yarp.ReverseProxy.Tests.Common.csproj | 2 +- test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj | 2 +- testassets/BenchmarkApp/BenchmarkApp.csproj | 2 +- testassets/ReverseProxy.Code/ReverseProxy.Code.csproj | 2 +- testassets/ReverseProxy.Config/ReverseProxy.Config.csproj | 2 +- testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj | 2 +- testassets/TestClient/TestClient.csproj | 2 +- testassets/TestServer/TestServer.csproj | 2 +- 25 files changed, 32 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31284e2be..15fd07c45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,13 @@ - + https://github.com/dotnet/runtime - 7ef6d50b312217d2f7c17b9697891fa8ab98a19d + e795b06c331fa7fd69e8872e3b644587a0badac7 + + + https://github.com/dotnet/aspnetcore + 1db20afa9e2dd47cfc1a935de080f74cebb9ba0b diff --git a/eng/Versions.props b/eng/Versions.props index 44ba525f8..2c7b76313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,6 +11,7 @@ - 5.0.0-rtm.20529.3 + 6.0.0-preview.5.21256.3 + 6.0.0-preview.5.21255.10 diff --git a/global.json b/global.json index 3852244b7..d2880c4d0 100644 --- a/global.json +++ b/global.json @@ -6,11 +6,12 @@ "dotnet": "6.0.100-preview.3.21202.5", "runtimes": { "dotnet": [ - "$(MicrosoftNETCoreAppPackageVersion)", + "$(MicrosoftNETCoreAppRefPackageVersion)", "3.1.14", "5.0.5" ], "aspnetcore": [ + "$(MicrosoftAspNetCoreAppRefPackageVersion)", "3.1.14", "5.0.5" ] diff --git a/samples/BasicYarpSample/BasicYarpSample.csproj b/samples/BasicYarpSample/BasicYarpSample.csproj index 7c932c02f..121881473 100644 --- a/samples/BasicYarpSample/BasicYarpSample.csproj +++ b/samples/BasicYarpSample/BasicYarpSample.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0;net5.0 latest diff --git a/samples/Prometheus/ReverseProxy.Metrics-Promethius.Sample/ReverseProxy.Metrics.Promethius.Sample.csproj b/samples/Prometheus/ReverseProxy.Metrics-Promethius.Sample/ReverseProxy.Metrics.Promethius.Sample.csproj index 84f1a530f..224774bc1 100644 --- a/samples/Prometheus/ReverseProxy.Metrics-Promethius.Sample/ReverseProxy.Metrics.Promethius.Sample.csproj +++ b/samples/Prometheus/ReverseProxy.Metrics-Promethius.Sample/ReverseProxy.Metrics.Promethius.Sample.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0;net5.0 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj b/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj index 9aa929b39..5079830ec 100644 --- a/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj +++ b/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.Code.Sample/ReverseProxy.Code.Sample.csproj b/samples/ReverseProxy.Code.Sample/ReverseProxy.Code.Sample.csproj index 377518638..e6d7c2ed0 100644 --- a/samples/ReverseProxy.Code.Sample/ReverseProxy.Code.Sample.csproj +++ b/samples/ReverseProxy.Code.Sample/ReverseProxy.Code.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.Config.Sample/ReverseProxy.Config.Sample.csproj b/samples/ReverseProxy.Config.Sample/ReverseProxy.Config.Sample.csproj index 377518638..e6d7c2ed0 100644 --- a/samples/ReverseProxy.Config.Sample/ReverseProxy.Config.Sample.csproj +++ b/samples/ReverseProxy.Config.Sample/ReverseProxy.Config.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.ConfigFilter.Sample/ReverseProxy.ConfigFilter.Sample.csproj b/samples/ReverseProxy.ConfigFilter.Sample/ReverseProxy.ConfigFilter.Sample.csproj index 377518638..e6d7c2ed0 100644 --- a/samples/ReverseProxy.ConfigFilter.Sample/ReverseProxy.ConfigFilter.Sample.csproj +++ b/samples/ReverseProxy.ConfigFilter.Sample/ReverseProxy.ConfigFilter.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.Direct.Sample/ReverseProxy.Direct.Sample.csproj b/samples/ReverseProxy.Direct.Sample/ReverseProxy.Direct.Sample.csproj index 377518638..e6d7c2ed0 100644 --- a/samples/ReverseProxy.Direct.Sample/ReverseProxy.Direct.Sample.csproj +++ b/samples/ReverseProxy.Direct.Sample/ReverseProxy.Direct.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.Metrics.Sample/ReverseProxy.Metrics.Sample.csproj b/samples/ReverseProxy.Metrics.Sample/ReverseProxy.Metrics.Sample.csproj index b428403b6..b450a19da 100644 --- a/samples/ReverseProxy.Metrics.Sample/ReverseProxy.Metrics.Sample.csproj +++ b/samples/ReverseProxy.Metrics.Sample/ReverseProxy.Metrics.Sample.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0;net5.0 Exe Yarp.Sample latest diff --git a/samples/ReverseProxy.ServiceFabric.Sample/ReverseProxy.ServiceFabric.Sample.csproj b/samples/ReverseProxy.ServiceFabric.Sample/ReverseProxy.ServiceFabric.Sample.csproj index 2dada0fd2..a1d443d9d 100644 --- a/samples/ReverseProxy.ServiceFabric.Sample/ReverseProxy.ServiceFabric.Sample.csproj +++ b/samples/ReverseProxy.ServiceFabric.Sample/ReverseProxy.ServiceFabric.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample x64 diff --git a/samples/ReverseProxy.Transforms.Sample/ReverseProxy.Transforms.Sample.csproj b/samples/ReverseProxy.Transforms.Sample/ReverseProxy.Transforms.Sample.csproj index 377518638..e6d7c2ed0 100644 --- a/samples/ReverseProxy.Transforms.Sample/ReverseProxy.Transforms.Sample.csproj +++ b/samples/ReverseProxy.Transforms.Sample/ReverseProxy.Transforms.Sample.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.Sample latest diff --git a/test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs b/test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs index 34791dd83..763cc62c4 100644 --- a/test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs +++ b/test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs @@ -38,7 +38,7 @@ public TestEnvironment( destinationServices => { }, destinationApp => { - destinationApp.Use(async (context, next) => await destinationGetDelegate(context)); + destinationApp.Run(destinationGetDelegate); }, configureProxy, configureProxyApp, diff --git a/test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj b/test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj index 35df565e7..a1787c6ab 100644 --- a/test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj +++ b/test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Library Yarp.ReverseProxy diff --git a/test/ReverseProxy.Kubernetes.Tests/Yarp.ReverseProxy.Kubernetes.Tests.csproj b/test/ReverseProxy.Kubernetes.Tests/Yarp.ReverseProxy.Kubernetes.Tests.csproj index 7ee0f8c87..33e8d169d 100644 --- a/test/ReverseProxy.Kubernetes.Tests/Yarp.ReverseProxy.Kubernetes.Tests.csproj +++ b/test/ReverseProxy.Kubernetes.Tests/Yarp.ReverseProxy.Kubernetes.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Library diff --git a/test/ReverseProxy.ServiceFabric.Tests/Yarp.ReverseProxy.ServiceFabric.Tests.csproj b/test/ReverseProxy.ServiceFabric.Tests/Yarp.ReverseProxy.ServiceFabric.Tests.csproj index 893c540ae..d01a077ae 100644 --- a/test/ReverseProxy.ServiceFabric.Tests/Yarp.ReverseProxy.ServiceFabric.Tests.csproj +++ b/test/ReverseProxy.ServiceFabric.Tests/Yarp.ReverseProxy.ServiceFabric.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Library Yarp.ReverseProxy.ServiceFabric x64 diff --git a/test/ReverseProxy.Tests.Common/Yarp.ReverseProxy.Tests.Common.csproj b/test/ReverseProxy.Tests.Common/Yarp.ReverseProxy.Tests.Common.csproj index fdeb1db01..aaa0d3f00 100644 --- a/test/ReverseProxy.Tests.Common/Yarp.ReverseProxy.Tests.Common.csproj +++ b/test/ReverseProxy.Tests.Common/Yarp.ReverseProxy.Tests.Common.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Library Yarp.ReverseProxy diff --git a/test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj b/test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj index daaa8290b..f3f358c5a 100644 --- a/test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj +++ b/test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Library Yarp.ReverseProxy diff --git a/testassets/BenchmarkApp/BenchmarkApp.csproj b/testassets/BenchmarkApp/BenchmarkApp.csproj index ffdf6fe88..c7067f1f9 100644 --- a/testassets/BenchmarkApp/BenchmarkApp.csproj +++ b/testassets/BenchmarkApp/BenchmarkApp.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 diff --git a/testassets/ReverseProxy.Code/ReverseProxy.Code.csproj b/testassets/ReverseProxy.Code/ReverseProxy.Code.csproj index 83e9596e1..2334126b4 100644 --- a/testassets/ReverseProxy.Code/ReverseProxy.Code.csproj +++ b/testassets/ReverseProxy.Code/ReverseProxy.Code.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.ReverseProxy.Sample diff --git a/testassets/ReverseProxy.Config/ReverseProxy.Config.csproj b/testassets/ReverseProxy.Config/ReverseProxy.Config.csproj index f5e6e4aed..f2b621780 100644 --- a/testassets/ReverseProxy.Config/ReverseProxy.Config.csproj +++ b/testassets/ReverseProxy.Config/ReverseProxy.Config.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.ReverseProxy.Sample diff --git a/testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj b/testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj index f5e6e4aed..f2b621780 100644 --- a/testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj +++ b/testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 Exe Yarp.ReverseProxy.Sample diff --git a/testassets/TestClient/TestClient.csproj b/testassets/TestClient/TestClient.csproj index f6f12fbea..04bfb5515 100644 --- a/testassets/TestClient/TestClient.csproj +++ b/testassets/TestClient/TestClient.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Exe diff --git a/testassets/TestServer/TestServer.csproj b/testassets/TestServer/TestServer.csproj index ee7abf0d4..4e0101aef 100644 --- a/testassets/TestServer/TestServer.csproj +++ b/testassets/TestServer/TestServer.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Exe SampleServer From 611c970cf48d2ffc68afea6c4c4bf4b2ef4a502b Mon Sep 17 00:00:00 2001 From: MihaZupan Date: Thu, 13 May 2021 13:37:58 +0200 Subject: [PATCH 2/6] Update SDK --- eng/Version.Details.xml | 8 -------- eng/Versions.props | 5 ----- global.json | 6 ++---- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15fd07c45..2646fcab8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,6 @@ - - https://github.com/dotnet/runtime - e795b06c331fa7fd69e8872e3b644587a0badac7 - - - https://github.com/dotnet/aspnetcore - 1db20afa9e2dd47cfc1a935de080f74cebb9ba0b - diff --git a/eng/Versions.props b/eng/Versions.props index 2c7b76313..e20540995 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,9 +9,4 @@ --> preview.12 - - - 6.0.0-preview.5.21256.3 - 6.0.0-preview.5.21255.10 - diff --git a/global.json b/global.json index d2880c4d0..a7f71e56c 100644 --- a/global.json +++ b/global.json @@ -1,17 +1,15 @@ { "sdk": { - "version": "6.0.100-preview.3.21202.5" + "version": "6.0.100-preview.5.21263.3" }, "tools": { - "dotnet": "6.0.100-preview.3.21202.5", + "dotnet": "6.0.100-preview.5.21263.3", "runtimes": { "dotnet": [ - "$(MicrosoftNETCoreAppRefPackageVersion)", "3.1.14", "5.0.5" ], "aspnetcore": [ - "$(MicrosoftAspNetCoreAppRefPackageVersion)", "3.1.14", "5.0.5" ] From 3371f76c28aed5506bd76fc604263697c03ca8a4 Mon Sep 17 00:00:00 2001 From: MihaZupan Date: Thu, 13 May 2021 14:15:55 +0200 Subject: [PATCH 3/6] Bump to latest arcade SDK --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf80dbc6b..dcd162449 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 - + https://github.com/dotnet/arcade - 5faea1b7965644d1f1c666a7130f6f614abe76c0 + 6b9758661f4483a70654bcaf6f8d7c6a79ee5660 diff --git a/global.json b/global.json index 04163788d..9ac8b8619 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21257.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21257.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21263.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21263.1" } } From a88f00b41e62b2ebbe9349ce35c6ac21980fb2df Mon Sep 17 00:00:00 2001 From: MihaZupan Date: Thu, 13 May 2021 14:23:08 +0200 Subject: [PATCH 4/6] Excluse 6.0 target on Auth sample --- .../ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj b/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj index 8879c9aa1..f4ccc9503 100644 --- a/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj +++ b/samples/ReverseProxy.Auth.Sample/ReverseProxy.Auth.Sample.csproj @@ -1,7 +1,7 @@ - net6.0;net5.0;netcoreapp3.1 + net5.0;netcoreapp3.1 Exe Yarp.Sample latest From 47aeea876cafdad97ed040e635cc517363d32c7a Mon Sep 17 00:00:00 2001 From: MihaZupan Date: Fri, 21 May 2021 18:11:22 +0200 Subject: [PATCH 5/6] Bump SDK version to latest --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 7214a4834..641803045 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.100-preview.5.21263.3" + "version": "6.0.100-preview.6.21271.8" }, "tools": { - "dotnet": "6.0.100-preview.5.21263.3", + "dotnet": "6.0.100-preview.6.21271.8", "runtimes": { "dotnet": [ "3.1.14", From 675250e261ea94d31e31336279cb481fa8ae12da Mon Sep 17 00:00:00 2001 From: MihaZupan Date: Fri, 21 May 2021 18:12:41 +0200 Subject: [PATCH 6/6] Keep custom Json converters in current 6.0 builds --- .../Abstractions/ClusterDiscovery/Contract/ClusterTests.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/ReverseProxy.Tests/Abstractions/ClusterDiscovery/Contract/ClusterTests.cs b/test/ReverseProxy.Tests/Abstractions/ClusterDiscovery/Contract/ClusterTests.cs index 5eca5feb2..4339fb042 100644 --- a/test/ReverseProxy.Tests/Abstractions/ClusterDiscovery/Contract/ClusterTests.cs +++ b/test/ReverseProxy.Tests/Abstractions/ClusterDiscovery/Contract/ClusterTests.cs @@ -411,7 +411,8 @@ 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 Converters = { // TimeSpans https://github.com/dotnet/runtime/issues/29932 @@ -419,7 +420,7 @@ public void Cluster_CanBeJsonSerialized() // Version https://github.com/dotnet/runtime/pull/41384 new VersionConverter() } -#endif +//#endif }; var json = JsonSerializer.Serialize(cluster1, options); var cluster2 = JsonSerializer.Deserialize(json, options);