From d0b5a76c820025a1a2a0d9c9a16bee9049de91e2 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 12 Mar 2020 13:02:10 -0700 Subject: [PATCH 1/2] Updating to 2.1.17 patch version --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b657fdb0c..8dcd9397b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -108,7 +108,7 @@ + LatestVersion="2.1.17" /> + LatestVersion="2.1.17"/> + LatestVersion="2.1.17"/> Date: Tue, 17 Mar 2020 15:51:02 -0700 Subject: [PATCH 2/2] Disable tests for rolling forward to latest version These tests only catch issues after a patch has been publicly released, and fail if we try to update the implicit versions before then --- .../GivenSelfContainedAppsRollForward.cs | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 6b85a2400..0b6dd8898 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -16,40 +16,6 @@ namespace EndToEnd { public partial class GivenSelfContainedAppsRollForward : TestBase { - - [Theory] - // MemberData is used instead of InlineData here so we can access it in another test to - // verify that we are covering the latest release of .NET Core - [ClassData(typeof(SupportedNetCoreAppVersions))] - public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) - { - if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - ItRollsForwardToTheLatestVersion(TestProjectCreator.NETCorePackageName, minorVersion); - } - - [Theory] - [ClassData(typeof(SupportedAspNetCoreVersions))] - public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) - { - if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAppPackageName, minorVersion); - } - - [Theory] - [ClassData(typeof(SupportedAspNetCoreAllVersions))] - public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion) - { - ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAllPackageName, minorVersion); - } - internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion) { var testProjectCreator = new TestProjectCreator()