Merge pull request #6268 from livarcocc/remove_1_0_runtime

Removing the additional shared framework from the official stage2 build of the CLI

build/BackwardsCompatibilityRuntimes.props

@@ -0,0 +1,57 @@
+<Project>
+  <PropertyGroup Condition=" '$(IncludeSharedFrameworksForBackwardsCompatibilityTests)' == 'true' ">
+    <BackwardsCompatibility110CoreSetupChannel>release/1.1.0</BackwardsCompatibility110CoreSetupChannel>
+    <BackwardsCompatibility110SharedFrameworkVersion>1.1.1</BackwardsCompatibility110SharedFrameworkVersion>
+    <BackwardsCompatibility110SharedHostVersion>1.1.0</BackwardsCompatibility110SharedHostVersion>
+    <BackwardsCompatibility110HostFxrVersion>1.1.0</BackwardsCompatibility110HostFxrVersion>
+
+    <BackwardsCompatibility110DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(InstallerExtension)</BackwardsCompatibility110DownloadedSharedHostInstallerFileName>
+    <BackwardsCompatibility110DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)</BackwardsCompatibility110DownloadedSharedHostInstallerFile>
+
+    <BackwardsCompatibility110DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(InstallerExtension)</BackwardsCompatibility110DownloadedHostFxrInstallerFileName>
+    <BackwardsCompatibility110DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)</BackwardsCompatibility110DownloadedHostFxrInstallerFile>
+
+    <BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(InstallerExtension)</BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName>
+    <BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)</BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile>
+
+    <BackwardsCompatibility110CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension)</BackwardsCompatibility110CombinedFrameworkHostCompressedFileName>
+
+    <BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(BackwardsCompatibility110CoreSetupChannel)</BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel>
+    <BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl>$(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Binaries/$(BackwardsCompatibility110SharedFrameworkVersion)</BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl>
+    <BackwardsCompatibility110CoreSetupInstallerBlobRootUrl>$(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Installers</BackwardsCompatibility110CoreSetupInstallerBlobRootUrl>
+    <BackwardsCompatibility110CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(BackwardsCompatibility110SharedFrameworkVersion)</BackwardsCompatibility110CoreSetupDownloadDirectory>
+    <BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive>$(BackwardsCompatibility110CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(IncludeSharedFrameworksForBackwardsCompatibilityTests)' == 'true' ">
+    <_DownloadAndExtractItem Include="BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive"
+                             Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')">
+      <Url>$(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)</Url>
+      <DownloadFileName>$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)</DownloadFileName>
+      <ExtractDestination>$(BackwardsCompatibleSharedFrameworksPublishDirectory)</ExtractDestination>
+      <!-- don't overwrite the destination because there can be multiple shared fx's and they need to be combined -->
+      <OverwriteDestination>False</OverwriteDestination>
+    </_DownloadAndExtractItem>
+
+    <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile"
+                             Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
+      <Url>$(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)</Url>
+      <DownloadFileName>$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)</DownloadFileName>
+      <ExtractDestination></ExtractDestination>
+    </_DownloadAndExtractItem>
+
+    <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedHostInstallerFile"
+                             Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
+      <Url>$(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)</Url>
+      <DownloadFileName>$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)</DownloadFileName>
+      <ExtractDestintation></ExtractDestintation>
+    </_DownloadAndExtractItem>
+
+    <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedHostFxrInstallerFile"
+                             Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
+      <Url>$(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)</Url>
+      <DownloadFileName>$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)</DownloadFileName>
+      <ExtractDestintation></ExtractDestintation>
+    </_DownloadAndExtractItem>
+  </ItemGroup>
+</Project>

build/Branding.props

@@ -5,10 +5,6 @@
     <SharedHostBrandName>Microsoft .NET Core 2.0.0 - Host</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core 2.0.0 - Host FX Resolver</HostFxrBrandName>
     
-    <AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.3 - Runtime</AdditionalSharedFrameworkBrandName>
-    <AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
-    <AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
-
     <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
     <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
 

