From 2277ac91da9023fbc6d5a2dcf6155bb8d614e725 Mon Sep 17 00:00:00 2001
From: Matt Galbraith <mattgal@microsoft.com>
Date: Wed, 30 Aug 2017 22:05:09 +0000
Subject: [PATCH 01/38] Merged PR 82801: Allow non-anonymous storage account
 access for .lzma download

Allow non-anonymous storage account access for .lzma download
---
 build/compile/LzmaArchive.targets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index 98a23337b..494164b26 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -2,10 +2,12 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
+      <!-- In the event of a non-anonymous storage account used for core-setup bits, support appending a SAS token to download files -->
+      <CoreSetupBlobAccessTokenParam Condition=" '$(CoreSetupBlobAccessToken)' != '' ">?$(CoreSetupBlobAccessToken)</CoreSetupBlobAccessTokenParam>
       <FinalArchive>$(SdkOutputDirectory)/nuGetPackagesArchive.lzma</FinalArchive>
       <NugetPackagesArchiveName>nuGetPackagesArchive.$(AspNetCoreRuntimePackageFlavor).lzma</NugetPackagesArchiveName>
       <IntermediateArchive>$(IntermediateDirectory)/$(NugetPackagesArchiveName)</IntermediateArchive>
-      <NugetPackagesArchiveBlobUrl>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)</NugetPackagesArchiveBlobUrl>
+      <NugetPackagesArchiveBlobUrl>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam)</NugetPackagesArchiveBlobUrl>
     </PropertyGroup>
 
     <Target Name="GetNuGetPackagesArchive"

From 36892f28e924a33729c7647b527038be83a7bd9f Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 6 Oct 2017 11:08:02 -0700
Subject: [PATCH 02/38] Adding a test hack to allow the CLI to pass tests with
 a pre-release runtime for 2.0 TFM.

---
 build/BundledRuntimes.props      |  3 +++
 build/Test.targets               | 35 ++++++++++++++++++++++++++++++++
 build/package/Installer.DEB.proj |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index a3c20a3e9..cbc7a67a0 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -21,6 +21,9 @@
     <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
     <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
     <CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
+
+    <IsSharedFrameworkPreReleaseVersion>$([System.Text.RegularExpressions.Regex]::IsMatch($(SharedFrameworkVersion), '\d*\.\d*\.\d*-'))</IsSharedFrameworkPreReleaseVersion>
+    <SharedFrameworkStableVersion>$([System.Text.RegularExpressions.Regex]::Match($(SharedFrameworkVersion), '\d*\.\d*\.\d*').get_Groups().get_Item(0).ToString())</SharedFrameworkStableVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/Test.targets b/build/Test.targets
index 4fadf70e4..0b8bc0620 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -38,6 +38,35 @@
       </ProjectsToTest>
     </ItemGroup>
 
+    <!-- Begin Workaround lack of a stable package version for depedencies; copy into simulated stable version folders -->
+ 
+    <PropertyGroup>
+        <StableSharedFrameworkDirectory>$(OutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)</StableSharedFrameworkDirectory>
+        <StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes>$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)</StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes>
+    </PropertyGroup>
+
+    <ItemGroup>  
+        <Stabilize_SourceFiles_2_0 Include="$(OutputDirectory)/shared/Microsoft.NETCore.App/$(CLI_SharedFrameworkVersion)/*.*"/>
+        <SimulatedStableSharedFrameworkDirectories Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+                                          Include="$(StableSharedFrameworkDirectory)" />
+        <SimulatedStableSharedFrameworkDirectories Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+                                          Include="$(StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes)" />
+    </ItemGroup>
+
+    <Copy
+        Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+        SourceFiles="@(Stabilize_SourceFiles_2_0)"
+        DestinationFiles="@(Stabilize_SourceFiles_2_0->'$(StableSharedFrameworkDirectory)/%(RecursiveDir)%(Filename)%(Extension)')"
+    />
+
+    <Copy
+        Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
+        SourceFiles="@(Stabilize_SourceFiles_2_0)"
+        DestinationFiles="@(Stabilize_SourceFiles_2_0->'$(StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes)/%(RecursiveDir)%(Filename)%(Extension)')"
+    />
+ 
+    <!-- End Workaround lack of a stable package version for depedencies; copy into simulated stable versions -->
+
     <Message Text="Starting test execution" Importance="High" />
   
     <MSBuild
@@ -46,6 +75,12 @@
     </MSBuild>
 
     <Message Text="Finished test execution" Importance="High" />
+
+    <!-- Begin Workaround lack of a stable package version for depedencies; remove simulated stable version folder. -->
+
+    <RemoveDir Directories="@(SimulatedStableSharedFrameworkDirectories)" />
+ 
+    <!-- End Workaround lack of a stable package version for depedencies; remove simulated stable version folder. -->
   </Target>
 
   <Target Name="PrepareTests"
diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index 66300c4df..59fd3f2f0 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -95,7 +95,7 @@
   </Target>
 
   <Target Name="TestSdkDeb"
-      Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
+      Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
       DependsOnTargets="RestoreTests"
       Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);

From d7ef3d244b84eef28d83b26e667d315196e48d3c Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Oct 2017 11:37:04 -0700
Subject: [PATCH 03/38] Updating the branding to 15.5.1

---
 build/Branding.props | 2 +-
 build/Version.props  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/Branding.props b/build/Branding.props
index 9a66fdc2d..9d5d5b29b 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core SDK - 2.0.3</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core SDK - 15.5.1</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.1</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
diff --git a/build/Version.props b/build/Version.props
index 2f7ba1395..73336fce7 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>2</VersionMajor>
-    <VersionMinor>0</VersionMinor>
-    <VersionPatch>3</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">servicing</ReleaseSuffix>
+    <VersionMajor>15</VersionMajor>
+    <VersionMinor>5</VersionMinor>
+    <VersionPatch>1</VersionPatch>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
 
     <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
     <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion> 

