Remove Runtime composite package from being built. (#89946)

* Remove Runtime composite package from being built.

* delete now unused projects.

diff --git a/eng/Subsets.props b/eng/Subsets.props
index d31b00c..77268ff 100644 (file)
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -499,10 +499,6 @@
 
   <Choose>
     <When Condition="$(_subset.Contains('+packs.product+'))">
-      <ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' != 'Mono'">
-        <SharedFrameworkProjectToBuild Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Runtime.Composite.sfxproj" />
-        <SharedFrameworkProjectToBuild Include="$(InstallerProjectRoot)pkg\sfx\bundle\Microsoft.NETCore.App.Composite.Bundle.bundleproj" />
-      </ItemGroup>
       <ItemGroup Condition="'$(PgoInstrument)' != 'true'">
         <SharedFrameworkProjectToBuild Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj" />
       </ItemGroup>

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj
deleted file mode 100644 (file)
index 7d5a874..0000000
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj
+++ /dev/null
@@ -1,41 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" />
-
-  <PropertyGroup>
-    <PlatformPackageType>RuntimePack</PlatformPackageType>
-    <ArchiveName>dotnet-runtime-internal-composite</ArchiveName>
-    <OverridePackageId>$(SharedFrameworkName).Composite</OverridePackageId>
-    <OverridePackageId Condition="'$(PgoInstrument)' != ''">$(SharedFrameworkName).Composite.PGO</OverridePackageId>
-    <CreateSymbolsArchive Condition="'$(PgoInstrument)' == ''">true</CreateSymbolsArchive>
-    <SymbolsArchiveName>dotnet-runtime-composite-symbols</SymbolsArchiveName>
-    <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
-    <ForcePublishReadyToRunComposite>true</ForcePublishReadyToRunComposite>
-    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono' or '$(PgoInstrument)' != ''">true</SkipBuild>
-    <SkipInstallersPackageReference>true</SkipInstallersPackageReference>
-    <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion> <!-- The composite image does not have a FileVersion resource -->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PlatformManifestFileEntry Include="Microsoft.NETCore.App.Composite.r2r.dll" IsNative="true" />
-    <PublishReadyToRunCompositeExclusions Include="System.Reflection.Metadata.dll" />
-    <PublishReadyToRunCompositeExclusions Include="System.Collections.Immutable.dll" />
-    <PublishReadyToRunCompositeExclusions Include="System.Runtime.CompilerServices.Unsafe.dll" />
-  </ItemGroup>
-
- <ItemGroup>
-    <!-- Exclude the composite image from the closure check as it includes references to already excluded shim assemblies -->
-    <ExcludeFromClosure Include="Microsoft.NETCore.App.Composite.r2r" />
- </ItemGroup>
-
-  <Import Project="Microsoft.NETCore.App.Runtime.props" />
-
-  <ItemGroup>
-    <PublishReadyToRunCrossgen2ExtraArgsList Include="--compositekeyfile:$(AssemblyOriginatorKeyFile)"/>
-    <!-- Compile with avx2 on x64 -->
-    <PublishReadyToRunCrossgen2ExtraArgsList Condition="'$(TargetArchitecture)' == 'x64'" Include="--inputbubble" />
-    <PublishReadyToRunCrossgen2ExtraArgsList Condition="'$(TargetArchitecture)' == 'x64'" Include="--instruction-set:avx2" />
-  </ItemGroup>
-
-  <Import Project="ReadyToRun.targets" />
-</Project>

diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Composite.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Composite.Bundle.bundleproj
deleted file mode 100644 (file)
index 55046be..0000000
--- a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Composite.Bundle.bundleproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets">
-
-  <PropertyGroup>
-    <SkipBuild Condition="'$(RuntimeFlavor)' == 'Mono' or '$(PgoInstrument)' == 'true'">true</SkipBuild>
-    <IsShipping Condition="'$(PgoInstrument)' == 'true'">false</IsShipping>
-    <ArchiveName>dotnet-runtime-composite</ArchiveName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BundleComponentReference Include="../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj" />
-    <BundleComponentReference Include="../installers/dotnet-hostfxr.proj" />
-    <BundleComponentReference Include="../installers/dotnet-host.proj" />
-  </ItemGroup>
-
-  <Target Name="PublishToDisk">
-    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
-
-    <MSBuild Projects="@(BundleComponentReference)"
-             Targets="PublishToDisk"
-             Properties="OutputPath=$(OutputPath)" />
-  </Target>
-
-  <Target Name="PublishSymbolsToDisk">
-    <Error Condition="'$(SymbolsOutputPath)' == ''" Text="Publishing to disk requires the SymbolsOutputPath to be set to the root of the path to write to." />
-
-    <MSBuild Projects="@(BundleComponentReference)"
-             Targets="PublishSymbolsToDisk"
-             Properties="SymbolsOutputPath=$(SymbolsOutputPath)" />
-  </Target>
-
-</Project>