build/BuildDefaults.props

@@ -2,11 +2,9 @@
   <PropertyGroup>
     <CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <HasAdditionalSharedFramework Condition="'$(Rid)' != 'linux-x64'">true</HasAdditionalSharedFramework>
-    <IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' AND '$(HasAdditionalSharedFramework)' == 'true' ">true</IncludeAdditionalSharedFrameworks>
-    <IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' ">false</IncludeAdditionalSharedFrameworks>
     <IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>
     <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
     <UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' ">true</UsePortableLinuxSharedFramework>
+    <IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == '' AND '$(Rid)' != 'linux-x64' ">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>
   </PropertyGroup>
 </Project>

build/BundledRuntimes.props

@@ -17,26 +17,6 @@
     <CombinedFrameworkHostCompressedFileName>dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
   </PropertyGroup>
 
-  <!-- Additional Shared Framework to be installed -->
-  <PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
-    <AdditionalCoreSetupChannel>release/1.1.0</AdditionalCoreSetupChannel>
-    <AdditionalSharedFrameworkVersion>1.1.1</AdditionalSharedFrameworkVersion>
-    <AdditionalSharedHostVersion>1.1.0</AdditionalSharedHostVersion>
-    <AdditionalHostFxrVersion>1.1.0</AdditionalHostFxrVersion>
-
-    <!-- Additional Downloaded Installers + Archives -->
-    <AdditionalDownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)</AdditionalDownloadedSharedHostInstallerFileName>
-    <AdditionalDownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(AdditionalDownloadedSharedHostInstallerFileName)</AdditionalDownloadedSharedHostInstallerFile>
-
-    <AdditionalDownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr-$(ProductMonikerRid).$(AdditionalHostFxrVersion)$(InstallerExtension)</AdditionalDownloadedHostFxrInstallerFileName>
-    <AdditionalDownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(AdditionalDownloadedHostFxrInstallerFileName)</AdditionalDownloadedHostFxrInstallerFile>
-
-    <AdditionalDownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(InstallerExtension)</AdditionalDownloadedSharedFrameworkInstallerFileName>
-    <AdditionalDownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)</AdditionalDownloadedSharedFrameworkInstallerFile>
-
-    <AdditionalCombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension)</AdditionalCombinedFrameworkHostCompressedFileName>
-  </PropertyGroup>
-
   <PropertyGroup>
     <CoreSetupChannel>master</CoreSetupChannel>
     <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
@@ -76,45 +56,4 @@
       <ExtractDestintation></ExtractDestintation>
     </_DownloadAndExtractItem>
   </ItemGroup>
-
-  <!-- Additional Shared Framework to be installed -->
-  <PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
-    <AdditionalCoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel)</AdditionalCoreSetupBlobRootUrlWithChannel>
-    <AdditionalSharedFrameworkArchiveBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion)</AdditionalSharedFrameworkArchiveBlobRootUrl>
-    <AdditionalCoreSetupInstallerBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers</AdditionalCoreSetupInstallerBlobRootUrl>
-    <AdditionalCoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(AdditionalSharedFrameworkVersion)</AdditionalCoreSetupDownloadDirectory>
-    <AdditionalCombinedSharedHostAndFrameworkArchive>$(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</AdditionalCombinedSharedHostAndFrameworkArchive>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
-    <_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
-                             Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
-      <Url>$(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)</Url>
-      <DownloadFileName>$(AdditionalCombinedSharedHostAndFrameworkArchive)</DownloadFileName>
-      <ExtractDestination>$(SharedFrameworkPublishDirectory)</ExtractDestination>
-      <!-- don't overwrite the destination because both shared fx's need to be combined -->
-      <OverwriteDestination>False</OverwriteDestination>
-    </_DownloadAndExtractItem>
-
-    <_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile"
-                             Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
-      <Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)</Url>
-      <DownloadFileName>$(AdditionalDownloadedSharedFrameworkInstallerFile)</DownloadFileName>
-      <ExtractDestination></ExtractDestination>
-    </_DownloadAndExtractItem>
-
-    <_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile"
-                             Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
-      <Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName)</Url>
-      <DownloadFileName>$(AdditionalDownloadedSharedHostInstallerFile)</DownloadFileName>
-      <ExtractDestintation></ExtractDestintation>
-    </_DownloadAndExtractItem>
-
-    <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
-                             Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
-      <Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)</Url>
-      <DownloadFileName>$(AdditionalDownloadedHostFxrInstallerFile)</DownloadFileName>
-      <ExtractDestintation></ExtractDestintation>
-    </_DownloadAndExtractItem>
-  </ItemGroup>
 </Project>