From 7ce43b9e3e41b5783520fdc874eb99dfd9af2e58 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Oct 2017 11:37:12 -0700
Subject: [PATCH 04/38] Updating the runtime version.

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index ab6b45f75..50c72e3c6 100644
--- a/build/DependencyVersions.props
+++ b/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>
-    <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.3-servicing-25808-01</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.5.0-preview-000113-1032064</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
     <CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>

From e11c66e7f08e05f5dec758f9bf115cc77c047e6e Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Oct 2017 12:35:38 -0700
Subject: [PATCH 05/38] Fixing the expected runtime version by the tool tests.

---
 .../GivenAProjectToolsCommandResolver.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 83a877151..8c2cc1235 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -309,7 +309,7 @@ namespace Microsoft.DotNet.Tests
 
             result.Should().NotBeNull();
 
-            result.Args.Should().Contain("--fx-version 2.0.0");
+            result.Args.Should().Contain("--fx-version 2.0.3-servicing-25808-01");
         }
 
         [Fact]

From ec9b583eb48ff54c391aca8b9fdc0c9295ba7a2b Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Oct 2017 14:09:48 -0700
Subject: [PATCH 06/38] Adding the access token to the native installer URLs so
 that we can download those from protected locations when needed.

---
 build/package/Installer.DEB.targets | 2 +-
 build/package/Installer.RPM.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index b041bc344..103d3782f 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -126,7 +126,7 @@
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
     <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)"
+               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
   </Target>
 </Project>
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 1781d689b..c6ede8b3d 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -188,7 +188,7 @@
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
     <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)"
+               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
   </Target>
 

From 34235acb3716a68cda1223ed89cea297665e39fe Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 9 Oct 2017 15:27:05 -0700
Subject: [PATCH 07/38] Adding the pre-release runtime version hack to RHEL as
 well. Basically, skip native installer tests when using a pre-release
 runtime.

---
 build/package/Installer.RPM.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index c6ede8b3d..b2a10eb39 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -213,7 +213,7 @@
 
   <Target Name="TestSdkRpm"
           DependsOnTargets="RestoreTests;DownloadAspNetCoreRuntimeRpmInstaller"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
+          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
           Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);

From be1b014c7cb70e5bdfde23b9852ddf43142784e8 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 19 Oct 2017 08:44:20 -0700
Subject: [PATCH 08/38] Update aspnetcore runtime store and LZMA to 2.0.3 build
 120

---
 build/BundledTemplates.props   | 7 ++++---
 build/DependencyVersions.props | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index 549508206..a7a7069ab 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -1,10 +1,11 @@
 <Project ToolsVersion="15.0">
   <ItemGroup>
     <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" />
     <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(SpaTemplateVersion)" />
+
+    <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspNetCoreTemplatePackageVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(AspNetCoreTemplatePackageVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(AspNetCoreTemplatePackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index bc353e101..aa3ef1681 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -30,16 +30,16 @@
     <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
     <MicroBuildVersion>0.2.0</MicroBuildVersion>
-    <SpaTemplateVersion>1.0.417</SpaTemplateVersion>
     <XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
 
+    <AspNetCoreTemplatePackageVersion>2.0.3</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.0</AspNetCoreBranchName>
+    <AspNetCoreBranchName>2.0.3</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
-    <AspNetCoreVersion>2.0.0</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>26452</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreVersion>2.0.3</AspNetCoreVersion>
+    <AspNetCoreRuntimePackageTimestamp>120</AspNetCoreRuntimePackageTimestamp>
 
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

From d4f980a02e9ffc9c99a0e8130ac132160445ce31 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 20 Oct 2017 14:23:34 -0700
Subject: [PATCH 09/38] Enabling our native installer tests to always get a
 2.0.0 asp.net runtime store. We need to solve this in a more generic way in
 the future. But this will unblock the build for now.

---
 build/package/Installer.DEB.proj    | 4 ++++
 build/package/Installer.DEB.targets | 6 ++++++
 build/package/Installer.RPM.targets | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index 59fd3f2f0..c3baf267b 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -25,6 +25,7 @@
       <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 $(DownloadedSharedAspNetCoreRuntime)" />
 
       <!-- Create layout: Binaries -->
@@ -88,6 +89,7 @@
       <!-- Remove Shared Framework and Debian Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
+      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
@@ -107,6 +109,7 @@
       <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 $(DownloadedSharedAspNetCoreRuntime)" />
 
       <Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
@@ -122,6 +125,7 @@
       <!-- Clean up Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
+      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 103d3782f..4ab22f6dc 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -36,6 +36,7 @@
       <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
       <HostDebianPackageName>dotnet-host</HostDebianPackageName>
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
+      <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
       <AspNetCoreRuntimePackageName Condition=" '$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp' ">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
       <HostRidInAspNetCoreRuntimeDebInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeDebInstallerFileName>
       <AspNetCoreRuntimeDebInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName>
@@ -123,8 +124,13 @@
   <Target Name="DownloadAspNetCoreRuntimeDebInstaller"
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
+      <AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb<AspNetCoreRuntimeDebInstallerFileName200/>
+      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200</DownloadedSharedAspNetCoreRuntime200>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
+    <DownloadFile
+               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
+               DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index b2a10eb39..55284c27b 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -53,6 +53,7 @@
       <HostRidInAspNetCoreRuntimeRpmInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
+      <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
       <AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageVersion>
       <AspNetCoreRuntimePackageVersion Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreVersion)</AspNetCoreRuntimePackageVersion>
       <AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
@@ -185,8 +186,13 @@
   <Target Name="DownloadAspNetCoreRuntimeRpmInstaller"
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
+      <AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm<AspNetCoreRuntimeRpmInstallerFileName200/>
+      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
+    <DownloadFile
+               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
+               DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
@@ -225,6 +231,7 @@
     <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 $(DownloadedSharedAspNetCoreRuntime)" />
 
     <Exec Command="sudo yum -y install $(SdkInstallerFile)" />
@@ -241,6 +248,7 @@
     <Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
 
     <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
+    <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)" />

From e37e9f3fe8a325d87573f576161799b92580bb32 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 20 Oct 2017 14:43:29 -0700
Subject: [PATCH 10/38] Fixing closing tags in the DEB and RPM targets.

