diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
index f600e9d8e..a590d599c 100644
--- a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
+++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
@@ -13,11 +13,18 @@
-
+
+
+
+
+
-
+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 9a0d7b0bf..07e237526 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -10,7 +10,7 @@
2.1.1
2.1.1
2.1.1
- 2.1.2
+ 2.1.3-servicing-26724-03
$(MicrosoftNETCoreAppPackageVersion)
15.8.166
$(MicrosoftBuildPackageVersion)
diff --git a/build/Version.props b/build/Version.props
index cde7dcc9d..c2309c774 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -2,7 +2,7 @@
2
1
- 400
+ 401
preview
$(VersionMajor).$(VersionMinor)
diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
index 18086970a..c4096b9da 100644
--- a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
+++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
@@ -16,10 +16,8 @@ namespace EndToEnd
{
private const string AspNetTestProject = "TestWebAppSimple";
- private const string PinnedAspNetCoreImplicitVersion = "2.1.1";
-
[Fact]
- public void PortablePublishWithLatestTFMUsesPinnedDownAspNetCoreAppVersion()
+ public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion()
{
var _testInstance = TestAssets.Get(AspNetTestProject)
.CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion)
@@ -50,8 +48,11 @@ namespace EndToEnd
var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true);
restoredVersion.Should().NotBeNull();
- restoredVersion.ToNormalizedString().Should().BeEquivalentTo(PinnedAspNetCoreImplicitVersion,
- "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
+ var bundledVersionPath = Path.Combine(projectDirectory, ".DefaultPatchVersionForAspNetCoreApp2_1");
+ var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
+
+ restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
+ "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be identical to the versions generated." +
"Please update MSBuildExtensions.targets in this repo so these versions match.");
}
@@ -97,7 +98,7 @@ namespace EndToEnd
var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
- "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
+ "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be identical to the versions set in DependencyVersions.props." +
"Please update MSBuildExtensions.targets in this repo so these versions match.");
}
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index b031a50ee..6da24c7a3 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull();
- result.Args.Should().Contain("--fx-version 2.1.2");
+ result.Args.Should().Contain("--fx-version 2.1");
}
[Fact]
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
index fc16d412f..2585c50fc 100644
--- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
+++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
@@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests
var sharedFxDir = dotnetDir
.GetDirectory("shared", "Microsoft.NETCore.App")
.EnumerateDirectories()
- .Single(d => d.Name.StartsWith("2.1.2"));
+ .Single(d => d.Name.StartsWith("2.1"));
if (packageName == "microsoft.netcore.app")
{