build/OutputDirectories.props

@@ -2,6 +2,7 @@
   <PropertyGroup>
       <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
       <OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory>
+      <Stage2WithBackwardsCompatibleRuntimesOutputDirectory>$(BaseOutputDirectory)/stage2WithBackwardsCompatibleRuntimes</Stage2WithBackwardsCompatibleRuntimesOutputDirectory>
       <SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
       <SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</SymbolsDirectory>
       <RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
@@ -9,6 +10,7 @@
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
+      <BackwardsCompatibleSharedFrameworksPublishDirectory>$(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish</BackwardsCompatibleSharedFrameworksPublishDirectory>
       <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
       <DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>
       <GeneratedMSBuildExtensionsDirectory>$(IntermediateDirectory)/GeneratedMSBuildExtensions</GeneratedMSBuildExtensionsDirectory>

build/package/Installer.DEB.proj

@@ -78,11 +78,6 @@
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
-      <Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" 
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-      <Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-
       <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
   </Target>
 
@@ -95,13 +90,6 @@
       Outputs="$(DebianTestResultsXmlFile)" >
 
       <!-- Install Dependencies and SDK Packages -->
-      <Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)"
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-      <Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)"
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-      <Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)"
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-
       <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
@@ -121,11 +109,6 @@
       <Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
       <Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
 
-      <Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-      <Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
-            Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
-
       <Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
   </Target>
 

build/package/Installer.DEB.targets

@@ -35,13 +35,6 @@
       <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrDebianPackageVersion)</HostFxrDebianPackageName>
       <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
       <HostDebianPackageName>dotnet-host</HostDebianPackageName>
-
-      <AdditionalSharedFxDebianPackageVersion>$(AdditionalSharedFrameworkVersion)</AdditionalSharedFxDebianPackageVersion>
-      <AdditionalSharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(AdditionalSharedFxDebianPackageVersion)</AdditionalSharedFxDebianPackageName>
-      <AdditionalSharedFxDebianPackageName>$(AdditionalSharedFxDebianPackageName.ToLower())</AdditionalSharedFxDebianPackageName>
-      <AdditionalHostFxrDebianPackageVersion>$(AdditionalHostFxrVersion)</AdditionalHostFxrDebianPackageVersion>
-      <AdditionalHostFxrDebianPackageName>dotnet-hostfxr-$(AdditionalHostFxrDebianPackageVersion)</AdditionalHostFxrDebianPackageName>
-      <AdditionalHostFxrDebianPackageName>$(AdditionalHostFxrDebianPackageName.ToLower())</AdditionalHostFxrDebianPackageName>
     </PropertyGroup>
 
     <!-- Inputs -->

build/package/Installer.MSI.targets

@@ -115,9 +115,6 @@
 
       <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript)
                       '$(SdkInstallerFile)'
-                      '$(AdditionalDownloadedSharedFrameworkInstallerFile)'
-                      '$(AdditionalDownloadedHostFxrInstallerFile)'
-                      '$(AdditionalDownloadedSharedHostInstallerFile)'
                       '$(DownloadedSharedFrameworkInstallerFile)'
                       '$(DownloadedHostFxrInstallerFile)'
                       '$(DownloadedSharedHostInstallerFile)'

build/package/Installer.PKG.targets

@@ -10,10 +10,6 @@
     <SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
     <SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
 
