Merge pull request #9632 from peterhuene/merge-2.1.2xx-msrc

Merge release/2.1.2xx-MSRC to release/2.1.2xx
dotnet · Jul 10, 2018 · 2b84062 · 2b84062
2 parents 90fc9fb + 3773ff8
commit 2b84062
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 40 deletions.
diff --git a/build/Branding.props b/build/Branding.props
@@ -1,8 +1,8 @@
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core SDK - 2.1.201</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core SDK - 2.1.202</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
-    <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.7</SharedFrameworkBrandName>
+    <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.9</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>
 

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
 
-    <MicrosoftNETCoreAppPackageVersion>2.0.7</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.0.9</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <MicrosoftBuildPackageVersion>15.7.179</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
@@ -59,16 +59,16 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
 
-    <AspNetCoreTemplatePackageVersion>2.0.8</AspNetCoreTemplatePackageVersion>
+    <AspNetCoreTemplatePackageVersion>2.0.9</AspNetCoreTemplatePackageVersion>
     <!-- This should either be timestamped or notimestamp as appropriate.
     AspNetCoreRelease is only used if the value of this property is "timestamped" -->
     <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
 
     <!--BranchName and AspNetCoreVersion will not always be the same-->
-    <AspNetCoreBranchName>2.0.8</AspNetCoreBranchName>
+    <AspNetCoreBranchName>2.0.9</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
-    <AspNetCoreVersion>2.0.8</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>10026</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreVersion>2.0.9</AspNetCoreVersion>
+    <AspNetCoreRuntimePackageTimestamp>10031</AspNetCoreRuntimePackageTimestamp>
     <CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'=='notimestamp'">$(AspNetCoreVersion)</CurrentAspNetCoreRuntimeVersion>
     <CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'!='notimestamp'">$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</CurrentAspNetCoreRuntimeVersion>
 
@@ -82,6 +82,7 @@
       This list should be sorted most recent version to oldest.
     -->
     <AspNetCoreRuntimeStoreVersion Include="$(CurrentAspNetCoreRuntimeVersion)" />
+    <AspNetCoreRuntimeStoreVersion Include="2.0.8" />
     <AspNetCoreRuntimeStoreVersion Include="2.0.7" />
     <AspNetCoreRuntimeStoreVersion Include="2.0.6" />
     <AspNetCoreRuntimeStoreVersion Include="2.0.5" />

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

diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
@@ -7,8 +7,8 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.201</li>
-                    <li>.NET Core Runtime 2.0.7</li>
+                    <li>.NET Core SDK 2.1.202</li>
+                    <li>.NET Core Runtime 2.0.9</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
@@ -50,8 +50,8 @@
   <String Id="FirstTimeWelcomeMessage">The installation was successful
 
 The following were installed at [DOTNETHOME]
-    • .NET Core SDK 2.1.201
-    • .NET Core Runtime 2.0.7
+    • .NET Core SDK 2.1.202
+    • .NET Core Runtime 2.0.9
     • Runtime Package Store
 
 This product collects usage data

diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -303,7 +303,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
 
             result.Should().NotBeNull();
 
-            result.Args.Should().Contain("--fx-version 2.0.7");
+            result.Args.Should().Contain("--fx-version 2.0.9");
         }
 
         [Fact]

diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs
@@ -76,7 +76,7 @@ private void CreateAndRestoreNewProject(
 
         [Theory]
         [InlineData("console", "microsoft.netcore.app", "2.0.0")]
-        [InlineData("classlib", "netstandard.library", "2.0.1")]
+        [InlineData("classlib", "netstandard.library", "2.0.3")]
         public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion)
         {
             var rootPath = TestAssets.CreateTestDirectory(identifier: $"_{type}").FullName;