diff --git a/eng/Versions.props b/eng/Versions.props index 2e3a50c1a..683a1e541 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 3 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index c55b4c2cc..5a2fb8170 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 28)) + $([MSBuild]::Add($(VersionFeature), 27)) $([MSBuild]::Add($(VersionFeature), 15)) diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs index f6d55f644..235e8a4cf 100644 --- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs +++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Xml.Linq; using EndToEnd; using FluentAssertions; using Microsoft.DotNet.Tools.Test.Utilities; @@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd testProjectCreator.AdditionalProperties["OutputType"] = "exe"; testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid; - var testInstance = testProjectCreator.Create(); + // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed + static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project) + { + XNamespace ns = project.Root.Name.Namespace; + var target = XElement.Parse(@" + + 3.1.10 + + + + 3.1.10 + + "); + target.Name = ns + target.Name.LocalName; + project.Root.Add(target); + } + TestFramework.TestAssetInstance testInstance + = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion); new PublishCommand() .WithWorkingDirectory(testInstance.Root.FullName) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 794dd1478..b652d18ae 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -141,5 +141,30 @@ Skip="true" Issue="" Reason="Need all .NET core runtime"/> + + + + + + +