-    <AdditionalSharedHostComponentId>com.microsoft.dotnet.sharedhost.$(AdditionalSharedHostVersion).component.osx.x64</AdditionalSharedHostComponentId>
-    <AdditionalHostFxrComponentId>com.microsoft.dotnet.hostfxr.$(AdditionalHostFxrVersion).component.osx.x64</AdditionalHostFxrComponentId>
-    <AdditionalSharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(AdditionalSharedFrameworkVersion).component.osx.x64</AdditionalSharedFrameworkComponentId>
-
     <PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
 
     <SdkPkgSourcesRootDirectory>$(RepoRoot)/packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
@@ -27,10 +23,6 @@
     <SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
     <SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
     <HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
-
-    <AdditionalSharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalSharedFrameworkComponentId).pkg</AdditionalSharedFrameworkPkgIntermediatePath>
-    <AdditionalSharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalSharedHostComponentId).pkg</AdditionalSharedHostPkgIntermediatePath>
-    <AdditionalHostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalHostFxrComponentId).pkg</AdditionalHostFxrPkgIntermediatePath>
   </PropertyGroup>
   
     <Target Name="SetupPkgInputsOutputs">
@@ -44,15 +36,6 @@
         <DistributionTemplateReplacement Include="{HostFxrComponentId}">
           <ReplacementString>$(HostFxrComponentId)</ReplacementString>
         </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{AdditionalSharedFxComponentId}">
-          <ReplacementString>$(AdditionalSharedFrameworkComponentId)</ReplacementString>
-        </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{AdditionalSharedHostComponentId}">
-          <ReplacementString>$(AdditionalSharedHostComponentId)</ReplacementString>
-        </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{AdditionalHostFxrComponentId}">
-          <ReplacementString>$(AdditionalHostFxrComponentId)</ReplacementString>
-        </DistributionTemplateReplacement>
         <DistributionTemplateReplacement Include="{CLISdkComponentId}">
           <ReplacementString>$(SdkComponentId)</ReplacementString>
         </DistributionTemplateReplacement>
@@ -71,15 +54,6 @@
         <DistributionTemplateReplacement Include="{HostFxrBrandName}">
           <ReplacementString>$(HostFxrBrandName)</ReplacementString>
         </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{AdditionalSharedFxBrandName}">
-          <ReplacementString>$(AdditionalSharedFrameworkBrandName)</ReplacementString>
-        </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{AdditionalSharedHostBrandName}">
-          <ReplacementString>$(AdditionalSharedHostBrandName)</ReplacementString>
-        </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{AdditionalHostFxrBrandName}">
-          <ReplacementString>$(AdditionalHostFxrBrandName)</ReplacementString>
-        </DistributionTemplateReplacement>
       </ItemGroup>
       
       <!-- Consumed By Publish -->
@@ -97,10 +71,6 @@
         <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
         <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
-
-        <GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedSharedFrameworkInstallerFile)" />
-        <GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedHostFxrInstallerFile)" />
-        <GenerateSdkProductArchiveInputs Include="$(AdditionalDownloadedSharedHostInstallerFile)" />
       </ItemGroup>
     </Target>
 
@@ -124,22 +94,19 @@
             Outputs="$(CombinedFrameworkSdkHostInstallerFile)"
             DependsOnTargets="GenerateSdkPkg"
             Condition=" '$(OSName)' == 'osx' ">
+      <ItemGroup>
+        <PkgComponentsSourceFiles Include="$(SdkInstallerFile);
+                                $(DownloadedSharedFrameworkInstallerFile);
+                                $(DownloadedHostFxrInstallerFile);
+                                $(DownloadedSharedHostInstallerFile)" />
+        <PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
+                                                $(SharedFrameworkPkgIntermediatePath);
+                                                $(HostFxrPkgIntermediatePath);
+                                                $(SharedHostPkgIntermediatePath)" />
+      </ItemGroup>
+
       <!-- Move ProductArchive pkg components into place with component ids in the filenames -->