---
 build/package/Installer.DEB.targets | 2 +-
 build/package/Installer.RPM.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 4ab22f6dc..00afd7f30 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -124,7 +124,7 @@
   <Target Name="DownloadAspNetCoreRuntimeDebInstaller"
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
-      <AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb<AspNetCoreRuntimeDebInstallerFileName200/>
+      <AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName200>
       <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200</DownloadedSharedAspNetCoreRuntime200>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 55284c27b..a4f7853ca 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -186,7 +186,7 @@
   <Target Name="DownloadAspNetCoreRuntimeRpmInstaller"
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
-      <AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm<AspNetCoreRuntimeRpmInstallerFileName200/>
+      <AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName200>
       <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>

From 687cba8ca8ab1bbc9bb87a0c3800f96b3fa1ac25 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Fri, 20 Oct 2017 16:35:01 -0700
Subject: [PATCH 11/38] Updating branding to 2.0.3, again

---
 build/Branding.props | 2 +-
 build/Version.props  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Branding.props b/build/Branding.props
index 9d5d5b29b..9a66fdc2d 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0">
   <PropertyGroup>
-    <SdkBrandName>Microsoft .NET Core SDK - 15.5.1</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core SDK - 2.0.3</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.1</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
diff --git a/build/Version.props b/build/Version.props
index 73336fce7..b8a2d499e 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>15</VersionMajor>
-    <VersionMinor>5</VersionMinor>
-    <VersionPatch>1</VersionPatch>
+    <VersionMajor>2</VersionMajor>
+    <VersionMinor>0</VersionMinor>
+    <VersionPatch>3</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
 
     <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>

From 347169e68a2a83ff4b61c0a70f076cfa8eb4ee96 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 24 Oct 2017 15:27:08 -0700
Subject: [PATCH 12/38] Update aspnetcore to 2.0.3 build 123

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index aa3ef1681..45e8366d9 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -39,7 +39,7 @@
     <AspNetCoreBranchName>2.0.3</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
     <AspNetCoreVersion>2.0.3</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>120</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreRuntimePackageTimestamp>123</AspNetCoreRuntimePackageTimestamp>
 
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

From 878532eedf84129671fe7583a8198d6c9af158cb Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 27 Oct 2017 07:57:14 -0700
Subject: [PATCH 13/38] Update aspnetcore to 2.0.3 build 124

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 45e8366d9..e34b044d7 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -39,7 +39,7 @@
     <AspNetCoreBranchName>2.0.3</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
     <AspNetCoreVersion>2.0.3</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>123</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreRuntimePackageTimestamp>124</AspNetCoreRuntimePackageTimestamp>
 
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

From 255e7bc850303724b31545d0c91795a176467ad1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 31 Oct 2017 09:10:35 -0700
Subject: [PATCH 14/38] Update aspnetcore to 2.0.3 build 125

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index e34b044d7..88d76f8a0 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -39,7 +39,7 @@
     <AspNetCoreBranchName>2.0.3</AspNetCoreBranchName>
     <AspNetCoreRelease>rtm</AspNetCoreRelease>
     <AspNetCoreVersion>2.0.3</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>124</AspNetCoreRuntimePackageTimestamp>
+    <AspNetCoreRuntimePackageTimestamp>125</AspNetCoreRuntimePackageTimestamp>
 
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>

From d19b3f4b2e3d40d1c7b343df2a7fac4bfeed3cc9 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 8 Nov 2017 10:24:25 -0800
Subject: [PATCH 15/38] Correcting 'PUBLISH_TO_AZURE_BLOB' and
 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by
 the empty string.

---
 build/Publish.targets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index efe45cd91..9e911318c 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -10,7 +10,7 @@
   
   <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
   <Target Name="Publish"
-          Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
+          Condition=" '$(PUBLISH_TO_AZURE_BLOB)' == 'true' "
           DependsOnTargets="Init;
                             Package;
                             EvaluateRuntimeCoherence;
@@ -36,11 +36,11 @@
       <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
                      Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/>
       <ForPublishing Include="@(NupkgsForPublishing)"
-                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
+                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
       <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).*.nupkg"
-                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' "/>
+                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' "/>
       <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.*.nupkg"
-                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
+                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
     </ItemGroup>
 
     <ItemGroup>

From aa944444f61560c1e9b072d22aa9f6ca3506a354 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 8 Nov 2017 14:31:06 -0800
Subject: [PATCH 16/38] Update SDK to 2.0.2-vspre-20170927-1.

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 3f359e31f..1b18e6991 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -12,7 +12,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>2.0.1-servicing-20170926-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>2.0.2-vspre-20170927-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>

From 04ac042451c1d5760ef98588d94467d0d11be228 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 8 Nov 2017 19:07:29 -0800
Subject: [PATCH 17/38] Changes in the Transport feed DLL requires our
 response; update Transport feed DLL version and base URL.

Defining "BuildTasksFeedDll" & relevent 'UsingTask' no longer needed as PublishNupkgToTransportFeed.targets uses the imported Microsoft.DotNet.Build.Tasks.Feed.targets to locate the Feed DLL
---
 NuGet.Config                                    |  3 +--
 build.proj                                      |  2 +-
 build/AzureInfo.props                           |  2 --
 build/Microsoft.DotNet.Cli.tasks                |  1 -
 .../publish/PublishNupkgToTransportFeed.targets | 17 ++++++-----------
 .../dotnet-cli-build/dotnet-cli-build.csproj    |  2 +-
 dir.props                                       |  1 -
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 9c645c984..95416b2f1 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -3,7 +3,7 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json" />
+    <add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
@@ -16,7 +16,6 @@
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
-    <add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
     <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
   </packageSources>
diff --git a/build.proj b/build.proj
index bac606d59..3f755df09 100644
--- a/build.proj
+++ b/build.proj
@@ -52,7 +52,7 @@
   <Import Project="build/Compile.targets" />
   <Import Project="build/Package.targets" />
   <Import Project="build/Test.targets" />
-  <Import Project="build/Publish.targets" />
+  <Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="build/Publish.targets" />
 
   <Import Project="build/InitRepo.targets" />
 </Project>
diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index 9f323b42b..b651458ee 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -15,7 +15,5 @@
     <TransportFeedContainerName>$(TRANSPORTFEED_STORAGE_CONTAINER)</TransportFeedContainerName>
     <TransportFeedContainerName Condition="'$(TransportFeedContainerName)' == ''">dotnet-core</TransportFeedContainerName>
     <TransportFeedCloudDropAccessToken>$(TRANSPORTFEED_STORAGE_KEY)</TransportFeedCloudDropAccessToken>
-    <TransportFeedCloudDropAccountName>$(TRANSPORTFEED_STORAGE_ACCOUNT)</TransportFeedCloudDropAccountName>
-    <TransportFeedCloudDropAccountName Condition="'$(TransportFeedCloudDropAccountName)' == ''">dotnetfeed</TransportFeedCloudDropAccountName>
   </PropertyGroup>
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
index 1c4bbac75..901a48f84 100644
--- a/build/Microsoft.DotNet.Cli.tasks
+++ b/build/Microsoft.DotNet.Cli.tasks
@@ -24,7 +24,6 @@
   <UsingTask TaskName="GenerateNuGetPackagesArchiveVersion" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="PushToBlobFeed" AssemblyFile="$(BuildTasksFeedDll)" />
   <UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="SetBlobPropertiesBasedOnFileType" AssemblyFile="$(CLIBuildDll)" />
diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 2f41acfd1..939b02c01 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
+  
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />
   </ItemGroup>
 
   <PropertyGroup>
-    <RelativePath>packages</RelativePath>
+    <ExpectedFeedUrl>https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</ExpectedFeedUrl>
   </PropertyGroup>
 
   <Target Name="PublishNupkgToTransportFeed" Condition=" '$(PUBLISH_NUPKG_TO_TRANSPORT_FEED)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
-    <Error Condition="'$(TransportFeedContainerName)' == ''" Text="Missing property TransportFeedContainerName." />
-    <Error Condition="'$(TransportFeedCloudDropAccountName)' == ''" Text="Missing property TransportFeedCloudDropAccountName." />
     <Error Condition="'$(TransportFeedCloudDropAccessToken)' == ''" Text="Missing property TransportFeedCloudDropAccessToken." />
 
-    <Message Text="Publish to $(TransportFeedContainerName) started" />
+    <Message Text="Publish NuPkgs to Transport feed started" />
     <PushToBlobFeed AccountKey="$(TransportFeedCloudDropAccessToken)"
-                AccountName="$(TransportFeedCloudDropAccountName)"
-                ContainerName="$(TransportFeedContainerName)"
-                IndexDirectory="$(IndexDirectory)"
+                ExpectedFeedUrl="$(ExpectedFeedUrl)"
                 ItemsToPush="@(NupkgsForPublishing)"
-                Overwrite="false"
-                PublishFlatContainer="false"
-                RelativePath="$(RelativePath)" />
-
+                Overwrite="false" />
   </Target>
 </Project>
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index 89dc0f323..c3413747d 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -29,6 +29,6 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="1.0.0-prerelease-01929-02" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="1.0.0-prerelease-02203-01" />
  </ItemGroup>
 </Project>
diff --git a/dir.props b/dir.props
index 7133cb74f..756fccc32 100644
--- a/dir.props
+++ b/dir.props
@@ -7,7 +7,6 @@
     <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
 
     <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
-    <BuildTasksFeedDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/Microsoft.DotNet.Build.Tasks.Feed.dll</BuildTasksFeedDll>
 
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>

From f85436d82d94075385eb2ee903ca7b7dce4ea546 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 8 Nov 2017 19:16:27 -0800
Subject: [PATCH 18/38] Updating SDK to 2.0.3-servicing-20171109-3

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 1b18e6991..20f5daa40 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -12,7 +12,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>2.0.2-vspre-20170927-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>2.0.3-servicing-20171109-3</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>

From 7b593a8ec6ce0e0728e7687b380dd3a31f81560b Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 8 Nov 2017 19:42:41 -0800
Subject: [PATCH 19/38] Defining: "BuildTasksFeedToolVersion"

---
 build/DependencyVersions.props                          | 1 +
 build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 748b3d8fa..b4b597844 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -50,5 +50,6 @@
   <PropertyGroup>
     <VersionToolsVersion>1.0.27-prerelease-01723-01</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
+    <BuildTasksFeedToolVersion>1.0.0-prerelease-02203-01</BuildTasksFeedToolVersion>
   </PropertyGroup>
 </Project>
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index c3413747d..86531abc4 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -29,6 +29,6 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="1.0.0-prerelease-02203-01" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(BuildTasksFeedToolVersion)" />
  </ItemGroup>
 </Project>

From 95f30e3becc9d2d1061a44887781cd91f4b8bbfa Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 09:30:11 -0800
Subject: [PATCH 20/38] Moving conditional to load
 'Microsoft.DotNet.Build.Tasks.Feed.targets' out of 'build.proj'

---
 build.proj                                        | 2 +-
 build/publish/PublishNupkgToTransportFeed.targets | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.proj b/build.proj
index 3f755df09..bac606d59 100644
--- a/build.proj
+++ b/build.proj
@@ -52,7 +52,7 @@
   <Import Project="build/Compile.targets" />
   <Import Project="build/Package.targets" />
   <Import Project="build/Test.targets" />
-  <Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="build/Publish.targets" />
+  <Import Project="build/Publish.targets" />
 
   <Import Project="build/InitRepo.targets" />
 </Project>
diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 939b02c01..053ee47af 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
-  
+  <PropertyGroup>
+    <BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
+  </PropertyGroup>
+
+  <Import Condition="Exists('$(BuildTasksFeedToolTargetsFileName)')" Project="$(BuildTasksFeedToolTargetsFileName)" />
+
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />

From 31fd2312b0642183dc4a37bae92a306fbab37c67 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 12:11:25 -0800
Subject: [PATCH 21/38] Make the "ExpectedFeedUrl" fully configurable.

