Remove old transport packages from CoreCLR and CoreFX.

eng/Version.Details.xml

@@ -1,9 +1,5 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="5.0.0-alpha.1.19563.6">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha.1.20080.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>665983a01f9c604bc3f704f469acb8a08c619d8a</Sha>

eng/pipelines/coreclr/templates/build-job.yml

@@ -176,7 +176,7 @@ jobs:
           SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat'
 
     # Build packages
-    - script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossPackagesArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig)
+    - script: $(coreClrRepoRootDir)build-packages$(scriptExt) -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossArg) $(officialBuildIdArg) -ci --configuration $(_BuildConfig)
       displayName: Build packages
 
     # Save packages using the prepare-signed-artifacts format.

eng/pipelines/coreclr/templates/xplat-job.yml

@@ -109,13 +109,9 @@ jobs:
     - ${{ if ne(parameters.crossrootfsDir, '') }}:
       - name: crossArg
         value: 'cross'
-      - name: crossPackagesArg
-        value: '-__DoCrossArchBuild=1'
     - ${{ if eq(parameters.crossrootfsDir, '') }}:
       - name: crossArg
         value: ''
-      - name: crossPackagesArg
-        value: ''
 
     - ${{ each variable in parameters.variables }}:
       - ${{insert}}: ${{ variable }}

src/coreclr/build-packages.sh

@@ -97,9 +97,8 @@ while :; do
             __Id=$(echo $1| cut -d'=' -f 2)
             buildArgs="$buildArgs /p:OfficialBuildId=$__Id"
             ;;
-        -__DoCrossArchBuild=*)
-            __CrossBuild=$(echo $1| cut -d'=' -f 2)
-            buildArgs="$buildArgs /p:__DoCrossArchBuild=$__CrossBuild"
+        cross)
+            __CrossBuild=1
             ;;
         -portablebuild=false)
             buildArgs="$buildArgs /p:PortableBuild=false"

src/coreclr/src/.nuget/Directory.Build.targets

@@ -14,43 +14,16 @@
     </ItemGroup>
 
     <ItemGroup>
-      <AdditionalLibPackageExcludes Include="@(LongNameFile -> '%(TargetPath)')" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <NativeWithSymbolFile Include="@(NativeBinary);@(CrossGenBinary)">
+      <NativeWithSymbolFile Include="@(NativeBinary)">
         <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
       </NativeWithSymbolFile>
-      <!-- Using lib/netstandard1.0 here.  There is no TFM for this since it is a runtime itself. -->
-      <NativeWithSymbolFile Include="@(ArchitectureSpecificLibFile)">
-        <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath>
-      </NativeWithSymbolFile>
       <NativeWithSymbolFile Include="@(ArchitectureSpecificToolFile)">
         <TargetPath>tools</TargetPath>
       </NativeWithSymbolFile>
     </ItemGroup>
 
-    <ItemGroup Condition="'$(HasCrossTargetComponents)'=='true'">
-      <NativeWithSymbolFile Include="@(CrossArchitectureSpecificNativeFileAndSymbol)">
-        <TargetPath>runtimes/$(CrossTargetComponentFolder)_$(Platform)/native</TargetPath>
-      </NativeWithSymbolFile>
-      <NativeWithSymbolFile Include="@(CrossArchitectureSpecificToolFile)">
-        <TargetPath>tools/$(CrossTargetComponentFolder)_$(Platform)</TargetPath>
-      </NativeWithSymbolFile>
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- The symbols for these files are already in place together with respective *.ni.pdb -->
-      <IlForCrossGenedFile Include="@(CrossGenBinary -> '%(RootDir)%(Directory)IL\%(Filename).dll')">
-        <TargetPath>runtimes/$(PackageTargetRuntime)/il</TargetPath>
-      </IlForCrossGenedFile>
-    </ItemGroup>
-
     <ItemGroup>
       <File Include="@(NativeWithSymbolFile)" />
-      <File Include="@(LongNameFile);@(IlForCrossGenedFile)">
-        <IsSymbolFile>true</IsSymbolFile>
-      </File>
     </ItemGroup>
 
     <ItemGroup>

src/coreclr/src/.nuget/descriptions.json

@@ -9,16 +9,6 @@
         "Description": "When using NuGet 3.x this package requires at least version {0}.",
         "CommonTypes": [ ]
     },
-    {
-        "Name": "Microsoft.NETCore.Runtime.CoreCLR",
-        "Description": "The .NET Core runtime, called CoreCLR, and the base library, called System.Private.CoreLib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.",
-        "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.TargetingPack.Private.CoreCLR",
-        "Description": "Contains a private targeting pack which contains only the CoreCLR System.Private.CoreLib reference assembly. Used for producing platform specific libraries such as facades.",
-        "CommonTypes": [ ]
-    },
     {
         "Name": "Microsoft.NETCore.ILAsm",
         "Description": "The .NET IL Assembler.",
@@ -29,11 +19,6 @@
         "Description": "The .NET IL Disassembler.",
         "CommonTypes": [ ]
     },
-    {
-        "Name": "Microsoft.NETCore.Jit",
-        "Description": "The .NET JIT compiler.",
-        "CommonTypes": [ ]
-    },
     {
         "Name": "Microsoft.NETCore.TestHost",
         "Description": "CoreCLR application host for test applications",

src/coreclr/src/.nuget/packages.builds

@@ -1,22 +1,10 @@
 <Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup Condition="'$(__SkipCoreLibBuild)'==''">
-    <ProjectReference Include="Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.builds" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetsWindows)'=='true'">
-    <ProjectReference Include="Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetsWindows)'=='true' OR '$(DotNetBuildFromSource)'=='true'">
     <ProjectReference Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.pkgproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(__SkipNativeBuild)'==''">
-    <ProjectReference Include="Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.builds" />
-    <ProjectReference Include="Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds" />
-  </ItemGroup>
-
   <ItemGroup>
+    <ProjectReference Include="Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds" />
     <ProjectReference Include="Microsoft.NETCore.ILAsm\Microsoft.NETCore.ILAsm.builds" />
     <ProjectReference Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" />
   </ItemGroup>

src/coreclr/src/.nuget/packaging.props

@@ -17,10 +17,6 @@
     <MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
     <MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
 
-    <!-- Define packaging attributes for cross target components -->
-    <HasCrossTargetComponents Condition="'$(TargetsWindows)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm')">true</HasCrossTargetComponents>
-    <HasCrossTargetComponents Condition="'$(TargetsLinux)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm') and '$(__DoCrossArchBuild)' == '1'">true</HasCrossTargetComponents>
-
     <PackageIndexFile>$(MSBuildThisFileDirectory)/packageIndex.json</PackageIndexFile>
 
     <!-- coreclr doesn't currently use the index so don't force it to be in sync -->