-      <Copy
+      <Copy SourceFiles="@(PkgComponentsSourceFiles)" DestinationFiles="@(PkgComponentsDestinationFiles)" />
-        SourceFiles="$(SdkInstallerFile);
-                     $(DownloadedSharedFrameworkInstallerFile);
-                     $(DownloadedHostFxrInstallerFile);
-                     $(DownloadedSharedHostInstallerFile);
-                     $(AdditionalDownloadedSharedFrameworkInstallerFile);
-                     $(AdditionalDownloadedHostFxrInstallerFile);
-                     $(AdditionalDownloadedSharedHostInstallerFile);"
-        DestinationFiles="$(SdkPkgIntermediatePath);
-                          $(SharedFrameworkPkgIntermediatePath);
-                          $(HostFxrPkgIntermediatePath);
-                          $(SharedHostPkgIntermediatePath);
-                          $(AdditionalSharedFrameworkPkgIntermediatePath);
-                          $(AdditionalHostFxrPkgIntermediatePath);
-                          $(AdditionalSharedHostPkgIntermediatePath);" />
 
       <!-- Fill out parameters in the Distribution Template -->
       <ReplaceFileContents

dir.props

@@ -36,6 +36,7 @@
   <Import Project="build/CrossGen.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/BundledRuntimes.props" />
+  <Import Project="build/BackwardsCompatibilityRuntimes.props" />
 
   <Import Project="build/AzureInfo.props" />
   <Import Project="build/InstallerInfo.props" />

packaging/osx/clisdk/Distribution-Template

@@ -17,9 +17,6 @@
         <line choice="{SharedFxComponentId}.pkg" />
         <line choice="{HostFxrComponentId}.pkg" />
         <line choice="{SharedHostComponentId}.pkg" />
-        <line choice="{AdditionalSharedFxComponentId}.pkg" />
-        <line choice="{AdditionalHostFxrComponentId}.pkg" />
-        <line choice="{AdditionalSharedHostComponentId}.pkg" />
         <line choice="{CLISdkComponentId}.pkg"/>
     </choices-outline>
     <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
@@ -31,23 +28,11 @@
     <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
         <pkg-ref id="{SharedHostComponentId}.pkg" />
     </choice>
-    <choice id="{AdditionalSharedFxComponentId}.pkg" visible="true" title="{AdditionalSharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
-        <pkg-ref id="{AdditionalSharedFxComponentId}.pkg" />
-    </choice>
-    <choice id="{AdditionalHostFxrComponentId}.pkg" visible="true" title="{AdditionalHostFxrBrandName} (x64)" description="The .NET Core Host FX Resolver">
-        <pkg-ref id="{AdditionalHostFxrComponentId}.pkg" />
-    </choice>
-    <choice id="{AdditionalSharedHostComponentId}.pkg" visible="true" title="{AdditionalSharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
-        <pkg-ref id="{AdditionalSharedHostComponentId}.pkg" />
-    </choice>
     <choice id="{CLISdkComponentId}.pkg" visible="true" title="{CLISdkBrandName} (x64)" description="The .NET Core SDK">
         <pkg-ref id="{CLISdkComponentId}.pkg"/>
     </choice>
     <pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
     <pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
     <pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>
-    <pkg-ref id="{AdditionalSharedFxComponentId}.pkg">{AdditionalSharedFxComponentId}.pkg</pkg-ref>
-    <pkg-ref id="{AdditionalHostFxrComponentId}.pkg">{AdditionalHostFxrComponentId}.pkg</pkg-ref>
-    <pkg-ref id="{AdditionalSharedHostComponentId}.pkg">{AdditionalSharedHostComponentId}.pkg</pkg-ref>
     <pkg-ref id="{CLISdkComponentId}.pkg">{CLISdkComponentId}.pkg</pkg-ref>
 </installer-gui-script>

packaging/windows/clisdk/bundle.wxs

@@ -55,15 +55,6 @@
       <MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
