Remove pkgproj projects that can be easily replaced by .NET SDK pack support

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.

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>

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>

src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Directory.Build.props

@@ -0,0 +1,4 @@
+<Project>
+  <UsePkgProjTargets>false</UsePkgProjTargets>
+  <Import Project="..\Directory.Build.props" />
+</Project>

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>