Remove old transport packages from CoreCLR and CoreFX. (#5523)

* Remove old transport packages from CoreCLR and CoreFX.

* Remove a lot of now unused goo from the coreclr packaging build.

* Remove unused Microsoft.Windows.Compatibility tests.

* Remove unused frameworkPackage.targets

eng/Version.Details.xml

 <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/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds

-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <!-- identity project, runtime specific projects are included by props above -->
-    <Project Include="$(MSBuildProjectName).pkgproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(builds.targets))" />
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
-  </PropertyGroup>
-
-  <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.FreeBSD.Microsoft.NETCore.Jit.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libclrjit.so" />
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libclrjit.so" />
-    <CrossArchitectureSpecificNativeFileAndSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\libclrjit.so" />
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libclrjit.dylib" />
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)clrjit.dll" />
-    <CrossArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)$(CrossTargetComponentFolder)\clrjit.dll" />
-
-    <!-- prevent accidental inclusion in AOT projects. -->
-    <File Include="$(PlaceholderFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)-aot/native</TargetPath>
-    </File>
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Directory.Build.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <!-- No reference: don't permit reference to the implementation from lib -->
-    <File Include="$(PlaceholderFile)">
-      <TargetPath>ref/netstandard1.0</TargetPath>
-    </File>
-  </ItemGroup>
-  <Import Project="../Directory.Build.props" />
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds

-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <!-- identity project, runtime specific projects are included by props above -->
-    <Project Include="$(MSBuildProjectName).pkgproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(builds.targets))" />
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
-    <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage>
-  </PropertyGroup>
-  
-  <ItemGroup Condition="'$(IsLineupPackage)' == 'true'">
-    <ProjectReference Include="..\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.pkgproj">
-      <AdditionalProperties>%(ProjectReference.AdditionalProperties);IsLineupPackage=false</AdditionalProperties>
-    </ProjectReference>
-  </ItemGroup>
-
-  <Import Condition="'$(_packageTargetOSGroup)' != ''"  Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.FreeBSD.Microsoft.NETCore.Runtime.CoreCLR.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libcoreclr.so" />
-    <NativeBinary Condition="'$(_PlatformDoesNotSupportEventTrace)' != 'true'" Include="$(BinDir)libcoreclrtraceptprovider.so" />
-    <NativeBinary Include="$(BinDir)libdbgshim.so" />
-    <NativeBinary Include="$(BinDir)libmscordaccore.so" />
-    <NativeBinary Include="$(BinDir)libmscordbi.so" />
-    <File Include="$(BinDir)SOS_README.md">
-      <TargetPath>runtimes\$(PackageTargetRuntime)\native</TargetPath>
-    </File>
-    <CrossGenBinary Include="$(BinDir)System.Private.CoreLib.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" />
-    <CrossArchitectureSpecificToolFile Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen" />
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'x86'">true</_PlatformDoesNotSupportCreatedump>
-    <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true</_PlatformDoesNotSupportCreatedump>
-    <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true</_PlatformDoesNotSupportEventTrace>
-    <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true</_PlatformDoesNotSupportEventTrace>
-  </PropertyGroup>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libcoreclr.so" />
-    <NativeBinary Condition="'$(_PlatformDoesNotSupportEventTrace)' != 'true'" Include="$(BinDir)libcoreclrtraceptprovider.so" />
-    <NativeBinary Include="$(BinDir)libdbgshim.so" />
-    <NativeBinary Include="$(BinDir)libmscordaccore.so" />
-    <NativeBinary Include="$(BinDir)libmscordbi.so" />
-    <File Include="$(BinDir)SOS_README.md">
-      <TargetPath>runtimes\$(PackageTargetRuntime)\native</TargetPath>
-    </File>
-    <NativeBinary Condition="'$(_PlatformDoesNotSupportCreatedump)' != 'true'" Include="$(BinDir)createdump" />
-    <CrossGenBinary Include="$(BinDir)System.Private.CoreLib.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" />
-    <CrossArchitectureSpecificToolFile Condition="'$(HasCrossTargetComponents)' == 'true'" Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen" />
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libcoreclr.dylib" />
-    <NativeBinary Include="$(BinDir)libdbgshim.dylib" />
-    <NativeBinary Include="$(BinDir)libmscordaccore.dylib" />
-    <NativeBinary Include="$(BinDir)libmscordbi.dylib" />
-    <File Include="$(BinDir)SOS_README.md">
-      <TargetPath>runtimes\$(PackageTargetRuntime)\native</TargetPath>
-    </File>
-    <CrossGenBinary Include="$(BinDir)System.Private.CoreLib.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" />
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup>
-    <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime>
-    <LongNamePlatform>$(Platform)</LongNamePlatform>
-    <LongNamePlatform Condition="'$(Platform)'=='x64'">amd64</LongNamePlatform>
-    <CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform>
-    <CrossTargetPlatform Condition="'$(CrossTargetPlatform)'=='x64'">amd64</CrossTargetPlatform>
-    <LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(FileVersion)</LongNameSuffix>
-    <CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(FileVersion)</CrossTargetLongNameSuffix>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)clretwrc.dll" />
-    <NativeBinary Include="$(BinDir)coreclr.dll" />
-    <NativeBinary Include="$(BinDir)dbgshim.dll" />
-    <NativeBinary Include="$(BinDir)mscordaccore.dll" />
-    <NativeBinary Include="$(BinDir)mscordbi.dll" />
-    <NativeBinary Include="$(BinDir)mscorrc.debug.dll" />
-    <NativeBinary Include="$(BinDir)mscorrc.dll" />
-    <File Include="$(BinDir)SOS_README.md">
-      <TargetPath>runtimes\$(PackageTargetRuntime)\native</TargetPath>
-    </File>
-    <NativeBinary Include="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'" />
-    <CrossGenBinary Include="$(BinDir)System.Private.CoreLib.dll" />
-    <ArchitectureSpecificToolFile Include="$(BinDir)crossgen.exe" />
-    <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen.exe" />
-    <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordaccore.dll" />
-    <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordbi.dll" />
-
-    <!-- prevent accidental inclusion in AOT projects. -->
-    <File Include="$(PlaceholderFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)-aot/lib/netstandard1.0</TargetPath>
-    </File>
-    <File Include="$(PlaceholderFile)">
-      <TargetPath>runtimes/$(PackageTargetRuntime)-aot/native</TargetPath>
-    </File>
-
-    <!-- Create long-name files by including the same files again with a different target path. -->
-    <LongNameFile Include="$(BinDir)mscordaccore.dll">
-      <TargetPath>runtimes\$(PackageTargetRuntime)\native\%(FileName)$(LongNameSuffix)%(Extension)</TargetPath>
-    </LongNameFile>
-    <LongNameFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordaccore.dll"
-                  Condition="'$(HasCrossTargetComponents)'=='true'">
-      <TargetPath>tools\$(CrossTargetComponentFolder)_$(Platform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)</TargetPath>
-    </LongNameFile>
-  </ItemGroup>
-</Project>

src/coreclr/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <PropertyGroup>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    <SkipValidatePackage>true</SkipValidatePackage>
-    <OutputPath>$(PackagesOutputPath)</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <File Include="$(BinDir)/System.Private.CoreLib.dll">
-      <TargetPath>lib/netstandard1.0</TargetPath>
-    </File>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

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

 <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 -->

src/libraries/pkg/Directory.Build.targets

 <Project>
-
-  <Import Condition="'$(IsFrameworkPackage)' == 'true'" Project="frameworkPackage.targets" />
-
   <Import Project="..\Directory.Build.targets" />
 
-  <Target Name="ApplyBaselineToStaticDependencies" 
+  <Target Name="ApplyBaselineToStaticDependencies"
           BeforeTargets="AssignPkgProjPackageDependenciesTargetFramework"
           Condition="'@(IndexedDependency)' != ''">
     <ApplyBaseLine OriginalDependencies="@(IndexedDependency)"