-      <MsiPackage SourceFile="$(var.AdditionalSharedFXMsiSourcePath)">
-        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
-      </MsiPackage>
-      <MsiPackage SourceFile="$(var.AdditionalHostFXRMsiSourcePath)">
-        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
-      </MsiPackage>
-      <MsiPackage SourceFile="$(var.AdditionalSharedHostMsiSourcePath)">
-        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
-      </MsiPackage>
     </Chain>
   </Bundle>
 

packaging/windows/clisdk/generatebundle.ps1

@@ -6,9 +6,6 @@ param(
     [Parameter(Mandatory=$true)][string]$SharedFxMSIFile,
     [Parameter(Mandatory=$true)][string]$HostFxrMSIFile,
     [Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
-    [Parameter(Mandatory=$true)][string]$AdditionalSharedFxMSIFile,
-    [Parameter(Mandatory=$true)][string]$AdditionalHostFxrMSIFile,
-    [Parameter(Mandatory=$true)][string]$AdditionalSharedHostMSIFile,
     [Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
     [Parameter(Mandatory=$true)][string]$ProductMoniker,

src/redist/redist.csproj

@@ -223,4 +223,21 @@
 
     <Delete Files="@(PdbsToClean)" />
   </Target>
+
+  <Target Name="PublishStage2WithBackwardsCompatibleRuntimes"
+          AfterTargets="PublishLzmaArchive;">
+    <ItemGroup>
+      <BackwardsCompatibleSharedFrameworks Remove="*" />
+      <BackwardsCompatibleSharedFrameworks Include="$(BackwardsCompatibleSharedFrameworksPublishDirectory)/**/*" />
+
+      <Stage2Cli Remove="*" />
+      <Stage2Cli Include="$(OutputDirectory)/**/*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(BackwardsCompatibleSharedFrameworks)"
+          DestinationFiles="@(BackwardsCompatibleSharedFrameworks->'$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <Copy SourceFiles="@(Stage2Cli)"
+          DestinationFiles="@(Stage2Cli->'$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
 </Project>

test/EndToEnd/GivenDotNetUsesMSBuild.cs

@@ -109,7 +109,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
                 .Should()
                 .Pass();
 
-            new DotnetCommand()
+            new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                 .WithWorkingDirectory(testProjectDirectory)
                 .ExecuteWithCapturedOutput(
                     $"-d dependency-tool-invoker -c {configuration} -f netcoreapp2.0 portable")

test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DependencyToolInvokerCommand.cs

@@ -9,6 +9,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
 {
     public class DependencyToolInvokerCommand : DotnetCommand
     {
+        public DependencyToolInvokerCommand() : base()
+        {
+        }
+
+        public DependencyToolInvokerCommand(string dotnetUnderTest) : base(dotnetUnderTest)
+        {
+        }
+
         public CommandResult Execute(string commandName, string framework, string additionalArgs)
         {
             var args = $"dependency-tool-invoker {commandName} --framework {framework} {additionalArgs}";

test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/DotnetCommand.cs

@@ -8,9 +8,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
     public class DotnetCommand : TestCommand
     {
         public DotnetCommand()
-            : base(DotnetUnderTest.FullName)
+            : this(DotnetUnderTest.FullName)
         {
+        }
 
+        public DotnetCommand(string dotnetUnderTest)
+            : base(dotnetUnderTest)
+        {
         }
     }
 }

test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetUnderTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.IO;
 using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Tools.Test.Utilities
@@ -22,5 +23,15 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
                 return _pathToDotnetUnderTest;
             }
         }
+
+        public static string WithBackwardsCompatibleRuntimes
+        {
+            get
+            {
+                return Path.Combine(
+                    new RepoDirectoriesProvider().Stage2WithBackwardsCompatibleRuntimesDirectory,
+                    "dotnet");
+            }
+        }
     }
 }

test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs

@@ -18,6 +18,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
         private string _builtDotnet;
         private string _nugetPackages;
         private string _stage2Sdk;
+        private string _stage2WithBackwardsCompatibleRuntimesDirectory;
         private string _testPackages;
         private string _pjDotnet;
 
@@ -82,6 +83,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
         public string NugetPackages => _nugetPackages;
         public string PjDotnet => _pjDotnet;
         public string Stage2Sdk => _stage2Sdk;
+        public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory;
         public string TestPackages => _testPackages;
 
         public RepoDirectoriesProvider(
@@ -97,6 +99,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
             _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
             _pjDotnet = pjDotnet ?? GetPjDotnetPath();
             _stage2Sdk = Directory.EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")).First();
+            _stage2WithBackwardsCompatibleRuntimesDirectory =
+                Path.Combine(_artifacts, "stage2WithBackwardsCompatibleRuntimes");
             _testPackages = Path.Combine(RepoRoot, "artifacts", "testpackages", "packages");
         }
 

test/dotnet-back-compat.Tests/GivenThatWeWantToBeBackwardsCompatibleWith1xProjects.cs

@@ -42,7 +42,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
             var outputDll = testInstance.Root.GetDirectory("bin", configuration, target)
                 .GetFile($"{testAppName}.dll");
 
-            new DotnetCommand()
+            new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                 .ExecuteWithCapturedOutput(outputDll.FullName)
                 .Should().Pass()
                 .And.HaveStdOutContaining("Hello World");

test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs

@@ -437,7 +437,7 @@ namespace Microsoft.DotNet.Migration.Tests
                 return;
             }
 
