diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a77fc9160..278a1250c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -35,6 +35,9 @@ <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12 + <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -238,6 +241,17 @@ Copyright (c) .NET Foundation. All rights reserved. Profile="WindowsForms" /> + + diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs index 8b809382a..bfc399813 100644 --- a/test/EndToEnd/GivenFrameworkDependentApps.cs +++ b/test/EndToEnd/GivenFrameworkDependentApps.cs @@ -19,7 +19,7 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; @@ -31,7 +31,7 @@ namespace EndToEnd [ClassData(typeof(SupportedAspNetCoreVersions))] public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 7cf1512bd..9dda617fa 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -23,7 +23,7 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; @@ -35,7 +35,7 @@ namespace EndToEnd [ClassData(typeof(SupportedAspNetCoreVersions))] public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 6c9adff95..ee70c9548 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -21,7 +21,8 @@ namespace EndToEnd "2.0", "2.1", "2.2", - "3.0" + "3.0", + "3.1", }; } }