@@ -14,14 +11,14 @@
       <Output TaskParameter="BaseLinedDependencies" ItemName="_BaseLinedStaticDependencies" />
     </ApplyBaseLine>
 
-    <ApplyPreReleaseSuffix Condition="'@(_BaseLinedStaticDependencies)' != ''" 
-                           OriginalPackages="@(_BaseLinedStaticDependencies)" 
+    <ApplyPreReleaseSuffix Condition="'@(_BaseLinedStaticDependencies)' != ''"
+                           OriginalPackages="@(_BaseLinedStaticDependencies)"
                            StablePackages="@(StablePackage)"
                            PackageIndexes="@(PackageIndex)"
                            PreReleaseSuffix="-$(VersionSuffix)">
       <Output TaskParameter="UpdatedPackages" ItemName="_SuffixedStaticDependencies"/>
     </ApplyPreReleaseSuffix>
-    
+
     <ItemGroup>
       <Dependency Include="@(_SuffixedStaticDependencies)" />
     </ItemGroup>

src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Configurations.props

-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      $(NetCoreAppCurrent);
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>

src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <ItemGroup>
-    <!-- identity project, runtime specific projects are included through netcoreapp.rids.props -->
-    <Project Include="$(MSBuildProjectName).pkgproj" Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(dir.traversal.targets))" />
-</Project>

src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup>
-    <TargetFrameworkName>netcoreapp</TargetFrameworkName>
-    <TargetFrameworkVersion>$(NETCoreAppCurrentVersion)</TargetFrameworkVersion>
-    <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
-    <RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>
-    <LibBinDir>$(NETCoreAppPackageRuntimePath)</LibBinDir>
-
-    <IsFrameworkPackage>true</IsFrameworkPackage>
-
-    <!-- Private packages need symbols -->
-    <IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <IgnoredReference Include="System.Private.CoreLib" />
-    <IgnoredReference Include="Windows" />
-
-    <IgnoredReference Condition="$(PackageTargetRuntime.EndsWith('-aot'))" Include="System.Private.Interop" />
-    <!-- Exclude shims from the closure verification -->
-    <ExcludeFromClosure Include="mscorlib" />
-    <ExcludeFromClosure Include="System" />
-    <ExcludeFromClosure Include="System.Configuration" />
-    <ExcludeFromClosure Include="System.Core" />
-    <ExcludeFromClosure Include="System.Data" />
-    <ExcludeFromClosure Include="System.Drawing" />
-    <ExcludeFromClosure Include="System.Net" />
-    <ExcludeFromClosure Include="System.Security" />
-    <ExcludeFromClosure Include="System.ServiceModel.Web" />
-    <ExcludeFromClosure Include="System.ServiceProcess" />
-    <ExcludeFromClosure Include="System.Transactions" />
-    <ExcludeFromClosure Include="WindowsBase" />
-
-    <AllowedRuntimeOnlyFiles Include="Microsoft.Win32.Registry" />
-    <AllowedRuntimeOnlyFiles Include="System.IO.FileSystem.AccessControl" />
-    <AllowedRuntimeOnlyFiles Include="System.IO.Pipes.AccessControl" />
-    <AllowedRuntimeOnlyFiles Include="System.Private.DataContractSerialization" />
-    <AllowedRuntimeOnlyFiles Include="System.Private.Uri" />
-    <AllowedRuntimeOnlyFiles Include="System.Private.Xml" />
-    <AllowedRuntimeOnlyFiles Include="System.Private.Xml.Linq" />
-    <AllowedRuntimeOnlyFiles Include="System.Runtime.WindowsRuntime" />
-    <AllowedRuntimeOnlyFiles Include="System.Runtime.WindowsRuntime.UI.Xaml" />
-    <AllowedRuntimeOnlyFiles Include="System.Security.AccessControl" />
-    <AllowedRuntimeOnlyFiles Include="System.Security.Cryptography.Cng" />
-    <AllowedRuntimeOnlyFiles Include="System.Security.Cryptography.OpenSsl" />
-    <AllowedRuntimeOnlyFiles Include="System.Security.Principal.Windows" />
-
-    <!-- Permit the following implementation-only assemblies -->
-    <ValidatePackageSuppression Condition="'$(PackageTargetRuntime)' != ''" Include="PermitInbox">
-      <Value>
-        @(AllowedRuntimeOnlyFiles);
-      </Value>
-    </ValidatePackageSuppression>
-    <!-- Permit missing Inbox since this used to be a shim and it is now OOB -->
-    <ValidatePackageSuppression Include="PermitMissingInbox">
-        <Value>
-            System.ComponentModel.Composition;
-        </Value>
-    </ValidatePackageSuppression>
-  </ItemGroup>
-
-  <Target Name="VerifyRuntimeOnlyFilesArePresentOnAllRuntimePackages"
-      DependsOnTargets="GetClosureFiles"
-      AfterTargets="ValidatePackage"
-      Condition="'$(PackageTargetRuntime)' != ''"
-      Inputs="%(ClosureFile.FileSet)"
-      Outputs="batching-on-FileSet-metadata">
-
-    <ItemGroup>
-      <_RuntimeOnlyMissingFile Include="@(AllowedRuntimeOnlyFiles)" Exclude="@(ClosureFile->'%(FileName)')" />
-    </ItemGroup>
-    <Error Condition="'@(_RuntimeOnlyMissingFile)' != ''" Text="Files '@(_RuntimeOnlyMissingFile)' should be present on all runtime-specific packages, but are not present for the package RID '$(PackageTargetRuntime)'" />
-  </Target>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props

