Merge branch 'release/2.1.1xx' into merge_1xx_into_2xx

* release/2.1.1xx:
  Fixing another typo in that is breaking RHEL.
  Fix a typo in the rpm.targets when testing the rpm generated packages.
  Update to aspnet 2.0.7 build 230
  Producing an empty commit to trigger a rebuild of the CLI
  Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
  Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0.
  Reverse the order in which old runtime stores are listed
  Update to ASP.NET Core 2.0.7 build 228
  Moving the opensuse 43.2 docker file to the right folder.
  Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7.
  Updating the runtime to 2.0.7 and the CLI branding to 2.1.104.
  Update SDK to 2.1.100-preview-62730-07
  Add msbuild myget.org feed
  MSBuild 15.6.84

 Conflicts:
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	packaging/osx/clisdk/resources/cs.lproj/conclusion.html
	packaging/osx/clisdk/resources/de.lproj/conclusion.html
	packaging/osx/clisdk/resources/en.lproj/conclusion.html
	packaging/osx/clisdk/resources/es.lproj/conclusion.html
	packaging/osx/clisdk/resources/fr.lproj/conclusion.html
	packaging/osx/clisdk/resources/it.lproj/conclusion.html
	packaging/osx/clisdk/resources/ja.lproj/conclusion.html
	packaging/osx/clisdk/resources/ko.lproj/conclusion.html
	packaging/osx/clisdk/resources/pl.lproj/conclusion.html
	packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
	packaging/osx/clisdk/resources/ru.lproj/conclusion.html
	packaging/osx/clisdk/resources/tr.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
	packaging/windows/clisdk/bundle.wxl

build/Branding.props

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

build/BundledRuntimes.props

@@ -5,7 +5,7 @@
 
     <!-- only the runtime OSX .pkgs have a `-internal` suffix -->
     <InstallerStartSuffix Condition="'$(HostOSName)' == 'osx'">-internal</InstallerStartSuffix>
-    
+
     <!-- Downloaded Installers + Archives -->
     <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
     <DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
@@ -34,9 +34,10 @@
 
   <PropertyGroup>
     <AspNetCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)</AspNetCoreRuntimeInstallerBlobRootUrl>