---
 build/AzureInfo.props                             | 2 ++
 build/publish/PublishNupkgToTransportFeed.targets | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index b651458ee..df686e43e 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -14,6 +14,8 @@
     <ChecksumCloudDropAccountName Condition="'$(ChecksumCloudDropAccountName)' == ''">dotnetclichecksums</ChecksumCloudDropAccountName>
     <TransportFeedContainerName>$(TRANSPORTFEED_STORAGE_CONTAINER)</TransportFeedContainerName>
     <TransportFeedContainerName Condition="'$(TransportFeedContainerName)' == ''">dotnet-core</TransportFeedContainerName>
+    <TransportFeedExpectedURL>$(TRANSPORTFEED_EXPECTED_URL)</TransportFeedExpectedURL>
+    <TransportFeedExpectedURL Condition="'$(TransportFeedContainerName)' == ''">https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</TransportFeedExpectedURL>
     <TransportFeedCloudDropAccessToken>$(TRANSPORTFEED_STORAGE_KEY)</TransportFeedCloudDropAccessToken>
   </PropertyGroup>
 </Project>
diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 053ee47af..82fd2839d 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -4,7 +4,7 @@
     <BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
   </PropertyGroup>
 
-  <Import Condition="Exists('$(BuildTasksFeedToolTargetsFileName)')" Project="$(BuildTasksFeedToolTargetsFileName)" />
+  <Import Condition="'$(GeneratePropsFile)' != 'true'" Project="$(BuildTasksFeedToolTargetsFileName)" />
 
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
@@ -12,12 +12,13 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <ExpectedFeedUrl>https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</ExpectedFeedUrl>
+    <ExpectedFeedUrl>$(TransportFeedExpectedURL)</ExpectedFeedUrl>
   </PropertyGroup>
 
   <Target Name="PublishNupkgToTransportFeed" Condition=" '$(PUBLISH_NUPKG_TO_TRANSPORT_FEED)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
     <Error Condition="'$(TransportFeedCloudDropAccessToken)' == ''" Text="Missing property TransportFeedCloudDropAccessToken." />
-
+    <Error Condition="'$(TransportFeedExpectedURL)' == ''" Text="Missing property TransportFeedExpectedURL." />
+    
     <Message Text="Publish NuPkgs to Transport feed started" />
     <PushToBlobFeed AccountKey="$(TransportFeedCloudDropAccessToken)"
                 ExpectedFeedUrl="$(ExpectedFeedUrl)"

From 14be2fc2a8e7736f2cdf7e3dbe114547b7ef69b5 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 12:14:56 -0800
Subject: [PATCH 22/38] Fixed an incorrect conditional.

---
 build/AzureInfo.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index df686e43e..2773a817c 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -15,7 +15,7 @@
     <TransportFeedContainerName>$(TRANSPORTFEED_STORAGE_CONTAINER)</TransportFeedContainerName>
     <TransportFeedContainerName Condition="'$(TransportFeedContainerName)' == ''">dotnet-core</TransportFeedContainerName>
     <TransportFeedExpectedURL>$(TRANSPORTFEED_EXPECTED_URL)</TransportFeedExpectedURL>
-    <TransportFeedExpectedURL Condition="'$(TransportFeedContainerName)' == ''">https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</TransportFeedExpectedURL>
+    <TransportFeedExpectedURL Condition="'$(TransportFeedExpectedURL)' == ''">https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</TransportFeedExpectedURL>
     <TransportFeedCloudDropAccessToken>$(TRANSPORTFEED_STORAGE_KEY)</TransportFeedCloudDropAccessToken>
   </PropertyGroup>
 </Project>

From ef22bb23fcd133af1e1d6a7a9f0cf8d0a3654e75 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 12:17:25 -0800
Subject: [PATCH 23/38] Simplified some logic.

---
 build/publish/PublishNupkgToTransportFeed.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 82fd2839d..c610edc2f 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -11,17 +11,13 @@
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <ExpectedFeedUrl>$(TransportFeedExpectedURL)</ExpectedFeedUrl>
-  </PropertyGroup>
-
   <Target Name="PublishNupkgToTransportFeed" Condition=" '$(PUBLISH_NUPKG_TO_TRANSPORT_FEED)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
     <Error Condition="'$(TransportFeedCloudDropAccessToken)' == ''" Text="Missing property TransportFeedCloudDropAccessToken." />
     <Error Condition="'$(TransportFeedExpectedURL)' == ''" Text="Missing property TransportFeedExpectedURL." />
     
     <Message Text="Publish NuPkgs to Transport feed started" />
     <PushToBlobFeed AccountKey="$(TransportFeedCloudDropAccessToken)"
-                ExpectedFeedUrl="$(ExpectedFeedUrl)"
+                ExpectedFeedUrl="$(TransportFeedExpectedURL)"
                 ItemsToPush="@(NupkgsForPublishing)"
                 Overwrite="false" />
   </Target>

From 85e79297c35f9a17c7d508cc595d50011cf0ea65 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 13:38:33 -0800
Subject: [PATCH 24/38] Simplified logic; part 2.

---
 build/publish/PublishNupkgToTransportFeed.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index c610edc2f..19dd03e71 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
-  </PropertyGroup>
-
-  <Import Condition="'$(GeneratePropsFile)' != 'true'" Project="$(BuildTasksFeedToolTargetsFileName)" />
+  <Import Condition="'$(GeneratePropsFile)' != 'true'"  Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
 
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />

From 9599ee5b777caea023e506e74cda96fa2b01713c Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Sat, 11 Nov 2017 20:30:23 -0800
Subject: [PATCH 25/38] Removing the MyGet 'dotnet-core' from the Nuget.config

---
 NuGet.Config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NuGet.Config b/NuGet.Config
index 95416b2f1..10ffdab23 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,7 +5,6 @@
     <clear />
     <add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
     <!-- Replace the aspnet entry above with this one when we switch to no-timestamp packages -->
     <!-- add key="aspnet" value="https://dotnet.myget.org/F/aspnet-2-0-0-rtm/api/v3/index.json" / -->

