From b4f77aea0824586d4527fd30de41b298e31892ca Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Tue, 9 Jan 2018 12:37:23 -0800
Subject: [PATCH] Remove 2.0 runtime store dependency from 2.1 shared framework
 installers

---
 build/SharedFx.props            |  6 +-----
 build/SharedFxInstaller.targets | 26 --------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/build/SharedFx.props b/build/SharedFx.props
index 8064f978a7..d9e8ce3372 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -26,11 +26,7 @@
     <DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile>
 
     <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>
-    
-    <!-- Previously released versions of the RS are included in 2.1.0-preview1 for compat. They should be removed by RTM once the "trampoline" feature is in. -->
-    <RuntimeStoreArchiveLinkPrefix>$(PublicCoreFeedPrefix)aspnetcore/store/2.0.3-125/</RuntimeStoreArchiveLinkPrefix>
-    <RuntimeStoreArchiveFilename>Build.RS</RuntimeStoreArchiveFilename>
-    
+
     <!-- In an orchestrated build, this may be overriden to other Azure feeds. -->
     <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">$(PublicCoreFeedPrefix)</DotNetAssetRootUrl>
 
diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets
index 51b85826bc..8698e400a8 100644
--- a/build/SharedFxInstaller.targets
+++ b/build/SharedFxInstaller.targets
@@ -31,25 +31,12 @@
       Uri="$(RuntimeArchiveLinkPrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz$(DotNetAssetRootAccessTokenSuffix)"
       DestinationPath="$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz"
       Condition="!Exists('$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz')" />
-
-    <!-- TODO: REMOVE - This dependency is a stop gap requirement until trampoline from 2.0 => 2.1 is implemented -->
-    <ItemGroup>
-      <RuntimeStoreArchiveLinkSuffix Include=".linux.tar.gz;.osx.tar.gz;.winx64.zip;.winx86.zip" />
-    </ItemGroup>
-    <KoreBuild.Tasks.DownloadFile
-      Uri="$(RuntimeStoreArchiveLinkPrefix)$(RuntimeStoreArchiveFilename)%(RuntimeStoreArchiveLinkSuffix.Identity)$(DotNetAssetRootAccessTokenSuffix)"
-      DestinationPath="$(_InstallerSourceDir)$(RuntimeStoreArchiveFilename)%(RuntimeStoreArchiveLinkSuffix.Identity)"
-      Condition="!Exists('$(_InstallerSourceDir)$(RuntimeStoreArchiveFilename)%(RuntimeStoreArchiveLinkSuffix.Identity)')" />
   </Target>
 
   <Target Name="_GenerateCumulativeArchive">
     <PropertyGroup>
       <ArchiveExtension>.tar.gz</ArchiveExtension>
       <ArchiveExtension Condition="$(SharedFxPlatform.StartsWith('win'))">.zip</ArchiveExtension>
-      <RuntimeStoreArchiveLinkSuffix Condition="'$(SharedFxPlatform)' == 'win-x64'">.winx64.zip</RuntimeStoreArchiveLinkSuffix>
-      <RuntimeStoreArchiveLinkSuffix Condition="'$(SharedFxPlatform)' == 'win-x86'">.winx86.zip</RuntimeStoreArchiveLinkSuffix>
-      <RuntimeStoreArchiveLinkSuffix Condition="'$(SharedFxPlatform)' == 'osx-x64'">.osx.tar.gz</RuntimeStoreArchiveLinkSuffix>
-      <RuntimeStoreArchiveLinkSuffix Condition="'$(SharedFxPlatform)' == 'linux-x64'">.linux.tar.gz</RuntimeStoreArchiveLinkSuffix>
     </PropertyGroup>
 
     <!-- Clear working directory -->
@@ -60,10 +47,6 @@
     <Exec
       Command="tar -xzf $(SharedFxIntermediateArchiveFilePrefix)-$(SharedFxPlatform)$(ArchiveExtension) -C $(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.tar.gz'"/>
-    <!-- TODO: REMOVE - This dependency is a stop gap requirement until trampoline from 2.0 => 2.1 is implemented -->
-    <Exec
-      Command="tar -xzf $(_InstallerSourceDir)$(RuntimeStoreArchiveFilename)$(RuntimeStoreArchiveLinkSuffix) -C $(_WorkRoot)"
-      Condition="'$(ArchiveExtension)' == '.tar.gz'"/>
     <Exec
       Command="tar -xzf $(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-$(SharedFxPlatform)$(ArchiveExtension) -C $(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.tar.gz'"/>
@@ -71,11 +54,6 @@
       File="$(SharedFxIntermediateArchiveFilePrefix)-$(SharedFxPlatform)$(ArchiveExtension)"
       Destination="$(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.zip'" />
-    <!-- TODO: REMOVE - This dependency is a stop gap requirement until trampoline from 2.0 => 2.1 is implemented -->
-    <UnzipArchive
-      File="$(_InstallerSourceDir)$(RuntimeStoreArchiveFilename)$(RuntimeStoreArchiveLinkSuffix)"
-      Destination="$(_WorkRoot)"
-      Condition="'$(ArchiveExtension)' == '.zip'" />
     <UnzipArchive
       File="$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-$(SharedFxPlatform)$(ArchiveExtension)"
       Destination="$(_WorkRoot)"
@@ -165,8 +143,6 @@
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" />
 
     <ItemGroup>
-      <!-- TODO: REMOVE - This dependency is a stop gap requirement until trampoline from 2.0 => 2.1 is implemented -->
-      <RpmSharedFxDependencies Include="aspnetcore-store-2.0.3" Version="2.0.3" />
       <RpmSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(MicrosoftNETCoreApp21PackageVersion)" />
       <RpmRHSharedFxDirectories Include="$(RHInstallRoot)/shared" />
       <RpmGenericSharedFxDirectories Include="$(InstallRoot)/shared" />
@@ -267,8 +243,6 @@
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" />
 
     <ItemGroup>
-      <!-- TODO: REMOVE - This dependency is a stop gap requirement until trampoline from 2.0 => 2.1 is implemented -->
-      <_DebSharedFxDependencies Include="aspnetcore-store-2.0.3"/>
       <_DebSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)"/>
     </ItemGroup>