+    <AspNetCoreRuntimeBuildDropFeed>$(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json</AspNetCoreRuntimeBuildDropFeed>
     <AspNetCoreSharedRuntimeVersionFileName>runtime.version</AspNetCoreSharedRuntimeVersionFileName>
     <AspNetCoreSharedRuntimeVersionFile Condition=" '$(AspNetCoreSharedRuntimeVersionFileName)' != '' ">$(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName)</AspNetCoreSharedRuntimeVersionFile>
-    
+
     <!-- Examples:    Build.RS.linux.zip    Build.RS.winx86.zip    AspNetCorePackageStoreLibx64.wixlib   -->
     <AspNetCoreRuntimeInstallerArchiveFileNameOSToken Condition=" '$(HostOSName)' == 'win' ">$(HostOSName)$(Architecture)</AspNetCoreRuntimeInstallerArchiveFileNameOSToken>
     <AspNetCoreRuntimeInstallerArchiveFileNameOSToken Condition=" '$(HostOSName)' == 'osx' ">$(HostOSName)</AspNetCoreRuntimeInstallerArchiveFileNameOSToken>

build/DependencyVersions.props

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>2.0.6</MicrosoftNETCoreAppPackageVersion>
+
+    <MicrosoftNETCoreAppPackageVersion>2.0.7</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <MicrosoftBuildPackageVersion>15.7.0-preview-000127</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
@@ -58,22 +59,36 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
 
-    <AspNetCoreTemplatePackageVersion>2.0.6</AspNetCoreTemplatePackageVersion>
+    <AspNetCoreTemplatePackageVersion>2.0.7</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.6</AspNetCoreBranchName>
+    <AspNetCoreBranchName>2.0.7</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
-    <AspNetCoreVersion>2.0.6</AspNetCoreVersion>
+    <AspNetCoreVersion>2.0.7</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>10011</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreRuntimePackageTimestamp>230</AspNetCoreRuntimePackageTimestamp>
+    <CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'=='notimestamp'">$(AspNetCoreVersion)</CurrentAspNetCoreRuntimeVersion>
+    <CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'!='notimestamp'">$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</CurrentAspNetCoreRuntimeVersion>
 
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>
     <AspNetCoreRuntimeAzureblobStoresSubfolderName>$(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimeAzureblobStoresSubfolderName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!--
+      The runtime store requires us to link each previously released version. Each time we update ASP.NET Core, add the previous verison to this list.
+      This list should be sorted most recent version to oldest.
+    -->
+    <AspNetCoreRuntimeStoreVersion Include="$(CurrentAspNetCoreRuntimeVersion)" />
+    <AspNetCoreRuntimeStoreVersion Include="2.0.6" />
+    <AspNetCoreRuntimeStoreVersion Include="2.0.5" />
+    <AspNetCoreRuntimeStoreVersion Include="2.0.3" />
+    <AspNetCoreRuntimeStoreVersion Include="2.0.0" />
+  </ItemGroup>
+
   <!-- infrastructure and test only dependencies -->
   <PropertyGroup>
     <VersionToolsVersion>2.1.0-prerelease-02430-04</VersionToolsVersion>

build/NugetConfigFile.targets

@@ -4,7 +4,7 @@
       <ItemGroup>
         <NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
       </ItemGroup>
-    
+
     <PropertyGroup>
       <NugetConfigHeader>
         <![CDATA[
@@ -21,7 +21,7 @@
 <add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
-<add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
+<add key="aspnet" value="$(AspNetCoreRuntimeBuildDropFeed)" />
 <add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
 <add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
 <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
@@ -33,6 +33,7 @@
 <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
 <add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
 <add key="AspNetDev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
 <add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
         ]]>
       </NugetConfigCLIFeeds>
@@ -43,13 +44,13 @@
 </configuration>
         ]]>
       </NugetConfigSuffix>
-    
+
   </PropertyGroup>
 
     <WriteLinesToFile File="$(GeneratedNuGetConfig)"
                       Lines="$(NugetConfigHeader)"
                       Overwrite="true" />
-    
+
     <WriteLinesToFile Condition="'$(ExternalRestoreSources)' != '' and '$(DotNetBuildOffline)' != 'true'"
                       File="$(GeneratedNuGetConfig)"
                       Lines="&lt;add key=&quot;PrivateBlobFeed%(NugetConfigPrivateFeeds.Filename)&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"

build/package/Installer.DEB.proj

@@ -21,14 +21,15 @@
       Inputs="@(CLISdkFiles)"
       Outputs="$(SdkInstallerFile)" >
 
+      <ItemGroup>
+        <AspNetCoreDebInstallerFileReversed Include="@(AspNetCoreDebInstallerFile->Reverse())" />
+      </ItemGroup>
+
       <!-- Install Shared Framework Packages -->
       <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime200)" />
+      <Exec Command="sudo dpkg -i %(AspNetCoreDebInstallerFileReversed.Identity)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime203)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime205)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime)" />
 
       <!-- Create layout: Binaries -->
       <Copy
@@ -90,10 +91,7 @@
 
       <!-- Remove Shared Framework and Debian Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
+      <Exec Command="sudo dpkg -r %(AspNetCoreDebInstallerFile.PackageName)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName205)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName203)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
@@ -106,17 +104,19 @@
       Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);
+              @(AspNetCoreDebInstallerFile);
               $(SdkInstallerFile);"
       Outputs="$(DebianTestResultsXmlFile)" >
 
+      <ItemGroup>
+        <AspNetCoreDebInstallerFileReversed Include="@(AspNetCoreDebInstallerFile->Reverse())" />
+      </ItemGroup>
+
       <!-- Install Dependencies and SDK Packages -->
       <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime200)" />
+      <Exec Command="sudo dpkg -i %(AspNetCoreDebInstallerFileReversed.Identity)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime203)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime205)" />
-      <Exec Command="sudo dpkg -i $(DownloadedSharedAspNetCoreRuntime)" />
 
       <Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
 