From 929cf1d5ac4576e90ec76e6b5c9656f8fd3637a9 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Sat, 11 Nov 2017 21:22:54 -0800
Subject: [PATCH 26/38] Corrected usage...

---
 run-build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run-build.ps1 b/run-build.ps1
index d3bb1152b..17a46a335 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -16,7 +16,7 @@ param(
 
 if($Help)
 {
-    Write-Output "Usage: .\build.ps1 [-Configuration <CONFIGURATION>] [-Architecture <ARCHITECTURE>] [-NoPackage] [-Help]"
+    Write-Output "Usage: .\run-build.ps1 [-Configuration <CONFIGURATION>] [-Architecture <ARCHITECTURE>] [-NoPackage] [-Help]"
     Write-Output ""
     Write-Output "Options:"
     Write-Output "  -Configuration <CONFIGURATION>     Build the specified Configuration (Debug or Release, default: Debug)"

From 5d85c8fde6c3efe08a44ab9ac99a031b6ffc2a4f Mon Sep 17 00:00:00 2001
From: Mike Lorbetske <mlorbe@microsoft.com>
Date: Mon, 13 Nov 2017 12:02:34 -0800
Subject: [PATCH 27/38] Update non-web templates to version
 1.0.0-beta3-20171110-312

---
 build/DependencyVersions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index ae5d2844e..d91afddc8 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -24,8 +24,8 @@
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
     <TemplateEngineVersion>1.0.0-beta2-20171004-309</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta2-20171004-309</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20171004-309</TemplateEngineTemplate2_0Version>
+    <TemplateEngineTemplateVersion>1.0.0-beta3-20171110-312</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta3-20171110-312</TemplateEngineTemplate2_0Version>
     <AspnetTemplateVersion>1.0.0-beta2-20170810-304</AspnetTemplateVersion>
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0</DependencyModelVersion>

From e212767253e4aaf89cb38627c923925078372396 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 14 Nov 2017 12:57:11 -0800
Subject: [PATCH 28/38] Keeping the branding suffix as servicing.

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index b8a2d499e..2f7ba1395 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,7 +3,7 @@
     <VersionMajor>2</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionPatch>3</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">servicing</ReleaseSuffix>
 
     <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
     <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion> 

From 6fef644b70258d84f8eb9effeb2b108ca53df69c Mon Sep 17 00:00:00 2001
From: "Kevin Ransom (msft)" <codecutter.fsharp@hotmail.com>
Date: Tue, 14 Nov 2017 14:54:03 -0800
Subject: [PATCH 29/38] Update F# compiler

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index bcadb79ce..3eb203d16 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -5,7 +5,7 @@
     <CLI_MSBuild_Version>15.5.0-preview-000178-1116824</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta2-62210-01</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
-    <CLI_FSharp_Version>4.2.0-rtm-171027-0</CLI_FSharp_Version>
+    <CLI_FSharp_Version>4.2.0-rtm-171104-0</CLI_FSharp_Version>
     <CLI_Deps_Satellites_Build>pre-20171012-1</CLI_Deps_Satellites_Build>
     <CLI_Roslyn_Satellites_Version>2.6.0-$(CLI_Deps_Satellites_Build)</CLI_Roslyn_Satellites_Version>
     <CLI_FSharp_Satellites_Version>4.4.1-$(CLI_Deps_Satellites_Build)</CLI_FSharp_Satellites_Version>

From 789eb0f416daccbe27a928d56da27ceb65cf1fe9 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 14 Nov 2017 18:50:58 -0800
Subject: [PATCH 30/38] Adding the ASP.NET feed where the ASP.NET templates are
 being published to.

---
 NuGet.Config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.Config b/NuGet.Config
index 9c645c984..b3f9eafc1 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -19,5 +19,6 @@
     <add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
     <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <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" />
   </packageSources>
 </configuration>

From dad6eb275d29cab7e9798185c983e0df6eca63f4 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 14 Nov 2017 18:54:01 -0800
Subject: [PATCH 31/38] Adding the ASP.NET feed where the ASP.NET templates are
 being published to.

---
 NuGet.Config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.Config b/NuGet.Config
index 95416b2f1..1b3a83551 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -18,5 +18,6 @@
     <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
     <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <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" />
   </packageSources>
 </configuration>

From fe690887034c5a666a198963bf4f44d2ce598289 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 15 Nov 2017 13:22:30 -0800
Subject: [PATCH 32/38] Updating Roslyn version.

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 106cfefd5..3f0ffc7b9 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.3</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.5.0-preview-000178-1116824</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.6.0-beta2-62210-01</CLI_Roslyn_Version>
+    <CLI_Roslyn_Version>2.6.0-beta3-62309-01</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
     <CLI_FSharp_Version>4.2.0-rtm-171104-0</CLI_FSharp_Version>
     <CLI_Deps_Satellites_Build>pre-20171012-1</CLI_Deps_Satellites_Build>

From b7f81a574e64d26b94d15e3383ce8350e191d9c8 Mon Sep 17 00:00:00 2001
From: Livar <licavalc@microsoft.com>
Date: Wed, 15 Nov 2017 17:14:17 -0800
Subject: [PATCH 33/38] Update SDK to 15.5.0-preview-20171116-1

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 3f0ffc7b9..1c0717d31 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -13,7 +13,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>15.5.0-preview-20171108-4</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>15.5.0-preview-20171116-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
     <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>

From a75115f4f738ece1a2a7aaa0c48e9a2e56b7ea48 Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Wed, 15 Nov 2017 18:05:25 -0800
Subject: [PATCH 34/38] MSBuild 15.5.179

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 3f0ffc7b9..28c5cd007 100644
--- 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>
     <CLI_SharedFrameworkVersion>2.0.3</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.5.0-preview-000178-1116824</CLI_MSBuild_Version>
+    <CLI_MSBuild_Version>15.5.179</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.6.0-beta3-62309-01</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
     <CLI_FSharp_Version>4.2.0-rtm-171104-0</CLI_FSharp_Version>

From 0cd05674acbd347530d0529aa5f49c5e8e44eb53 Mon Sep 17 00:00:00 2001
From: NuGet Team Bot <support@nuget.org>
Date: Thu, 16 Nov 2017 16:43:21 -0800
Subject: [PATCH 35/38] Insert NuGet Build 4.5.0-rtm-4651 into cli

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index bb7dab48b..438310c8e 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -16,7 +16,7 @@
     <CLI_NETSDK_Version>15.5.0-preview-20171116-1</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
 
-    <CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>
+    <CLI_NuGet_Version>4.5.0-rtm-4651</CLI_NuGet_Version>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25908-02</CLI_NETStandardLibraryNETFrameworkVersion>
     <CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.5.0</CLI_TestPlatform_Version>

From d613ec575875e3229cd45d54715f73a4fe0e6838 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 30 Nov 2017 11:19:17 -0800
Subject: [PATCH 36/38] Making the cli-test-env shell script runnable and
 removing test workaround for preview runtimes. It is not needed in master.

---
 build/BundledRuntimes.props                   |  3 --
 build/Test.targets                            | 35 -------------------
 build/package/Installer.DEB.proj              |  2 +-
 build/package/Installer.RPM.targets           |  2 +-
 scripts/cli-test-env.sh                       |  0
 .../GivenAProjectToolsCommandResolver.cs      |  2 +-
 6 files changed, 3 insertions(+), 41 deletions(-)
 mode change 100644 => 100755 scripts/cli-test-env.sh

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 66f6f87a0..82d926e11 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -21,9 +21,6 @@
     <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
     <SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
     <CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(SharedFrameworkVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
-
-    <IsSharedFrameworkPreReleaseVersion>$([System.Text.RegularExpressions.Regex]::IsMatch($(SharedFrameworkVersion), '\d*\.\d*\.\d*-'))</IsSharedFrameworkPreReleaseVersion>
-    <SharedFrameworkStableVersion>$([System.Text.RegularExpressions.Regex]::Match($(SharedFrameworkVersion), '\d*\.\d*\.\d*').get_Groups().get_Item(0).ToString())</SharedFrameworkStableVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/Test.targets b/build/Test.targets
index 9f7bd0a47..388a2e1fe 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -35,35 +35,6 @@
       </ProjectsToTest>
     </ItemGroup>
 
-    <!-- Begin Workaround lack of a stable package version for depedencies; copy into simulated stable version folders -->
- 
-    <PropertyGroup>
-        <StableSharedFrameworkDirectory>$(OutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)</StableSharedFrameworkDirectory>
-        <StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes>$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/shared/Microsoft.NETCore.App/$(SharedFrameworkStableVersion)</StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes>
-    </PropertyGroup>
-
-    <ItemGroup>  
-        <Stabilize_SourceFiles_2_0 Include="$(OutputDirectory)/shared/Microsoft.NETCore.App/$(CLI_SharedFrameworkVersion)/*.*"/>
-        <SimulatedStableSharedFrameworkDirectories Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
-                                          Include="$(StableSharedFrameworkDirectory)" />
-        <SimulatedStableSharedFrameworkDirectories Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
-                                          Include="$(StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes)" />
-    </ItemGroup>
-
-    <Copy
-        Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
-        SourceFiles="@(Stabilize_SourceFiles_2_0)"
-        DestinationFiles="@(Stabilize_SourceFiles_2_0->'$(StableSharedFrameworkDirectory)/%(RecursiveDir)%(Filename)%(Extension)')"
-    />
-
-    <Copy
-        Condition=" '$(IsSharedFrameworkPreReleaseVersion)' == 'True' "
-        SourceFiles="@(Stabilize_SourceFiles_2_0)"
-        DestinationFiles="@(Stabilize_SourceFiles_2_0->'$(StableSharedFrameworkDirectoryWithBackwardsCompatibleRuntimes)/%(RecursiveDir)%(Filename)%(Extension)')"
-    />
- 
-    <!-- End Workaround lack of a stable package version for depedencies; copy into simulated stable versions -->
-
     <Message Text="Starting test execution" Importance="High" />
   
     <MSBuild
@@ -72,12 +43,6 @@
     </MSBuild>
 
     <Message Text="Finished test execution" Importance="High" />
-
-    <!-- Begin Workaround lack of a stable package version for depedencies; remove simulated stable version folder. -->
-
-    <RemoveDir Directories="@(SimulatedStableSharedFrameworkDirectories)" />
- 
-    <!-- End Workaround lack of a stable package version for depedencies; remove simulated stable version folder. -->
   </Target>
 
   <Target Name="PrepareTests"
diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index 63f7fcd45..c7bdd7682 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -97,7 +97,7 @@
   </Target>
 
   <Target Name="TestSdkDeb"
-      Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
+      Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
       DependsOnTargets="RestoreTests"
       Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 51217dde0..299ed9602 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -228,7 +228,7 @@
 
   <Target Name="TestSdkRpm"
           DependsOnTargets="RestoreTests;DownloadAspNetCoreRuntimeRpmInstaller"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' and '$(IsSharedFrameworkPreReleaseVersion)' != 'True' "
+          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
           Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);
diff --git a/scripts/cli-test-env.sh b/scripts/cli-test-env.sh
old mode 100644
new mode 100755
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 6953067b6..4b5a3874b 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests
             var result = projectToolsCommandResolver.Resolve(commandResolverArguments);
 
             result.Should().NotBeNull();
-            
+
             result.Args.Should().Contain("--fx-version 2.1.0");
         }
 

From 50ffb6bf72a3c976d8838056e2aa7f734000e1ad Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Thu, 30 Nov 2017 12:55:23 -0800
Subject: [PATCH 37/38] Removing installing the 2.0.0 asp.net runtime store. We
 don't it anymore either. In master, just the preview one should be enough.

---
 build/package/Installer.DEB.proj    | 4 ----
 build/package/Installer.DEB.targets | 6 ------
 build/package/Installer.RPM.targets | 8 --------
 3 files changed, 18 deletions(-)

diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index c7bdd7682..4b684d161 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -25,7 +25,6 @@
       <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 $(DownloadedSharedAspNetCoreRuntime)" />
 
       <!-- Create layout: Binaries -->
@@ -89,7 +88,6 @@
       <!-- Remove Shared Framework and Debian Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
@@ -109,7 +107,6 @@
       <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 $(DownloadedSharedAspNetCoreRuntime)" />
 
       <Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
@@ -125,7 +122,6 @@
       <!-- Clean up Packages -->
       <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
-      <Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName200)" />
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 44d2d1332..4486d8d37 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -35,7 +35,6 @@
       <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
       <HostDebianPackageName>dotnet-host</HostDebianPackageName>
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
-      <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
       <AspNetCoreRuntimePackageName Condition=" '$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp' ">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
       <HostRidInAspNetCoreRuntimeDebInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeDebInstallerFileName>
       <AspNetCoreRuntimeDebInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName>
