From 25f98a92f1dd3f0c97aae5cb66bdf7fbb3b2856e Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Oct 2025 11:58:07 -0700
Subject: [PATCH 1/5] Remove pkgproj projects that can be easily replaced by
 .NET SDK pack support

---
 eng/Subsets.props                             |  2 ++
 ...Reflection.ReadyToRun.Experimental.pkgproj | 25 --------------
 .../Microsoft.ILVerification.pkgproj          | 24 --------------
 src/coreclr/.nuget/coreclr-packages.proj      |  6 ----
 .../dotnet-ilverify/DotnetToolSettings.xml    |  6 ----
 .../dotnet-ilverify/dotnet-ilverify.pkgproj   | 33 -------------------
 .../ILVerification/ILVerification.csproj      |  7 ++++
 src/coreclr/tools/ILVerify/ILVerify.csproj    |  5 +++
 .../ILCompiler.Reflection.ReadyToRun.csproj   |  4 +++
 9 files changed, 18 insertions(+), 94 deletions(-)
 delete mode 100644 src/coreclr/.nuget/ILCompiler.Reflection.ReadyToRun.Experimental/ILCompiler.Reflection.ReadyToRun.Experimental.pkgproj
 delete mode 100644 src/coreclr/.nuget/Microsoft.ILVerification/Microsoft.ILVerification.pkgproj
 delete mode 100644 src/coreclr/.nuget/dotnet-ilverify/DotnetToolSettings.xml
 delete mode 100644 src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 42cb024aacc661..627bbeb3e2966e 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -463,6 +463,8 @@
                              $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj;
                              $(CoreClrProjectRoot)tools\PdbChecker\PdbChecker.csproj;
                              $(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj;
+                             $(CoreClrProjectRoot)tools\ILVerify\ILVerify.csproj;
+                             $(CoreClrProjectRoot)tools\ILVerification\ILVerification.csproj;
                              $(ToolsProjectRoot)StressLogAnalyzer\src\StressLogAnalyzer.csproj" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/>
     <!--
       Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for.
diff --git a/src/coreclr/.nuget/ILCompiler.Reflection.ReadyToRun.Experimental/ILCompiler.Reflection.ReadyToRun.Experimental.pkgproj b/src/coreclr/.nuget/ILCompiler.Reflection.ReadyToRun.Experimental/ILCompiler.Reflection.ReadyToRun.Experimental.pkgproj
deleted file mode 100644
index 7d202885cc77c5..00000000000000
--- a/src/coreclr/.nuget/ILCompiler.Reflection.ReadyToRun.Experimental/ILCompiler.Reflection.ReadyToRun.Experimental.pkgproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup>
-    <IsShipping>false</IsShipping>
-    <PackageDescription>This package provides a low-level ReadyToRun file format decoder. This package is experimental.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\tools\aot\ILCompiler.Reflection.ReadyToRun\ILCompiler.Reflection.ReadyToRun.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageFile Include="$(RuntimeBinDir)ILCompiler.Reflection.ReadyToRun.dll">
-       <TargetPath>\lib\$(NetCoreAppMinimum)\</TargetPath>
-    </PackageFile>
-    <Dependency Include="System.Reflection.Metadata">
-       <Version>$(SystemReflectionMetadataVersion)</Version>
-       <TargetFramework>$(NetCoreAppMinimum)</TargetFramework>
-       <Exclude>Build,Analyzers</Exclude>
-    </Dependency>
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/coreclr/.nuget/Microsoft.ILVerification/Microsoft.ILVerification.pkgproj b/src/coreclr/.nuget/Microsoft.ILVerification/Microsoft.ILVerification.pkgproj
deleted file mode 100644
index ff6db5d6b424d6..00000000000000
--- a/src/coreclr/.nuget/Microsoft.ILVerification/Microsoft.ILVerification.pkgproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup>
-    <SkipValidatePackage>true</SkipValidatePackage>
-    <PackageDescription>IL verification library.</PackageDescription>
-    <PackageReleaseNotes>
-        9.0.0 - In the ILVerify.IResolver interface, the type of the first parameter of each method is now System.Reflection.Metadata.AssemblyNameInfo rather than System.Reflection.AssemblyName.
-        10.0.0 - The ILVerification package now targets .NET 10.0 and later.
-    </PackageReleaseNotes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\tools\ILVerification\ILVerification.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageFile Include="$(ArtifactsDir)bin\ILVerification\$(TargetArchitecture)\$(Configuration)\ILVerification.dll">
-       <TargetPath>lib\$(NetCoreAppToolCurrent)\ILVerification.dll</TargetPath>
-    </PackageFile>
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/coreclr/.nuget/coreclr-packages.proj b/src/coreclr/.nuget/coreclr-packages.proj
index a487f999ffd023..4bd9835e5bb6b1 100644
--- a/src/coreclr/.nuget/coreclr-packages.proj
+++ b/src/coreclr/.nuget/coreclr-packages.proj
@@ -1,12 +1,6 @@
 <Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Pack">
   <ItemGroup Condition="'$(TargetOS)' == 'windows' or '$(DotNetBuildSourceOnly)' == 'true'">
     <ProjectReference Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.pkgproj" />
-    <ProjectReference Include="Microsoft.ILVerification\Microsoft.ILVerification.pkgproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-    <ProjectReference Include="dotnet-ilverify\dotnet-ilverify.pkgproj" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(DotNetBuildSourceOnly)' != 'true'">
-    <ProjectReference Include="ILCompiler.Reflection.ReadyToRun.Experimental\ILCompiler.Reflection.ReadyToRun.Experimental.pkgproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' ">
diff --git a/src/coreclr/.nuget/dotnet-ilverify/DotnetToolSettings.xml b/src/coreclr/.nuget/dotnet-ilverify/DotnetToolSettings.xml
deleted file mode 100644
index d9989175ddd4b7..00000000000000
--- a/src/coreclr/.nuget/dotnet-ilverify/DotnetToolSettings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DotNetCliTool Version="1">
-  <Commands>
-    <Command Name="ilverify" EntryPoint="ILVerify.dll" Runner="dotnet" />
-  </Commands>
-</DotNetCliTool>
\ No newline at end of file
diff --git a/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj b/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj
deleted file mode 100644
index 5b808c62f8b86e..00000000000000
--- a/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup>
-    <SkipValidatePackage>true</SkipValidatePackage>
-    <PackageType>DotnetTool</PackageType>
-    <PackageDescription>ILVerify tool.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\tools\ILVerify\ILVerify.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageFile Include="DotnetToolSettings.xml">
-       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\DotnetToolSettings.xml</TargetPath>
-    </PackageFile>
-    <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\ILVerify.dll">
-       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\ILVerify.dll</TargetPath>
-    </PackageFile>
-    <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\System.CommandLine.dll">
-       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\System.CommandLine.dll</TargetPath>
-    </PackageFile>
-    <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\ILVerify.deps.json">
-       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\ILVerify.deps.json</TargetPath>
-    </PackageFile>
-    <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\ILVerify.runtimeconfig.json">
-       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\ILVerify.runtimeconfig.json</TargetPath>
-    </PackageFile>
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/coreclr/tools/ILVerification/ILVerification.csproj b/src/coreclr/tools/ILVerification/ILVerification.csproj
index 89687645741e3f..a00727e2482ea3 100644
--- a/src/coreclr/tools/ILVerification/ILVerification.csproj
+++ b/src/coreclr/tools/ILVerification/ILVerification.csproj
@@ -10,6 +10,13 @@
     <SignAssembly>true</SignAssembly>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <RunAnalyzers>false</RunAnalyzers>
+    <IsPackable>true</IsPackable>
+    <PackageId>Microsoft.ILVerification</PackageId>
+    <PackageDescription>IL verification library.</PackageDescription>
+    <PackageReleaseNotes>
+        9.0.0 - In the ILVerify.IResolver interface, the type of the first parameter of each method is now System.Reflection.Metadata.AssemblyNameInfo rather than System.Reflection.AssemblyName.
+        10.0.0 - The ILVerification package now targets .NET 10.0 and later.
+    </PackageReleaseNotes>
   </PropertyGroup>
 
   <Import Project="ILVerification.projitems" />
diff --git a/src/coreclr/tools/ILVerify/ILVerify.csproj b/src/coreclr/tools/ILVerify/ILVerify.csproj
index e1915c65d6f2dd..f86fc73e37fae4 100644
--- a/src/coreclr/tools/ILVerify/ILVerify.csproj
+++ b/src/coreclr/tools/ILVerify/ILVerify.csproj
@@ -8,6 +8,11 @@
     <RollForward>Major</RollForward>
     <DefineConstants>ILVERIFY;$(DefineConstants)</DefineConstants>
     <RunAnalyzers>false</RunAnalyzers>
+    <IsPackable>true</IsPackable>
+    <PackAsTool>true</PackAsTool>
+    <PackageDescription>ILVerify tool.</PackageDescription>
+    <PackageId>dotnet-ilverify</PackageId>
+    <ToolCommandName>ilverify</ToolCommandName>
   </PropertyGroup>
 
   <Import Project="..\ILVerification\ILVerification.projitems" />
diff --git a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
index 71981555136054..6274faad0c9b0c 100644
--- a/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
+++ b/src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
@@ -15,6 +15,10 @@
     <Platforms>AnyCPU;x64</Platforms>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RunAnalyzers>false</RunAnalyzers>
+    <IsPackable>true</IsPackable>
+    <IsShipping>false</IsShipping>
+    <PackageDescription>This package provides a low-level ReadyToRun file format decoder. This package is experimental.</PackageDescription>
+    <PackageId>ILCompiler.Reflection.ReadyToRun.Experimental</PackageId>
   </PropertyGroup>
 
   <ItemGroup>

From 27b1f94fa6f7a2519bc304bd96d5cfc1cf383f9c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Oct 2025 12:20:01 -0700
Subject: [PATCH 2/5] Move the IL sdk off of pkgproj

---
 src/coreclr/.nuget/Directory.Build.props      | 132 +----------------
 src/coreclr/.nuget/Directory.Build.targets    |  76 +---------
 .../Directory.Build.props                     |   4 +
 .../Directory.Build.targets                   |  78 ++++++++++
 .../Microsoft.NET.Sdk.IL.pkgproj              |  43 ------
 .../Microsoft.NET.Sdk.IL.proj                 |  41 ++++++
 src/coreclr/.nuget/coreclr-packages.proj      |   4 +-
 src/coreclr/.nuget/pkgproj.props              | 134 ++++++++++++++++++
 src/coreclr/.nuget/pkgproj.targets            |  78 ++++++++++
 9 files changed, 339 insertions(+), 251 deletions(-)
 create mode 100644 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props
 create mode 100644 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.targets
 delete mode 100644 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj
 create mode 100644 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj
 create mode 100644 src/coreclr/.nuget/pkgproj.props
 create mode 100644 src/coreclr/.nuget/pkgproj.targets

diff --git a/src/coreclr/.nuget/Directory.Build.props b/src/coreclr/.nuget/Directory.Build.props
index ddebcfbac6ea7b..c663be27601645 100644
--- a/src/coreclr/.nuget/Directory.Build.props
+++ b/src/coreclr/.nuget/Directory.Build.props
@@ -1,134 +1,4 @@
 <Project>
-  <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
   <Import Project="..\Directory.Build.props" />
-  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
-  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" />
-
-  <PropertyGroup>
-    <!-- Defined in Packaging.targets, but we need this before targets are imported -->
-    <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
-    <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
-    <MinOSForArch>win7</MinOSForArch>
-    <MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
-    <MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
-    <PackagePlatform>AnyCPU</PackagePlatform>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- build the transport package which includes product and symbols in addition to standard packages
-    This is a legacy setting as we tend to use symbol packages for symbol indexing and we don't use
-    transport packages to flow dependencies anymore -->
-    <CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">false</CreatePackedPackage>
-
-    <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">windows;osx;android;linux;freebsd;netbsd;illumos;solaris;haiku</SupportedPackageOSGroups>
-    <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups>
-
-    <_isSupportedOSGroup>true</_isSupportedOSGroup>
-  </PropertyGroup>
-
-  <!-- derive an OS Group based on the OS Family -->
-  <PropertyGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(TargetOS)' != ''">$(TargetOS)</_derivedPackageTargetOSGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">linux</_derivedPackageTargetOSGroup>
-
-    <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup>
-  </PropertyGroup>
-
-  <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for
-       an unsupported OS Group -->
-  <PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'">
-    <!-- Android will use Linux package definitions -->
-    <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup)</_packageTargetOSGroup>
-    <_packageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == 'android'">linux</_packageTargetOSGroup>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    <OutputPath>$(PackageOutputPath)</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(IsLineupPackage)' == 'true'">
-    <SkipValidatePackage>true</SkipValidatePackage>
-    <IncludeRuntimeJson>true</IncludeRuntimeJson>
-  </PropertyGroup>
-
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';linux;'))">
-    <OfficialBuildRID Include="linux-x64" />
-    <OfficialBuildRID Include="linux-musl-x64" />
-    <OfficialBuildRID Include="rhel.6-x64" />
-    <OfficialBuildRID Include="linux-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-musl-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="tizen.4.0.0-armel">
-      <Platform>armel</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="tizen.5.0.0-armel">
-      <Platform>armel</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';osx;'))">
-    <OfficialBuildRID Include="osx-x64" />
-    <OfficialBuildRID Include="osx-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';freebsd;'))">
-    <OfficialBuildRID Include="freebsd-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';netbsd;'))">
-    <OfficialBuildRID Include="netbsd-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';illumos;'))">
-    <OfficialBuildRID Include="illumos-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';solaris;'))">
-    <OfficialBuildRID Include="solaris-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';haiku;'))">
-    <OfficialBuildRID Include="haiku-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';windows;'))">
-    <OfficialBuildRID Include="win-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-x64" />
-    <OfficialBuildRID Include="win-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup>
-    <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but
-         don't build the RID-specific package if we're in an unsupported os family -->
-    <BuildRID Include="@(OfficialBuildRID)" Exclude="$(TargetRid)"/>
-    <BuildRID Include="$(TargetRid)"
-              Condition="'$(_isSupportedOSGroup)' == 'true'">
-      <Platform Condition="'$(TargetArchitecture)' == 'x64'">amd64</Platform>
-      <Platform Condition="'$(TargetArchitecture)' != 'x64'">$(TargetArchitecture)</Platform>
-    </BuildRID>
-  </ItemGroup>
-
-  <ItemGroup>
-    <_project Include="@(BuildRID)">
-      <Platform Condition="'%(Platform)' == ''">amd64</Platform>
-      <PackageTargetRuntime>%(Identity)</PackageTargetRuntime>
-      <AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties>
-    </_project>
-
-    <_buildRidProjects Include="@(_project->'$(MSBuildProjectName).pkgproj')" />
-    <!-- Only include rid projects for a builds file, not for a lineup package -->
-    <Project Condition="'$(IsLineupPackage)' != 'true'" Include="@(_buildRidProjects)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IsLineupPackage)' == 'true'">
-    <!-- Include project references for a lineup package to generate the runtime.json file -->
-    <ProjectReference Include="@(_buildRidProjects)" />
-  </ItemGroup>
+  <Import Project="pkgproj.props" Condition="'$(UsePkgProjTargets)' != 'false'" />
 </Project>