@@ -130,10 +130,7 @@
 
       <!-- Clean up Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
+      <Exec Command="sudo dpkg -r %(AspNetCoreDebInstallerFile.PackageName)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName205)" />
-      <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

@@ -35,14 +35,6 @@
       <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
       <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
       <HostDebianPackageName>dotnet-host</HostDebianPackageName>
-      <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
-      <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
-      <AspNetCoreRuntimePackageName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3</AspNetCoreRuntimePackageName203>
-      <AspNetCoreRuntimePackageName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5</AspNetCoreRuntimePackageName205>
-      <AspNetCoreRuntimePackageName Condition=" '$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp' ">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
-      <HostRidInAspNetCoreRuntimeDebInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeDebInstallerFileName>
-      <AspNetCoreRuntimeDebInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName>
-      <AspNetCoreRuntimeDebInstallerFileName Condition=" '$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp' ">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName>
     </PropertyGroup>
 
     <!-- Inputs -->
@@ -125,26 +117,15 @@
 
   <Target Name="DownloadAspNetCoreRuntimeDebInstaller"
         DependsOnTargets="SetupDebProps">
-    <PropertyGroup>
+
-      <AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName200>
+    <ItemGroup>
-      <AspNetCoreRuntimeDebInstallerFileName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName203>
+      <AspNetCoreDebInstallerFile Include="$(PackagesDirectory)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).deb">
-      <AspNetCoreRuntimeDebInstallerFileName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName205>
+        <Source>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).deb$(CoreSetupBlobAccessTokenParam)</Source>
-      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
+        <PackageName>$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)</PackageName>
-      <DownloadedSharedAspNetCoreRuntime203>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203)</DownloadedSharedAspNetCoreRuntime203>
+      </AspNetCoreDebInstallerFile>
-      <DownloadedSharedAspNetCoreRuntime205>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205)</DownloadedSharedAspNetCoreRuntime205>
+    </ItemGroup>
-      <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
+
-    </PropertyGroup>
+    <DownloadFile Uri="%(AspNetCoreDebInstallerFile.Source)"
-    <DownloadFile
+                  DestinationPath="%(AspNetCoreDebInstallerFile.Identity)"/>
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName203)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime203)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName205)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime205)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
   </Target>
 </Project>

build/package/Installer.RPM.targets

@@ -50,16 +50,10 @@
       <HostFxrRpmPackageName>dotnet-hostfxr-$(HostFxrRpmPackageVersion)</HostFxrRpmPackageName>
       <HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
       <HostRpmPackageName>dotnet-host</HostRpmPackageName>
-      <HostRidInAspNetCoreRuntimeRpmInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
       <AspNetCoreRuntimePackageName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3</AspNetCoreRuntimePackageName203>
-      <AspNetCoreRuntimePackageName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5</AspNetCoreRuntimePackageName205>
-      <AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageVersion>
-      <AspNetCoreRuntimePackageVersion Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreVersion)</AspNetCoreRuntimePackageVersion>
-      <AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
-      <AspNetCoreRuntimeRpmInstallerFileName Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
       <AfterInstallHostScriptTemplateFile>$(ScriptsDir)/$(AfterInstallHostScriptName)</AfterInstallHostScriptTemplateFile>
       <AfterInstallHostScriptDestinationFile>$(RpmLayoutScripts)/$(AfterInstallHostScriptName)</AfterInstallHostScriptDestinationFile>
     </PropertyGroup>
@@ -187,27 +181,15 @@
 
   <Target Name="DownloadAspNetCoreRuntimeRpmInstaller"
         DependsOnTargets="SetupDebProps">
