Remove internal archives (#49879)

* Remove internal archives

Author: mmitche

Directory.Build.props

@@ -151,13 +151,6 @@
     <TargetingPackName>Microsoft.AspNetCore.App.Ref</TargetingPackName>
     <RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
     <TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
-
-    <!--
-      Archives and installers using this prefix are intended for internal use only.
-      For example, this .zip is used to handoff bits to partner teams who then incorporate our shared frameworks
-      into their own installers.
-    -->
-    <InternalInstallerBaseName>$(RuntimeInstallerBaseName)-internal</InternalInstallerBaseName>
   </PropertyGroup>
 
   <!-- Compilation options which apply to all languages. Language-specific options should be set in eng/targets/$(lang).Common.props -->

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -175,8 +175,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <RuntimeListFileName>RuntimeList.xml</RuntimeListFileName>
     <RuntimeListOutputPath>$(BaseIntermediateOutputPath)$(RuntimeListFileName)</RuntimeListOutputPath>
 
-    <InternalArchiveOutputFileName>$(InternalInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</InternalArchiveOutputFileName>
-    <InternalArchiveOutputPath>$(InstallersOutputPath)$(InternalArchiveOutputFileName)</InternalArchiveOutputPath>
     <RedistArchiveOutputFileName>$(RuntimeInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</RedistArchiveOutputFileName>
     <RedistArchiveOutputPath>$(InstallersOutputPath)$(RedistArchiveOutputFileName)</RedistArchiveOutputPath>
     <CompositeArchiveOutputFileName>$(RuntimeInstallerBaseName)-composite-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</CompositeArchiveOutputFileName>
@@ -207,7 +205,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
       _BatchCopyToSharedFrameworkLayout;
       _BatchCopyToRedistLayout;
       _BatchCopyToCompositeLayout;
-      _CreateInternalSharedFxArchive;
       _CreateRedistSharedFxArchive;
       _CreateRedistCompositeArchive;
     </CoreBuildDependsOn>
@@ -709,21 +706,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <Message Importance="High" Text="$(MSbuildProjectFile) -> $(LocalInstallationOutputPath)" />
   </Target>
 
-  <Target Name="_CreateInternalSharedFxArchive"
-          Inputs="@(SharedFxContent)"
-          Outputs="$(InternalArchiveOutputPath)">
-    <ZipDirectory
-      SourceDirectory="$(SharedFrameworkLayoutRoot)"
-      DestinationFile="$(InternalArchiveOutputPath)"
-      Overwrite="true"
-      Condition="'$(ArchiveExtension)' == '.zip'" />
-    <Exec
-      Command="tar -czf $(InternalArchiveOutputPath) ."
-      WorkingDirectory="$(SharedFrameworkLayoutRoot)"
-      Condition="'$(ArchiveExtension)' == '.tar.gz'" />
-    <Message Importance="High" Text="$(MSbuildProjectFile) -> $(InternalArchiveOutputPath)" />
-  </Target>
-
   <Target Name="_CreateRedistCompositeArchive"
           Condition="'$(TargetOsName)' == 'linux' or '$(TargetOsName)' == 'linux-musl'"
           Inputs="$(CompositeTargetDir)"

src/Installers/Windows/SharedFramework/SharedFramework.wixproj

@@ -15,6 +15,7 @@
     <HarvestDirectorySuppressSpecificWarnings>5150;5151</HarvestDirectorySuppressSpecificWarnings>
     <HarvestDirectorySuppressRegistry>true</HarvestDirectorySuppressRegistry>
     <HarvestSource>$(IntermediateOutputPath)fx\</HarvestSource>
+    <ExtractPath>$(IntermediateOutputPath)fxExtractPath\</ExtractPath>
     <IsShipping>true</IsShipping>
     <DefineConstants>$(DefineConstants);ProductNameFolder=$(ProductNameFolder)</DefineConstants>
     <DefineConstants>$(DefineConstants);ProductNameShort=$(ProductNameShort)</DefineConstants>
@@ -65,17 +66,24 @@
       <SharedFrameworkArm64HarvestRootPath Condition="'$(SharedFrameworkArm64HarvestRootPath)' == ''">$(InstallersOutputPath)</SharedFrameworkArm64HarvestRootPath>
       <SharedFrameworkX64HarvestRootPath Condition="'$(SharedFrameworkX64HarvestRootPath)' == ''">$(InstallersOutputPath)</SharedFrameworkX64HarvestRootPath>
       <SharedFrameworkX86HarvestRootPath Condition="'$(SharedFrameworkX86HarvestRootPath)' == ''">$(InstallersOutputPath)</SharedFrameworkX86HarvestRootPath>
-      <IntermediateArm64SharedFxZip>$(SharedFrameworkArm64HarvestRootPath)aspnetcore-runtime-internal-$(PackageVersion)-win-arm64.zip</IntermediateArm64SharedFxZip>
-      <IntermediateX64SharedFxZip>$(SharedFrameworkX64HarvestRootPath)aspnetcore-runtime-internal-$(PackageVersion)-win-x64.zip</IntermediateX64SharedFxZip>
-      <IntermediateX86SharedFxZip>$(SharedFrameworkX86HarvestRootPath)aspnetcore-runtime-internal-$(PackageVersion)-win-x86.zip</IntermediateX86SharedFxZip>
+      <IntermediateArm64SharedFxZip>$(SharedFrameworkArm64HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-arm64.zip</IntermediateArm64SharedFxZip>
+      <IntermediateX64SharedFxZip>$(SharedFrameworkX64HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-x64.zip</IntermediateX64SharedFxZip>
+      <IntermediateX86SharedFxZip>$(SharedFrameworkX86HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-x86.zip</IntermediateX86SharedFxZip>
     </PropertyGroup>
 
     <Unzip Condition="'$(Platform)' == 'arm64'"
-           SourceFiles="$(IntermediateArm64SharedFxZip)" DestinationFolder="$(HarvestSource)" />
+           SourceFiles="$(IntermediateArm64SharedFxZip)" DestinationFolder="$(ExtractPath)" />
     <Unzip Condition="'$(Platform)' == 'x64'"
-           SourceFiles="$(IntermediateX64SharedFxZip)" DestinationFolder="$(HarvestSource)" />
+           SourceFiles="$(IntermediateX64SharedFxZip)" DestinationFolder="$(ExtractPath)" />
     <Unzip Condition="'$(Platform)' == 'x86'"
-           SourceFiles="$(IntermediateX86SharedFxZip)" DestinationFolder="$(HarvestSource)" />
+           SourceFiles="$(IntermediateX86SharedFxZip)" DestinationFolder="$(ExtractPath)" />
+
+    <!-- The runtime zips also contain the core runtime shared framework, which we don't want when harvesting.
+         Copy just the aspnetcore shared Fx to the harvest location -->
+    <ItemGroup>
+      <SharedFxFilesToHarvest Include="$(ExtractPath)\shared\Microsoft.AspNetCore.App\**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(SharedFxFilesToHarvest)" DestinationFolder="$(HarvestSource)\shared\Microsoft.AspNetCore.App\%(RecursiveDir)" />
   </Target>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />

src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj

@@ -38,7 +38,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <PropertyGroup>
-    <PackageFileName>$(InternalInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
+    <PackageFileName>$(RuntimeInstallerBaseName)-internal-$(PackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
   </PropertyGroup>
 
   <!-- Overwrite the wix package drop creation target to create a lit