diff --git a/src/coreclr/.nuget/Directory.Build.targets b/src/coreclr/.nuget/Directory.Build.targets
index 520110c8064d67..7d8dc74db872d6 100644
--- a/src/coreclr/.nuget/Directory.Build.targets
+++ b/src/coreclr/.nuget/Directory.Build.targets
@@ -1,78 +1,4 @@
 <Project>
   <Import Project="..\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <StableVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</StableVersion>
-    <StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
-
-    <!-- SharedFramework runtime version. This package is non shipping but we need to know the shared framework version
-         to populate some metadata used later. This cannot be done in a target, since we need this info for PackageDownload. -->
-    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == ''">$(Version)</NetCoreRuntimeVersion>
-    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</NetCoreRuntimeVersion>
-    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == 'prerelease'">$(VersionPrefix)-$(_PreReleaseLabel).final</NetCoreRuntimeVersion>
-  </PropertyGroup>
-
-  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
-
-  <!--
-    Finds symbol files and injects them into the package build.
-  -->
-  <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">
-    <ItemGroup Condition="'$(SymbolsSuffix)' != ''">
-      <AdditionalLibPackageExcludes Include="%2A%2A\%2A$(SymbolsSuffix)"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <NativeWithSymbolFile Include="@(NativeBinary)" Condition="'$(PackageTargetRuntime)'!=''">
-        <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-      </NativeWithSymbolFile>
-      <NativeWithSymbolFile Include="@(ArchitectureSpecificToolFile)">
-        <TargetPath>tools</TargetPath>
-      </NativeWithSymbolFile>
-    </ItemGroup>
-
-    <ItemGroup>
-      <File Include="@(NativeWithSymbolFile)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- On Windows, trim ".dll" before adding ".pdb". -->
-      <WindowsNativeFile Include="@(NativeWithSymbolFile)"
-                         Condition="'%(NativeWithSymbolFile.Extension)'=='.dll' OR '%(NativeWithSymbolFile.Extension)'=='.exe'" />
-      <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).pdb')" />
-      <!-- Crossgened files (on windows) have both a *.pdb and a *.ni.pdb symbol file.  Include the *.ni.pdb file as well if it exists. -->
-      <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).ni.pdb')" />
-
-      <!--
-        Search for all xplat symbol file extensions on every xplat native binary. Some binaries have
-        no ".so" or ".dylib" extension, so we can't tell which convention its symbol files would
-        use. On xplat, the symbol extension is simply appended.
-      -->
-      <NonWindowsNativeFile Include="@(NativeWithSymbolFile)"
-                            Exclude="@(WindowsNativeFile)" />
-
-      <NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')" />
-
-      <ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" />
-      <ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" />
-
-      <!-- Include all found symbols. -->
-      <File Include="@(ExistingWindowsSymbolFile);@(ExistingNonWindowsSymbolFile)">
-        <IsSymbolFile>true</IsSymbolFile>
-      </File>
-    </ItemGroup>
-
-    <PropertyGroup>
-      <NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)'!='' AND '@(ExistingWindowsSymbolFile)'==''">true</NeedsPlaceholderPdb>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <File Include="$(MSBuildThisFileDirectory)\_.pdb"
-            Condition="'$(NeedsPlaceholderPdb)'=='true' AND '$(PackageTargetRuntime)'!=''">
-        <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
-        <IsSymbolFile>true</IsSymbolFile>
-      </File>
-    </ItemGroup>
-  </Target>
-
+  <Import Project="pkgproj.targets" Condition="'$(UsePkgProjTargets)' != 'false'" />
 </Project>
diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props
new file mode 100644
index 00000000000000..f5139a1d63ddcf
--- /dev/null
+++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props
@@ -0,0 +1,4 @@
+<Project>
+  <UsePkgProjTargets>false</UsePkgProjTargets>
+  <Import Project="..\Directory.Build.props" />
+</Project>
diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.targets b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.targets
new file mode 100644
index 00000000000000..520110c8064d67
--- /dev/null
+++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.targets
@@ -0,0 +1,78 @@
+<Project>
+  <Import Project="..\Directory.Build.targets" />
+
+  <PropertyGroup>
+    <StableVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</StableVersion>
+    <StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
+
+    <!-- SharedFramework runtime version. This package is non shipping but we need to know the shared framework version
+         to populate some metadata used later. This cannot be done in a target, since we need this info for PackageDownload. -->
+    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == ''">$(Version)</NetCoreRuntimeVersion>
+    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</NetCoreRuntimeVersion>
+    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == 'prerelease'">$(VersionPrefix)-$(_PreReleaseLabel).final</NetCoreRuntimeVersion>
+  </PropertyGroup>
+
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
+
+  <!--
+    Finds symbol files and injects them into the package build.
+  -->
+  <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">
+    <ItemGroup Condition="'$(SymbolsSuffix)' != ''">
+      <AdditionalLibPackageExcludes Include="%2A%2A\%2A$(SymbolsSuffix)"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <NativeWithSymbolFile Include="@(NativeBinary)" Condition="'$(PackageTargetRuntime)'!=''">
+        <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      </NativeWithSymbolFile>
+      <NativeWithSymbolFile Include="@(ArchitectureSpecificToolFile)">
+        <TargetPath>tools</TargetPath>
+      </NativeWithSymbolFile>
+    </ItemGroup>
+
+    <ItemGroup>
+      <File Include="@(NativeWithSymbolFile)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <!-- On Windows, trim ".dll" before adding ".pdb". -->
+      <WindowsNativeFile Include="@(NativeWithSymbolFile)"
+                         Condition="'%(NativeWithSymbolFile.Extension)'=='.dll' OR '%(NativeWithSymbolFile.Extension)'=='.exe'" />
+      <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).pdb')" />
+      <!-- Crossgened files (on windows) have both a *.pdb and a *.ni.pdb symbol file.  Include the *.ni.pdb file as well if it exists. -->
+      <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).ni.pdb')" />
+
+      <!--
+        Search for all xplat symbol file extensions on every xplat native binary. Some binaries have
+        no ".so" or ".dylib" extension, so we can't tell which convention its symbol files would
+        use. On xplat, the symbol extension is simply appended.
+      -->
+      <NonWindowsNativeFile Include="@(NativeWithSymbolFile)"
+                            Exclude="@(WindowsNativeFile)" />
+
+      <NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')" />
+
+      <ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" />
+      <ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" />
+
+      <!-- Include all found symbols. -->
+      <File Include="@(ExistingWindowsSymbolFile);@(ExistingNonWindowsSymbolFile)">
+        <IsSymbolFile>true</IsSymbolFile>
+      </File>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)'!='' AND '@(ExistingWindowsSymbolFile)'==''">true</NeedsPlaceholderPdb>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <File Include="$(MSBuildThisFileDirectory)\_.pdb"
+            Condition="'$(NeedsPlaceholderPdb)'=='true' AND '$(PackageTargetRuntime)'!=''">
+        <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+        <IsSymbolFile>true</IsSymbolFile>
+      </File>
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj
deleted file mode 100644
index be90c1c8c370c3..00000000000000
--- a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <PropertyGroup>
-    <PackageType>MSBuildSdk</PackageType>
-    <PackageDescription>Provides support for building IL projects.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <File Include="sdk/**/*">
-      <TargetPath>sdk</TargetPath>
-    </File>
-    <File Include="targets/**/*">
-      <TargetPath>targets</TargetPath>
-    </File>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <ILTargetsTemplateFile>Microsoft.NET.Sdk.IL.targets.template</ILTargetsTemplateFile>
-    <ILTargetsOutputFile>$(IntermediateOutputPath)Microsoft.NET.Sdk.IL.targets</ILTargetsOutputFile>
-  </PropertyGroup>
-
-  <Target Name="ReplaceTemplateParametersInILTargetsTemplate"
-          Inputs="$(ILTargetsTemplateFile)"
-          Outputs="$(ILTargetsOutputFile)"
-          BeforeTargets="GetPackageFiles"
-          DependsOnTargets="CalculatePackageVersion">
-
-    <GenerateFileFromTemplate TemplateFile="$(ILTargetsTemplateFile)"
-                              OutputPath="$(ILTargetsOutputFile)"
-                              Properties="IlAsmVersion=$(PackageVersion)">
-      <Output TaskParameter="ResolvedOutputPath" ItemName="FileWrites" />
-    </GenerateFileFromTemplate>
-
-    <ItemGroup>
-      <File Include="$(ILTargetsOutputFile)">
-        <TargetPath>targets</TargetPath>
-      </File>
-    </ItemGroup>
-  </Target>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj
new file mode 100644
index 00000000000000..a79df0e1131e85
--- /dev/null
+++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <PackageType>DotNetSdk</PackageType>
+    <IsPackable>true</IsPackable>
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <PackageDescription>Provides support for building IL projects.</PackageDescription>
+    <BeforePack>$(BeforePack);ReplaceTemplateParametersInILTargetsTemplate</BeforePack>
+    <NoWarn>$(NoWarn);NU5128;NU5131</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="sdk/**/*" Pack="true" PackagePath="sdk/" />
+    <None Include="targets/**/*" Pack="true" PackagePath="targets/" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <ILTargetsTemplateFile>Microsoft.NET.Sdk.IL.targets.template</ILTargetsTemplateFile>
+    <ILTargetsOutputFile>$(IntermediateOutputPath)Microsoft.NET.Sdk.IL.targets</ILTargetsOutputFile>
+  </PropertyGroup>
+
+  <Target Name="ReplaceTemplateParametersInILTargetsTemplate"
+          Inputs="$(MSBuildThisFileFullPath);$(ILTargetsTemplateFile)"
+          Outputs="$(ILTargetsOutputFile)">
+
+    <GenerateFileFromTemplate TemplateFile="$(ILTargetsTemplateFile)"
+                              OutputPath="$(ILTargetsOutputFile)"
+                              Properties="IlAsmVersion=$(Version)">
+      <Output TaskParameter="ResolvedOutputPath" ItemName="FileWrites" />
+    </GenerateFileFromTemplate>
+
+    <ItemGroup>
+      <None Include="$(ILTargetsOutputFile)" Pack="true" PackagePath="targets/" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/coreclr/.nuget/coreclr-packages.proj b/src/coreclr/.nuget/coreclr-packages.proj
index 4bd9835e5bb6b1..609e6884946c88 100644
--- a/src/coreclr/.nuget/coreclr-packages.proj
+++ b/src/coreclr/.nuget/coreclr-packages.proj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Pack">
-  <ItemGroup Condition="'$(TargetOS)' == 'windows' or '$(DotNetBuildSourceOnly)' == 'true'">
-    <ProjectReference Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.pkgproj" />
+  <ItemGroup>
+    <ProjectReference Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.proj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' ">
diff --git a/src/coreclr/.nuget/pkgproj.props b/src/coreclr/.nuget/pkgproj.props
new file mode 100644
index 00000000000000..ddebcfbac6ea7b
--- /dev/null
+++ b/src/coreclr/.nuget/pkgproj.props
@@ -0,0 +1,134 @@
+<Project>
+  <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
+  <Import Project="..\Directory.Build.props" />
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" />
+
+  <PropertyGroup>
+    <!-- Defined in Packaging.targets, but we need this before targets are imported -->
+    <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
+    <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
+    <MinOSForArch>win7</MinOSForArch>
+    <MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch>
+    <MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch>
+    <PackagePlatform>AnyCPU</PackagePlatform>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- build the transport package which includes product and symbols in addition to standard packages
+    This is a legacy setting as we tend to use symbol packages for symbol indexing and we don't use
+    transport packages to flow dependencies anymore -->
+    <CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">false</CreatePackedPackage>
+
+    <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">windows;osx;android;linux;freebsd;netbsd;illumos;solaris;haiku</SupportedPackageOSGroups>
+    <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups>
+
+    <_isSupportedOSGroup>true</_isSupportedOSGroup>
+  </PropertyGroup>
+
+  <!-- derive an OS Group based on the OS Family -->
+  <PropertyGroup>
+    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(TargetOS)' != ''">$(TargetOS)</_derivedPackageTargetOSGroup>
+    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">linux</_derivedPackageTargetOSGroup>
+
+    <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup>
+  </PropertyGroup>
+
+  <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for
+       an unsupported OS Group -->
+  <PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'">
+    <!-- Android will use Linux package definitions -->
+    <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup)</_packageTargetOSGroup>
+    <_packageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == 'android'">linux</_packageTargetOSGroup>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SkipPackageFileCheck>true</SkipPackageFileCheck>
+    <OutputPath>$(PackageOutputPath)</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsLineupPackage)' == 'true'">
+    <SkipValidatePackage>true</SkipValidatePackage>
+    <IncludeRuntimeJson>true</IncludeRuntimeJson>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';linux;'))">
+    <OfficialBuildRID Include="linux-x64" />
+    <OfficialBuildRID Include="linux-musl-x64" />
+    <OfficialBuildRID Include="rhel.6-x64" />
+    <OfficialBuildRID Include="linux-arm">
+      <Platform>arm</Platform>
+    </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-musl-arm">
+      <Platform>arm</Platform>
+    </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-arm64">
+      <Platform>arm64</Platform>
+    </OfficialBuildRID>
+    <OfficialBuildRID Include="linux-musl-arm64">
+      <Platform>arm64</Platform>
+    </OfficialBuildRID>
+    <OfficialBuildRID Include="tizen.4.0.0-armel">
+      <Platform>armel</Platform>
+    </OfficialBuildRID>
+    <OfficialBuildRID Include="tizen.5.0.0-armel">
+      <Platform>armel</Platform>
+    </OfficialBuildRID>
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';osx;'))">
+    <OfficialBuildRID Include="osx-x64" />
+    <OfficialBuildRID Include="osx-arm64">
+      <Platform>arm64</Platform>
+    </OfficialBuildRID>
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';freebsd;'))">
+    <OfficialBuildRID Include="freebsd-x64" />
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';netbsd;'))">
+    <OfficialBuildRID Include="netbsd-x64" />
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';illumos;'))">
+    <OfficialBuildRID Include="illumos-x64" />
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';solaris;'))">
+    <OfficialBuildRID Include="solaris-x64" />
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';haiku;'))">
+    <OfficialBuildRID Include="haiku-x64" />
+  </ItemGroup>
+  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';windows;'))">
+    <OfficialBuildRID Include="win-x86">
+      <Platform>x86</Platform>
+    </OfficialBuildRID>
+    <OfficialBuildRID Include="win-x64" />
+    <OfficialBuildRID Include="win-arm64">
+      <Platform>arm64</Platform>
+    </OfficialBuildRID>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but
+         don't build the RID-specific package if we're in an unsupported os family -->
+    <BuildRID Include="@(OfficialBuildRID)" Exclude="$(TargetRid)"/>
+    <BuildRID Include="$(TargetRid)"
+              Condition="'$(_isSupportedOSGroup)' == 'true'">
+      <Platform Condition="'$(TargetArchitecture)' == 'x64'">amd64</Platform>
+      <Platform Condition="'$(TargetArchitecture)' != 'x64'">$(TargetArchitecture)</Platform>
+    </BuildRID>
+  </ItemGroup>
+
+  <ItemGroup>
+    <_project Include="@(BuildRID)">
+      <Platform Condition="'%(Platform)' == ''">amd64</Platform>
+      <PackageTargetRuntime>%(Identity)</PackageTargetRuntime>
+      <AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties>
+    </_project>
+
+    <_buildRidProjects Include="@(_project->'$(MSBuildProjectName).pkgproj')" />
+    <!-- Only include rid projects for a builds file, not for a lineup package -->
+    <Project Condition="'$(IsLineupPackage)' != 'true'" Include="@(_buildRidProjects)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsLineupPackage)' == 'true'">
+    <!-- Include project references for a lineup package to generate the runtime.json file -->
+    <ProjectReference Include="@(_buildRidProjects)" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/.nuget/pkgproj.targets b/src/coreclr/.nuget/pkgproj.targets
new file mode 100644
index 00000000000000..520110c8064d67
--- /dev/null
+++ b/src/coreclr/.nuget/pkgproj.targets
@@ -0,0 +1,78 @@
+<Project>
+  <Import Project="..\Directory.Build.targets" />
+
+  <PropertyGroup>
+    <StableVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</StableVersion>
+    <StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
+
+    <!-- SharedFramework runtime version. This package is non shipping but we need to know the shared framework version
+         to populate some metadata used later. This cannot be done in a target, since we need this info for PackageDownload. -->
+    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == ''">$(Version)</NetCoreRuntimeVersion>
+    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</NetCoreRuntimeVersion>
+    <NetCoreRuntimeVersion Condition="'$(DotNetFinalVersionKind)' == 'prerelease'">$(VersionPrefix)-$(_PreReleaseLabel).final</NetCoreRuntimeVersion>
+  </PropertyGroup>
+
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
+
+  <!--
+    Finds symbol files and injects them into the package build.
+  -->
+  <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">
+    <ItemGroup Condition="'$(SymbolsSuffix)' != ''">
+      <AdditionalLibPackageExcludes Include="%2A%2A\%2A$(SymbolsSuffix)"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <NativeWithSymbolFile Include="@(NativeBinary)" Condition="'$(PackageTargetRuntime)'!=''">
+        <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+      </NativeWithSymbolFile>
+      <NativeWithSymbolFile Include="@(ArchitectureSpecificToolFile)">
+        <TargetPath>tools</TargetPath>
+      </NativeWithSymbolFile>
+    </ItemGroup>
+
+    <ItemGroup>
+      <File Include="@(NativeWithSymbolFile)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <!-- On Windows, trim ".dll" before adding ".pdb". -->
+      <WindowsNativeFile Include="@(NativeWithSymbolFile)"
+                         Condition="'%(NativeWithSymbolFile.Extension)'=='.dll' OR '%(NativeWithSymbolFile.Extension)'=='.exe'" />
+      <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).pdb')" />
+      <!-- Crossgened files (on windows) have both a *.pdb and a *.ni.pdb symbol file.  Include the *.ni.pdb file as well if it exists. -->
+      <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).ni.pdb')" />
+
+      <!--
+        Search for all xplat symbol file extensions on every xplat native binary. Some binaries have
+        no ".so" or ".dylib" extension, so we can't tell which convention its symbol files would
+        use. On xplat, the symbol extension is simply appended.
+      -->
+      <NonWindowsNativeFile Include="@(NativeWithSymbolFile)"
+                            Exclude="@(WindowsNativeFile)" />
+
+      <NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')" />
+
+      <ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" />
+      <ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" />
+
+      <!-- Include all found symbols. -->
+      <File Include="@(ExistingWindowsSymbolFile);@(ExistingNonWindowsSymbolFile)">
+        <IsSymbolFile>true</IsSymbolFile>
+      </File>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)'!='' AND '@(ExistingWindowsSymbolFile)'==''">true</NeedsPlaceholderPdb>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <File Include="$(MSBuildThisFileDirectory)\_.pdb"
+            Condition="'$(NeedsPlaceholderPdb)'=='true' AND '$(PackageTargetRuntime)'!=''">
+        <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
+        <IsSymbolFile>true</IsSymbolFile>
+      </File>
+    </ItemGroup>
+  </Target>
+
+</Project>