-    <PropertyGroup>
+    <ItemGroup>
-      <AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName200>
+      <AspNetCoreRpmInstallerFile Include="$(PackagesDirectory)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).rpm">
-      <AspNetCoreRuntimeRpmInstallerFileName203>$(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName203>
+        <Source>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).rpm$(CoreSetupBlobAccessTokenParam)</Source>
-      <AspNetCoreRuntimeRpmInstallerFileName205>$(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName205>
+        <PackageName>$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)</PackageName>
-      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
+      </AspNetCoreRpmInstallerFile>
-      <DownloadedSharedAspNetCoreRuntime203>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203)</DownloadedSharedAspNetCoreRuntime203>
+    </ItemGroup>
-      <DownloadedSharedAspNetCoreRuntime205>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205)</DownloadedSharedAspNetCoreRuntime205>
+
-      <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
+    <DownloadFile Uri="%(AspNetCoreRpmInstallerFile.Source)"
-    </PropertyGroup>
+                  DestinationPath="%(AspNetCoreRpmInstallerFile.Identity)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName203)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime203)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName205)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime205)"/>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
   </Target>
 
   <Target Name="TestFPMTool">
@@ -235,18 +217,19 @@
           Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);
-              $(DownloadedSharedAspNetCoreRuntime);
+              @(AspNetCoreRpmInstallerFile);
               $(RpmTestResultsXmlFile);"
           Outputs="$(RpmTestResultsXmlFile)" >
 
+    <ItemGroup>
+      <AspNetCoreRpmInstallerFileReversed Include="@(AspNetCoreRpmInstallerFile->Reverse())" />
+    </ItemGroup>
+
     <!-- Install Dependencies and SDK Packages -->
     <Exec Command="sudo yum -y install $(DownloadedSharedHostInstallerFile)" />
     <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 %(AspNetCoreRpmInstallerFileReversed.Identity)" />
-    <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime203)" />
-    <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime205)" />
-    <Exec Command="sudo yum -y install $(DownloadedSharedAspNetCoreRuntime)" />
 
     <Exec Command="sudo yum -y install $(SdkInstallerFile)" />
 
@@ -261,10 +244,7 @@
     <!-- Clean up Packages -->
     <Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
 
-    <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
+    <Exec Command="sudo yum remove -y %(AspNetCoreRpmInstallerFile.PackageName)" />
-    <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName205)" />
-    <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)" />
     <Exec Command="sudo yum remove -y $(HostRpmPackageName)" />

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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200</li>
-                    <li>.NET Core Runtime 2.0.6</li>
+                    <li>.NET Core Runtime 2.0.7</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.200
-    • .NET Core Runtime 2.0.6
+    • .NET Core Runtime 2.0.7
     • 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.6");
+            result.Args.Should().Contain("--fx-version 2.0.7");
         }
 
         [Fact]

test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs

@@ -4,7 +4,9 @@
 using System;
 using System.IO;
 using System.Diagnostics;
+using System.Linq;
 using System.Runtime.InteropServices;
+using System.Xml.Linq;
 using FluentAssertions;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.PlatformAbstractions;
@@ -103,7 +105,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
             var testInstance = TestAssets.Get(testAppName)
                 .CreateInstance()
                 .WithSourceFiles()
-                .WithRestoreFiles();
+                .WithProjectChanges(project =>
+                {
+                    var ns = project.Root.Name.Namespace;
+
+                    var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
+
+                    // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0.
+                    // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the
+                    // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we
+                    // need a manual roll-forward.
+                    propertyGroup.Add(
+                        new XElement(ns + "RuntimeFrameworkVersion", "2.0.*"));
+                });
 
             var testProjectDirectory = testInstance.Root;
 
@@ -170,7 +184,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
             var testInstance = TestAssets.Get(testAppName)
                 .CreateInstance($"PublishesSelfContained{selfContained}")
                 .WithSourceFiles()
-                .WithRestoreFiles();
+                .WithProjectChanges(project =>
+                {
+                    var ns = project.Root.Name.Namespace;
+
+                    var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
+
+                    // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0.
+                    // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the
+                    // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we
+                    // need a manual roll-forward.
+                    propertyGroup.Add(
+                        new XElement(ns + "RuntimeFrameworkVersion", "2.0.*"));
+                });
 
             var testProjectDirectory = testInstance.Root;