Merge pull request #9780 from livarcocc/merge_release_401_into_400

Merge release/2.1.401 into release/2.1.400
dotnet · Aug 2, 2018 · 91b1c13 · 91b1c13
2 parents 8642e60 + 817e321
commit 91b1c13
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
@@ -13,11 +13,18 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <Target Name="WriteVersionsFile" BeforeTargets="Restore">
+  <Target Name="WriteDefaultPatchVersionsFile" BeforeTargets="Restore">
+    <WriteLinesToFile
+      File="$(MSBuildThisFileDirectory)/.DefaultPatchVersionForAspNetCoreApp2_1"
+      Lines="$(DefaultPatchVersionForAspNetCoreApp2_1)"
+      Overwrite="true"/>
+  </Target>
+
+  <Target Name="WriteBundledVersionsFile" BeforeTargets="Restore">
     <WriteLinesToFile
       File="$(MSBuildThisFileDirectory)/.BundledAspNetCoreVersion"
       Lines="$(MicrosoftAspNetCoreAppPackageVersion)"
       Overwrite="true"/>
   </Target>
-
+  
 </Project>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
@@ -10,7 +10,7 @@
     <DotnetSqlCachePackageVersion>2.1.1</DotnetSqlCachePackageVersion>
     <DotnetUserSecretsPackageVersion>2.1.1</DotnetUserSecretsPackageVersion>
     <DotnetWatchPackageVersion>2.1.1</DotnetWatchPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>2.1.2</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.3-servicing-26724-03</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

diff --git a/build/Version.props b/build/Version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>2</VersionMajor>
     <VersionMinor>1</VersionMinor>
-    <VersionPatch>400</VersionPatch>
+    <VersionPatch>401</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
 
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
@@ -16,10 +16,8 @@ public class GivenAspNetAppsResolveImplicitVersions : TestBase
     {
         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 @@ public void PortablePublishWithLatestTFMUsesPinnedDownAspNetCoreAppVersion()
             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 @@ public void StandalonePublishWithLatestTFMUsesBundledAspNetCoreAppVersion()
             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
@@ -304,7 +304,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
 
             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
@@ -106,7 +106,7 @@ string GetFrameworkPackageVersion()
                 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")
                 {
-Original file line number
+Diff line change
@@ Expand Up @@
                 result.Should().NotBeNull();
-                result.Args.Should().Contain("--fx-version 2.1.2");
+                result.Args.Should().Contain("--fx-version 2.1");
             }
             [Fact]
@@ Expand Down @@