-<Project>
-  <ItemGroup>
-    <OfficialBuildRID Include="freebsd-x64" />
-    <OfficialBuildRID Include="linux-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-x64" />
-    <OfficialBuildRID Include="linux-musl-x64" />
-    <OfficialBuildRID Include="rhel.6-x64" />
-    <OfficialBuildRID Include="osx-x64" />
-    <OfficialBuildRID Include="win-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-x64" />
-    <OfficialBuildRID Include="win-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-
-    <!-- The following RIDs are not officically supported and are not
-         built during official builds, however we wish to include them
-         in our runtime.json to enable others to provide them.  -->
-    <OfficialBuildRID Include="tizen.4.0.0-armel">
-      <Platform>armel</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="tizen.5.0.0-armel">
-      <Platform>armel</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-</Project>

src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Directory.Build.props

-<Project>
-  <PropertyGroup>
-    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
-    <BaseIntermediateOutputPath>bin</BaseIntermediateOutputPath>
-    <NuGetTargetMoniker Condition="'$(NugetMonikerVersion)' != ''">.NETCoreApp,Version=v$(NugetMonikerVersion)</NuGetTargetMoniker>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <!-- Setting NETCoreAppMaximumVersion to a high version so that the sdk doesn't complain if we're restoring/publishing for a higher version than the sdk. -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
-    <PackageConflictPreferredPackages Condition="'$(TargetFramework)' != 'netcoreapp2.0'">Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RuntimeIdentifiers).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages)</PackageConflictPreferredPackages>
-    <DisableImplicitFrameworkReferences Condition="$(TargetFramework.Contains('netcoreapp'))">true</DisableImplicitFrameworkReferences>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

src/libraries/pkg/Microsoft.Windows.Compatibility/tests/Microsoft.Windows.Compatibility.Validation.csproj