@@ -126,13 +125,8 @@
   <Target Name="DownloadAspNetCoreRuntimeDebInstaller"
         DependsOnTargets="SetupDebProps">
     <PropertyGroup>
-      <AspNetCoreRuntimeDebInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb</AspNetCoreRuntimeDebInstallerFileName200>
-      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/AspNetCoreRuntimeDebInstallerFileName200</DownloadedSharedAspNetCoreRuntime200>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeDebInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 299ed9602..68acd2a8a 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -178,7 +178,6 @@
       <HostRidInAspNetCoreRuntimeRpmInstallerFileName>$(HostRid)</HostRidInAspNetCoreRuntimeRpmInstallerFileName>
       <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
       <AspNetCoreRuntimePackageName Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)</AspNetCoreRuntimePackageName>
-      <AspNetCoreRuntimePackageName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0</AspNetCoreRuntimePackageName200>
       <AspNetCoreRuntimePackageVersion>$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageVersion>
       <AspNetCoreRuntimePackageVersion Condition="'$(AspNetCoreRuntimePackageFlavor)' == 'notimestamp'">$(AspNetCoreVersion)</AspNetCoreRuntimePackageVersion>
       <AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName>
@@ -195,13 +194,8 @@
   <Target Name="DownloadAspNetCoreRuntimeRpmInstaller"
         DependsOnTargets="SetupRpmProps">
     <PropertyGroup>