From 4da53c9a2c1d6a9f8d883809ce12066a96d3e14b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Oct 2025 12:34:41 -0700
Subject: [PATCH 3/5] Remove double import

---
 src/coreclr/.nuget/pkgproj.props   | 2 --
 src/coreclr/.nuget/pkgproj.targets | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/coreclr/.nuget/pkgproj.props b/src/coreclr/.nuget/pkgproj.props
index ddebcfbac6ea7b..e16e1ddbabe56c 100644
--- a/src/coreclr/.nuget/pkgproj.props
+++ b/src/coreclr/.nuget/pkgproj.props
@@ -1,6 +1,4 @@
 <Project>
-  <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
-  <Import Project="..\Directory.Build.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" />
 
diff --git a/src/coreclr/.nuget/pkgproj.targets b/src/coreclr/.nuget/pkgproj.targets
index 520110c8064d67..bd88c7268ec2d0 100644
--- a/src/coreclr/.nuget/pkgproj.targets
+++ b/src/coreclr/.nuget/pkgproj.targets
@@ -1,6 +1,4 @@
 <Project>
-  <Import Project="..\Directory.Build.targets" />
-
   <PropertyGroup>
     <StableVersion Condition="'$(DotNetFinalVersionKind)' == 'release'">$(ProductVersion)</StableVersion>
     <StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>