-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="$(CompatibilityPackageVersion)" />
-   </ItemGroup>
-   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(PrivateCorefxPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="3.0.0-*" />
-    <PackageReference Include="Microsoft.DesktopUI.App" Version="3.0.0-*" />
-    <PackageReference Include="System.Windows.Extensions" Version="4.6.0-*" />
-   </ItemGroup>
-   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.NETCore.App" Version="2.1.5" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
-   </ItemGroup>
-   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
-    <PackageReference Include="Microsoft.NETCore.App" Version="2.0.9" />
-  </ItemGroup>
-</Project>

src/libraries/pkg/Microsoft.Windows.Compatibility/tests/publishcompatibilityassets.ps1

-param (
-$frameworkVersion = "3.0",
-$runtimeVersion = "3.0.0-*",
-$refDirName = "netcoreapp30_compat",
-$rid = "win7-x64"
-)
-
-function _getPackageVersion($packageName)
-{
-	$searchPattern = -join($localPackageSourcePath, $packageName, ".[0-9].[0-9].[0-9]*.nupkg")
-	if (!(Test-Path $searchPattern))
-	{
-		Write-Error -Message (-join("Didn't find package: ", $packageName, " in source: ", $localPackageSourcePath, " please run build -allConfigurations"))
-		Exit;
-	}
-
-	if (!([string]((get-item $searchPattern).FullName) -match '([0-9].[0-9].[0-9][-a-z]*.[0-9]*.[0-9]*)'))
-	{
-		Write-Error -Message "Package name is invalid"
-		Exit;
-	}
-
-	if (!$matches)
-	{
-		Write-Error -Message (-join("Couldn't get package version for: ", $packageName))
-		Exit;
-	}
-	return $matches[1]
-}
-
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
-
-$repoRoot = ((get-item $PSScriptRoot).parent.parent.parent.FullName)
-$dotnetPath = -join($repoRoot, "\.dotnet\dotnet.exe")
-$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name))
-$packagesCachePath = -join($repoRoot, "\packages")
-$localPackageSourcePath = -join($repoRoot, "\artifacts\packages\Debug\")
-$targetFramework = -join("netcoreapp5.0", $frameworkVersion)
-
-if (!(Test-Path $localPackageSourcePath))
-{
-	$localPackageSourcePath = -join($repoRoot, "\artifacts\packages\Release\")
-	if (!(Test-Path $localPackageSourcePath))
-	{
-		Write-Error -Message (-join('Local package source must exist ', $localPackageSourcePath))
-		Exit;
-	}
-}
-
-$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;", $localPackageSourcePath)
-
-$compatPackageVersion = _getPackageVersion "Microsoft.Windows.Compatibility"
-$privatePackageVersion = _getPackageVersion "Microsoft.Private.CoreFx.NETCoreApp"
-
-Write-Output "Calling dotnet restore"
-& $dotnetPath restore --packages $packagesCachePath /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RuntimeIdentifiers=$rid $csprojPath
-
-$outputPath = -join($PSScriptRoot, "\bin\Debug\", $targetFramework, "\", $rid, "\publish\")
-
-Write-Output "Calling dotnet publish"
-& $dotnetPath publish -r $rid -o $outputPath /p:NugetMonikerVersion=$frameworkVersion /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:RuntimeFrameworkVersion=$runtimeFramework /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RuntimeIdentifiers=$rid $csprojPath
-
-if (!(Test-Path $outputPath))
-{
-	Write-Error -Message (-join("There was an error while publishing for framework: ", $targetFramework))
-	Exit;
-}
-
-Write-Output (-join("Published succedded for: ", $targetFramework))
-
-$refPath = -join($repoRoot, "\artifacts\bin\ref\", $refDirName)
-
-if (Test-Path $refPath)
-{
-	Remove-Item $refPath -r -force
-}
-
-New-Item $refPath -ItemType directory
-Remove-Item (-join($outputPath, "Microsoft.Windows.Compatibility.Validation.dll")) -force
-Copy-Item (-join($outputPath,"\refs\", "*.dll")) $refPath

src/libraries/pkg/descriptions.json

@@ -79,11 +79,6 @@
     "Description": "The .NET Core runtime.",
     "CommonTypes": []
   },
-  {
-    "Name": "Microsoft.NETCore.Runtime.CoreCLR",
-    "Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.",
-    "CommonTypes": []
-  },
   {
     "Name": "Microsoft.NETCore.Targets",
     "Description": "Provides supporting infrastructure for portable projects: support identifiers that define framework and runtime for support targets and packages that reference the minimum supported package versions when targeting these.",
@@ -129,11 +124,6 @@
     "Description": "Package used by CoreFx build infrastructure to represent the latest package versions in a release.",
     "CommonTypes": []
   },
-  {
-    "Name": "Microsoft.Private.CoreFx.NETCoreApp",
-    "Description": "Package used to represent the portions of NETCoreApp that come from CoreFx.",
-    "CommonTypes": []
-  },
   {
     "Name": "Microsoft.Private.CoreFx.OOB",
     "Description": "Package used to represent out-of-band packages that are not included in NetCoreApp.",
@@ -144,11 +134,6 @@
     "Description": "Contains the .NET Framework v4.6 targeting pack.",
     "CommonTypes": []
   },
-  {
-    "Name": "Microsoft.TargetingPack.Private.CoreCLR",
-    "Description": "Contains a private targeting pack which contains only the CoreCLR mscorlib reference assembly. Used for producing platform specific libraries such as facades.",
-    "CommonTypes": []
-  },
   {
     "Name": "Microsoft.VisualBasic.Core",
     "Description": "Provides types that support the Visual Basic runtime",
@@ -1394,7 +1379,7 @@
       "System.Resources.SatelliteContractVersionAttribute",
       "System.Resources.MissingManifestResourceException"
     ]
-  }, 
+  },
   {
     "Name": "System.Resources.Extensions",
     "Description": "Provides classes which read and write resources in a format that supports non-primitive objects.",

src/libraries/pkg/frameworkPackage.targets

-<Project InitialTargets="_CheckForFiles;IncludeFiles;SetValidateFramework">
-
-  <PropertyGroup>
-    <IsLineupPackage Condition="'$(PackageTargetRuntime)' == '' and '$(IncludeLibFiles)' != 'true'">true</IsLineupPackage>
-    <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
-
-    <NETStandardVersion Condition="'$(NETStandardVersion)' == ''">2.0</NETStandardVersion>
-    <NETStandardPackageRefPath Condition="'$(NETStandardPackageRefPath)' == ''">$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard$(NETStandardVersion)\ref</NETStandardPackageRefPath>
-
-    <IncludeReferenceFiles Condition="'$(IncludeReferenceFiles)' == '' and '$(PackageTargetRuntime)' == ''">true</IncludeReferenceFiles>
-    <IncludeLibFiles Condition="'$(IncludeLibFiles)' == '' and '$(PackageTargetRuntime)' != ''">true</IncludeLibFiles>
-    <IncludeNativeFiles Condition="'$(IncludeNativeFiles)' == '' and '$(PackageTargetRuntime)' != ''">true</IncludeNativeFiles>
-
-    <RefFileTargetPath Condition="'$(RefFileTargetPath)' == ''">ref/$(TargetFramework)</RefFileTargetPath>
-    <LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' and '$(PackageTargetRuntime)' == ''">lib/$(TargetFramework)</LibFileTargetPath>
-    <LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' and '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</LibFileTargetPath>
-
-    <NativeFileTargetPath Condition="'$(NativeFileTargetPath)' == '' and '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/native</NativeFileTargetPath>
-    <NativeBinDir Condition="'$(PackageTargetRuntimeSuffix)' == 'aot'">$(NativeBinDir)-aot</NativeBinDir>
-  </PropertyGroup>
-
-  <!-- Bring in ref content from binplaced ref props -->
-  <Import Condition="'$(IncludeReferenceFiles)' == 'true'" Project="$(RefBinDir)\*.props" />
-  <ItemGroup Condition="'$(IncludeReferenceFiles)' == 'true'">
-    <_buildRIDWithMetadata Include="@(BuildRID)">
-      <TargetRuntime>%(Identity)</TargetRuntime>
-      <Version>$(PackageVersion)</Version>
-    </_buildRIDWithMetadata>
-    <IndexedDependency Include="@(_buildRIDWithMetadata->'runtime.%(Identity).$(Id)')" />
-  </ItemGroup>
-
-  <!-- Bring in lib content from binplaced lib props -->
-  <Import Condition="'$(IncludeLibFiles)' == 'true'" Project="$(LibBinDir)\*.props" />
-
-  <ItemGroup Condition="'$(IncludeNativeFiles)' == 'true'">
-    <!-- Include native -->
-    <ExcludeNative Include="$(NativeBinDir)/*.lib" />
-    <ExcludeNative Include="$(NativeBinDir)/System.IO.Ports.Native.*" />
-    <NativeFile Include="$(NativeBinDir)/*.*" Exclude="@(ExcludeNative)" />
-    <!-- force a missing file if native build is absent -->
-    <NativeFile Include="$(NativeBinDir)/MISSING_NATIVE_BUILD" Condition="'@(NativeFile)' == ''" />
-  </ItemGroup>
-
-  <Target Name="_CheckForFiles">
-    <Error Condition="'$(IncludeReferenceFiles)' == 'true' and '@(RefFile)' == ''"
-           Text="IncludeReferenceFiles was specified but no file props were found in '$(RefBinDir)'" />
-    <Error Condition="'$(IncludeLibFiles)' == 'true' and '@(LibFile)' == ''"
-           Text="IncludeLibFiles was specified but no file props were found in '$(LibBinDir)'" />
-    <Error Condition="'$(IncludeNativeFiles)' == 'true' and '@(NativeFile)' == ''"
-           Text="IncludeNativeFiles was specified but no files were found in '$(NativeBinDir)'" />
-  </Target>
-
-  <Target Name="IncludeFiles">
-    <PropertyGroup>
-      <_repoRootLength>$(RepoRoot.Length)</_repoRootLength>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- Include refs -->
-      <File Include="@(RefFile)">
-        <TargetPath Condition="'%(RefFile.TargetPath)' == ''">$(RefFileTargetPath)%(RefFile.SubFolder)</TargetPath>
-      </File>
-
-      <!-- Include lib -->
-      <File Include="@(LibFile)">
-        <TargetPath Condition="'%(LibFile.TargetPath)' == '' ">$(LibFileTargetPath)%(LibFile.SubFolder)</TargetPath>
-      </File>
-
-      <File Include="@(NativeFile)">
-        <TargetPath>$(NativeFileTargetPath)</TargetPath>
-      </File>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(IncludeSymbolsInPackage)' != 'true'">
-      <!-- Set targetpath for sources to be under src so that it is excluded from the lib package -->
-      <File Condition="'%(File.IsSourceCodeFile)' == 'true'">
-        <TargetPath>src</TargetPath>
-        <TargetPath Condition="$([System.String]::Copy('%(FullPath)').StartsWith('$(RepoRoot)'))">src/$([System.String]::Copy('%(FullPath)').Substring($(_repoRootLength)).Replace('\', '/'))</TargetPath>
-      </File>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="GetClosureFiles">
-    <!-- sets up ClosureFile items that are organized by file-set -->
-    <ItemGroup>
-      <ClosureFile Include="@(RefFile)" Condition="Exists('%(FullPath)') and ('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)')" >
-        <FileSet>reference</FileSet>
-      </ClosureFile>
-
-      <ClosureFile Include="@(LibFile);@(NativeFile)" Condition="Exists('%(FullPath)') and ('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)')">
-        <FileSet>runtime</FileSet>
-      </ClosureFile>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="VerifyClosure"
-          DependsOnTargets="GetClosureFiles"
-          AfterTargets="ValidatePackage"
-          Inputs="%(ClosureFile.FileSet)"
-          Outputs="batching-on-FileSet-metadata">
-    <ItemGroup>
-      <_closureFileNames Include="@(ClosureFile->'%(FileName)')">
-        <Original>%(Identity)</Original>
-      </_closureFileNames>
-      <_closureFileNamesFiltered Include="@(_closureFileNames)" Exclude="@(ExcludeFromClosure)"/>
-      <_closureFileFiltered Include="@(_closureFileNamesFiltered->'%(Original)')"/>
-    </ItemGroup>
-
-    <Message Importance="High" Text="Verifying closure of $(Id) %(ClosureFile.FileSet) assemblies" />
-    <VerifyClosure Sources="@(_closureFileFiltered)"
-                   IgnoredReferences="@(IgnoredReference)"
-                   DependencyGraphFilePath="$(PackageReportDir)$(Id)$(NuspecSuffix)-%(ClosureFile.FileSet).dgml" />
-
-  </Target>
-
-  <Target Name="VerifyDuplicateTypes"
-          DependsOnTargets="GetClosureFiles"
-          AfterTargets="ValidatePackage"
-          Inputs="%(ClosureFile.FileSet)"
-          Outputs="batching-on-FileSet-metadata">
-    <PropertyGroup>
-      <_fileSet>%(ClosureFile.FileSet)</_fileSet>
-    </PropertyGroup>
-    <ItemGroup>
-      <_dupTypeFileName Include="@(ClosureFile->'%(FileName)')">
-        <Original>%(Identity)</Original>
-      </_dupTypeFileName>
-      <_dupTypeFileName Include="@(FrameworkClosureFile->'%(FileName)')" Exclude="@(_dupTypeFileName)" Condition="'$(_fileSet)' == '%(FrameworkClosureFile.FileSet)'">
-        <Original>%(Identity)</Original>
-      </_dupTypeFileName>
-      <_dupTypeFileNamesFiltered Include="@(_dupTypeFileName)" Exclude="@(ExcludeFromDuplicateTypes)"/>
-      <_dupTypeFileFiltered Include="@(_dupTypeFileNamesFiltered->'%(Original)')"/>
-    </ItemGroup>
-
-    <Message Importance="High" Text="Verifying no duplicate types in $(Id) %(ClosureFile.FileSet) assemblies" />
-    <VerifyTypes Sources="@(_dupTypeFileFiltered)"
-                 IgnoredTypes="@(IgnoredDuplicateType)" />
-
-  </Target>
-
-  <Target Name="VerifyNETStandard"
-          DependsOnTargets="GetClosureFiles"
-          AfterTargets="ValidatePackage"
-          Inputs="%(ClosureFile.FileSet)"
-          Outputs="batching-on-FileSet-metadata">
-
-    <PropertyGroup>
-      <_fileSet>%(ClosureFile.FileSet)</_fileSet>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_NETStandardFile Include="$(NETStandardPackageRefPath)\*.dll" />
-
-      <!-- Suppress errors caused by removing S.CM.C shim from inbox -->
-      <SuppressNETStandardMissingFile Include="System.ComponentModel.Composition" />
-
-      <_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(ClosureFile->'%(FileName)')" />
-      <_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" />
-      <_NETStandardSuppressedMissingFile Include="@(_NETStandardMissingFile)" Exclude="@(_NETStandardMissingFileError)" />
-    </ItemGroup>
-
-    <Error Condition="'@(_NETStandardFile)' == ''"
-           Text="Could not locate NETStandard package content at '$(NETStandardPackageRefPath)'" />
-
-    <Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardLibraryPackage)' but missing from this package's $(_fileSet) files.  This error has been suppressed." />
-    <Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardLibraryPackage)' but missing from this package's $(_fileSet) files." />
-  </Target>
-
-  <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">
-    <ItemGroup>
-      <File>
-        <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
-        <IsSymbolFile Condition="'$(SymbolFileExtension)' != '' and'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile>
-      </File>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="SetValidateFramework">
-    <ItemGroup>
-      <!-- Update validation with locally authored RID list -->
-      <DefaultValidateFramework Remove="$(TargetFramework)"/>
-      <DefaultValidateFramework Include="$(TargetFramework)">
-        <RuntimeIDs>@(BuildRID)</RuntimeIDs>
-      </DefaultValidateFramework>
-    </ItemGroup>
-  </Target>
-</Project>