-      <AspNetCoreRuntimeRpmInstallerFileName200>$(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm</AspNetCoreRuntimeRpmInstallerFileName200>
-      <DownloadedSharedAspNetCoreRuntime200>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200)</DownloadedSharedAspNetCoreRuntime200>
       <DownloadedSharedAspNetCoreRuntime>$(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)</DownloadedSharedAspNetCoreRuntime>
     </PropertyGroup>
-    <DownloadFile
-               Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName200)$(CoreSetupBlobAccessTokenParam)"
-               DestinationPath="$(DownloadedSharedAspNetCoreRuntime200)"/>
     <DownloadFile
                Uri="$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeRpmInstallerFileName)$(CoreSetupBlobAccessTokenParam)"
                DestinationPath="$(DownloadedSharedAspNetCoreRuntime)"/>
@@ -240,7 +234,6 @@
     <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 $(DownloadedSharedAspNetCoreRuntime)" />
 
     <Exec Command="sudo yum -y install $(SdkInstallerFile)" />
@@ -257,7 +250,6 @@
     <Exec Command="sudo yum remove -y $(SdkRpmPackageName)" />
 
     <Exec Command="sudo yum remove -y $(AspNetCoreRuntimePackageName)" />
-    <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)" />

From 83ddef69d60cc32c507208c30970795d7f15870e Mon Sep 17 00:00:00 2001
From: Parallels <livar@live.com>
Date: Thu, 30 Nov 2017 14:15:38 -0800
Subject: [PATCH 38/38] Fixing the store consumption merge.

---
 build/DependencyVersions.props      | 7 -------
 build/package/Installer.DEB.targets | 7 ++-----
 build/package/Installer.RPM.targets | 9 ++-------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5148cffcf..ba2ceb959 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -35,13 +35,6 @@
     <XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
     <DotNetCliArchiverVersion>0.2.0-beta-000059</DotNetCliArchiverVersion>
     <AspNetCoreTemplatePackageVersion>2.0.3</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>
-    <AspNetCoreRelease>rtm</AspNetCoreRelease>
-    <AspNetCoreVersion>2.0.3</AspNetCoreVersion>
-    <AspNetCoreRuntimePackageTimestamp>125</AspNetCoreRuntimePackageTimestamp>
     <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
     <AspNetCoreRuntimePackageFolderName>dev-26623</AspNetCoreRuntimePackageFolderName>
     <AspNetCoreRuntimePackageVersion>2.1.0-preview1-26623</AspNetCoreRuntimePackageVersion>
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index 4486d8d37..6e0020dbe 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -34,11 +34,8 @@
       <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
       <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
       <HostDebianPackageName>dotnet-host</HostDebianPackageName>
-      <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)</AspNetCoreRuntimePackageName>
-      <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>
+      <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreRuntimePackageVersion)</AspNetCoreRuntimePackageName>
+      <AspNetCoreRuntimeDebInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreRuntimePackageVersion)-$(HostRid).deb</AspNetCoreRuntimeDebInstallerFileName>
     </PropertyGroup>
 
     <!-- Inputs -->
diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 68acd2a8a..7deaeb6da 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -175,13 +175,8 @@
       <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>
-      <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>
+      <AspNetCoreRuntimePackageName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreRuntimePackageVersion)</AspNetCoreRuntimePackageName>
+      <AspNetCoreRuntimeRpmInstallerFileName>$(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreRuntimePackageVersion)-$(HostRid).rpm</AspNetCoreRuntimeRpmInstallerFileName>
       <AfterInstallHostScriptTemplateFile>$(ScriptsDir)/$(AfterInstallHostScriptName)</AfterInstallHostScriptTemplateFile>
       <AfterInstallHostScriptDestinationFile>$(RpmLayoutScripts)/$(AfterInstallHostScriptName)</AfterInstallHostScriptDestinationFile>
     </PropertyGroup>