From a23a186932096935ade96c751917f8e9f9585efa Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Oct 2025 14:13:09 -0700
Subject: [PATCH 4/5] Cleanup from typos

---
 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props | 4 +++-
 .../.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj     | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props
index f5139a1d63ddcf..d6194b76463998 100644
--- a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props
+++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props
@@ -1,4 +1,6 @@
 <Project>
-  <UsePkgProjTargets>false</UsePkgProjTargets>
+  <PropertyGroup>
+    <UsePkgProjTargets>false</UsePkgProjTargets>
+  </PropertyGroup>
   <Import Project="..\Directory.Build.props" />
 </Project>
diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj
index a79df0e1131e85..0d739b4df02dba 100644
--- a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj
+++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.proj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.Build.NoTargets">
-
   <PropertyGroup>
-    <PackageType>DotNetSdk</PackageType>
     <IsPackable>true</IsPackable>
     <EnablePackageValidation>false</EnablePackageValidation>
     <PackageDescription>Provides support for building IL projects.</PackageDescription>

From 787dded65afcc6dfc221e8d628b05768a811d995 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 17 Oct 2025 14:23:53 -0700
Subject: [PATCH 5/5] Add a readme file for the IL SDK package

---
 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/PACKAGE.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/coreclr/.nuget/Microsoft.NET.Sdk.IL/PACKAGE.md

diff --git a/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/PACKAGE.md b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/PACKAGE.md
new file mode 100644
index 00000000000000..684cd9a4c53762
--- /dev/null
+++ b/src/coreclr/.nuget/Microsoft.NET.Sdk.IL/PACKAGE.md
@@ -0,0 +1,3 @@
+## About
+
+Provides targets to enable building .NET assemblies from .NET IL source files.