-            var cmd = new DotnetCommand()
+            var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                  .WithWorkingDirectory(projectDirectory)
                  .ExecuteWithCapturedOutput("run -c Debug");
             cmd.Should().Pass();
@@ -454,7 +454,7 @@ namespace Microsoft.DotNet.Migration.Tests
                 .Root
                 .GetDirectory("project");
 
-            var cmd = new DotnetCommand()
+            var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                  .WithWorkingDirectory(projectDirectory)
                  .ExecuteWithCapturedOutput("migrate");
 
@@ -495,7 +495,7 @@ namespace Microsoft.DotNet.Migration.Tests
                 return;
             }
 
-            var cmd = new DotnetCommand()
+            var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                  .WithWorkingDirectory(projectDirectory)
                  .ExecuteWithCapturedOutput("run -c Debug");
             cmd.Should().Pass();
@@ -552,7 +552,7 @@ namespace Microsoft.DotNet.Migration.Tests
                 return;
             }
 
-            var cmd = new DotnetCommand()
+            var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                  .WithWorkingDirectory(projectDirectory)
                  .ExecuteWithCapturedOutput("run -c Debug");
             cmd.Should().Pass();

test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs

@@ -759,7 +759,7 @@ namespace Microsoft.DotNet.Migration.Tests
 
             foreach (var dll in runnableDlls)
             {
-                new TestCommand("dotnet").ExecuteWithCapturedOutput($"\"{dll.FullName}\"").Should().Pass();
+                new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes).ExecuteWithCapturedOutput($"\"{dll.FullName}\"").Should().Pass();
             }
         }
 

test/dotnet.Tests/PackagedCommandTests.cs

@@ -128,7 +128,7 @@ namespace Microsoft.DotNet.Tests
                 .Execute()
                 .Should().Pass();
 
-            new DependencyToolInvokerCommand()
+            new DependencyToolInvokerCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                 .WithWorkingDirectory(testInstance.Root)
                 .WithEnvironmentVariable(CommandContext.Variables.Verbose, "true")
                 .ExecuteWithCapturedOutput($"tool-with-output-name", framework, "")
@@ -250,7 +250,7 @@ namespace Microsoft.DotNet.Tests
                 .WithSourceFiles()
                 .WithRestoreFiles();
 
-            new DependencyContextTestCommand()
+            new DependencyContextTestCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
                 .WithWorkingDirectory(testInstance.Root)
                 .Execute("")
                 .Should().Pass();
@@ -417,7 +417,7 @@ namespace Microsoft.DotNet.Tests
 
         class DependencyContextTestCommand : DotnetCommand
         {
-            public DependencyContextTestCommand()
+            public DependencyContextTestCommand(string dotnetUnderTest) : base(dotnetUnderTest)
             {
             }