Merge branch 'release/2.1-MSRC' into merge_release_21_msrc

* release/2.1-MSRC:
  Update to consume aspnetcore 2.0.5-155
  Update to consume aspnetcore 2.0.5-152
  Revert "Update to consume aspnetcore 2.0.5-152"
  Update to consume aspnetcore 2.0.5-152
  Commit to trigger a rebuild of the CLI because of a build in place from the Runtime.
  Adding the 2.0.3 asp.net store to the native installer tests.
  Update to consume aspnetcore 2.0.5-147
  Update to consume aspnetcore 2.0.5-146
  Updating the runtime to 2.0.5.
  Update to consume aspnetcore 2.0.5-142
  Fixing the expected fx-version.
  Adding a separate dependency version for Microsoft.Build.Runtime.
  Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.

 Conflicts:
  build/DependencyVersions.props

README.md

@@ -226,3 +226,4 @@ License
 -------
 
 By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).
+

build/Branding.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <SdkBrandName>Microsoft .NET Core SDK - 2.1.4</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
-    <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.4</SharedFrameworkBrandName>
+    <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.5</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>
 

build/DependencyVersions.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>2.0.4</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.0.5</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <MicrosoftBuildPackageVersion>15.5.180</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
@@ -60,14 +60,14 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
 
-    <AspNetCoreTemplatePackageVersion>2.0.3</AspNetCoreTemplatePackageVersion>
+    <AspNetCoreTemplatePackageVersion>2.0.5</AspNetCoreTemplatePackageVersion>
     <!-- This should either be timestamped or notimestamp as appropriate -->
     <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
     <!--BranchName and AspNetCoreVersion will not always be the same-->
-    <AspNetCoreBranchName>2.0.3</AspNetCoreBranchName>
+    <AspNetCoreBranchName>2.0.5</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
-    <AspNetCoreVersion>2.0.3</AspNetCoreVersion>
+    <AspNetCoreVersion>2.0.5</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>127</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreRuntimePackageTimestamp>155</AspNetCoreRuntimePackageTimestamp>
 
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

build/package/Installer.DEB.proj

@@ -26,6 +26,7 @@
       <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime200)" />
+      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime203)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime)" />
 
       <!-- Create layout: Binaries -->
@@ -89,6 +90,7 @@
       <!-- Remove Shared Framework and Debian Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
+      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName203)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
@@ -110,6 +112,7 @@
       <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime200)" />
+      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime203)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime)" />
 
       <Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
@@ -125,6 +128,7 @@
       <!-- Clean up Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
+      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName203)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />

build/package/Installer.DEB.targets

@@ -37,6 +37,7 @@
       <HostDebianPackageName>dotnet-host</HostDebianPackageName>
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
+      <AspNetCoreRuntimePackageName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3</AspNetCoreRuntimePackageName203>
       <AspNetCoreRuntimePackageName Condition=" '$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp' ">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
       <HostRidInAspNetCoreRuntimeDebInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeDebInstallerFileName>
       <AspNetCoreRuntimeDebInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName>
@@ -125,12 +126,17 @@
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
       <AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName200>
-      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200</DownloadedSharedAspNetCoreRuntime200>
+      <AspNetCoreRuntimeDebInstallerFileName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName203>
+      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
+      <DownloadedSharedAspNetCoreRuntime203>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203)</DownloadedSharedAspNetCoreRuntime203>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
+    <DownloadFile
+               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName203)$(CoreSetupBlobAccessTokenParam)"
+               DestinationPath="$(DownloadedSharedAspNetCoreRuntime203)"/>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>

build/package/Installer.RPM.targets

@@ -54,6 +54,7 @@
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
+      <AspNetCoreRuntimePackageName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3</AspNetCoreRuntimePackageName203>
       <AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageVersion>
       <AspNetCoreRuntimePackageVersion Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreVersion)</AspNetCoreRuntimePackageVersion>
       <AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
@@ -187,12 +188,17 @@
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
       <AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName200>
+      <AspNetCoreRuntimeRpmInstallerFileName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName203>
       <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
+      <DownloadedSharedAspNetCoreRuntime203>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203)</DownloadedSharedAspNetCoreRuntime203>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
+    <DownloadFile
+               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName203)$(CoreSetupBlobAccessTokenParam)"
+               DestinationPath="$(DownloadedSharedAspNetCoreRuntime203)"/>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
@@ -232,6 +238,7 @@
     <Exec Command="sudo yum -y install $(DownloadedHostFxrInstallerFile)" />
     <Exec Command="sudo yum -y install $(DownloadedSharedFrameworkInstallerFile)" />
     <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime200)" />
+    <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime203)" />
     <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime)" />
 
     <Exec Command="sudo yum -y install $(SdkInstallerFile)" />
@@ -248,6 +255,7 @@
     <Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
 
     <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
+    <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName203)" />
     <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName200)" />
     <Exec Command="sudo yum remove -y $(SharedFxRpmPackageName)" />
     <Exec Command="sudo yum remove -y $(HostFxrRpmPackageName)" />

packaging/osx/clisdk/resources/cs.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/de.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/en.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/es.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/fr.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/it.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/ja.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/ko.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/pl.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/ru.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/tr.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html

@@ -8,7 +8,7 @@
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
                     <li>.NET Core SDK 2.1.4</li>
-                    <li>.NET Core Runtime 2.0.4</li>
+                    <li>.NET Core Runtime 2.0.5</li>
                     <li>Runtime Package Store</li>
                 </ul>
         </div>

packaging/windows/clisdk/bundle.wxl

@@ -51,7 +51,7 @@
 
 The following were installed at [DOTNETHOME]
     • .NET Core SDK 2.1.4
-    • .NET Core Runtime 2.0.4
+    • .NET Core Runtime 2.0.5
     • Runtime Package Store
 
 This product collects usage data

test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs

@@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests
 
             result.Should().NotBeNull();
 
-            result.Args.Should().Contain("--fx-version 2.0.4");
+            result.Args.Should().Contain("--fx-version 2.0.5");
         }
 
         [Fact]