From 6ca5d511a15ff411fef52ffaf2cd9908bc66551e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Wed, 8 Apr 2020 02:03:39 +0200
Subject: [PATCH] Remove .pkgproj from Mono (#34643)

They are no longer needed since we have normal runtime packs now.
---
 eng/Subsets.props                                  |   7 +-
 src/mono/netcore/nuget/Directory.Build.props       | 210 ---------------------
 src/mono/netcore/nuget/Directory.Build.targets     |  71 -------
 .../Directory.Build.props                          |  10 -
 .../Microsoft.NETCore.Runtime.Mono.pkgproj         |   8 -
 .../Microsoft.NETCore.Runtime.Mono.proj            |   9 -
 ...me.Android.Microsoft.NETCore.Runtime.Mono.props |  12 --
 ...time.Linux.Microsoft.NETCore.Runtime.Mono.props |   7 -
 ...untime.OSX.Microsoft.NETCore.Runtime.Mono.props |   7 -
 ...Windows_NT.Microsoft.NETCore.Runtime.Mono.props |   7 -
 ...untime.iOS.Microsoft.NETCore.Runtime.Mono.props |  12 --
 .../Directory.Build.props                          |  10 -
 .../Microsoft.NETCore.Tool.MonoAOT.pkgproj         |   8 -
 .../Microsoft.NETCore.Tool.MonoAOT.proj            |   9 -
 ...me.Android.Microsoft.NETCore.Tool.MonoAOT.props |  11 --
 ...untime.iOS.Microsoft.NETCore.Tool.MonoAOT.props |   9 -
 src/mono/netcore/nuget/builds.targets              |  31 ---
 src/mono/netcore/nuget/descriptions.json           |  22 ---
 src/mono/netcore/nuget/mono-packages.proj          |  43 -----
 src/mono/netcore/nuget/packageIndex.json           |   2 -
 src/mono/netcore/nuget/packaging.props             |  39 ----
 21 files changed, 1 insertion(+), 543 deletions(-)
 delete mode 100644 src/mono/netcore/nuget/Directory.Build.props
 delete mode 100644 src/mono/netcore/nuget/Directory.Build.targets
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Directory.Build.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.pkgproj
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.proj
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Android.Microsoft.NETCore.Runtime.Mono.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Linux.Microsoft.NETCore.Runtime.Mono.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.OSX.Microsoft.NETCore.Runtime.Mono.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Windows_NT.Microsoft.NETCore.Runtime.Mono.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.iOS.Microsoft.NETCore.Runtime.Mono.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Directory.Build.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.pkgproj
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.proj
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.Android.Microsoft.NETCore.Tool.MonoAOT.props
 delete mode 100644 src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.iOS.Microsoft.NETCore.Tool.MonoAOT.props
 delete mode 100644 src/mono/netcore/nuget/builds.targets
 delete mode 100644 src/mono/netcore/nuget/descriptions.json
 delete mode 100644 src/mono/netcore/nuget/mono-packages.proj
 delete mode 100644 src/mono/netcore/nuget/packageIndex.json
 delete mode 100644 src/mono/netcore/nuget/packaging.props

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 1a3afb8..298555f 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -56,7 +56,7 @@
     <DefaultCoreClrSubsets>runtime-linuxdac-corelib-nativecorelib-tools-packages</DefaultCoreClrSubsets>
 
     <DefaultMonoSubsets Condition="'$(MonoEnableLLVM)' == 'true' and '$(MonoLLVMDir)' == ''">llvm-</DefaultMonoSubsets>
-    <DefaultMonoSubsets>$(DefaultMonoSubsets)runtime-corelib-packages</DefaultMonoSubsets>
+    <DefaultMonoSubsets>$(DefaultMonoSubsets)runtime-corelib</DefaultMonoSubsets>
 
     <DefaultLibrariesSubsets>depprojs-native-ref-src-pretest-packages</DefaultLibrariesSubsets>
     <DefaultLibrariesSubsets Condition="'$(IncludeLibrariesTestSubset)' == 'true'">$(DefaultLibrariesSubsets)-libtests</DefaultLibrariesSubsets>
@@ -106,7 +106,6 @@
     <!-- Mono -->
     <SubsetName Include="Runtime" Category="Mono" Description="The Mono .NET runtime." />
     <SubsetName Include="CoreLib" Category="Mono" Description="The managed System.Private.CoreLib library for Mono." />
-    <SubsetName Include="Packages" Category="Mono" Description="The projects that produce NuGet packages for the Mono runtime." />
 
     <!-- Installer -->
     <SubsetName Include="All" Category="Installer" Description="The .NET Core hosts, hosting libraries, bundles, and installers. Includes these projects' tests." />
@@ -196,10 +195,6 @@
     <MonoProject Include="$(MonoProjectRoot)netcore\System.Private.CoreLib\System.Private.CoreLib.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="$(_subsetCategory.Contains('mono')) and $(_subset.Contains('-packages-'))">
-    <MonoProject Include="$(MonoProjectRoot)netcore\nuget\mono-packages.proj" Pack="True" />
-  </ItemGroup>
-
   <!-- Libraries sets -->
   <ItemGroup Condition="$(_subsetCategory.Contains('libraries')) and $(_subset.Contains('-depprojs-'))">
     <LibrariesRestoreProject Include="$(LibrariesProjectRoot)restore\depproj.proj">
diff --git a/src/mono/netcore/nuget/Directory.Build.props b/src/mono/netcore/nuget/Directory.Build.props
deleted file mode 100644
index 2f03d33..0000000
--- a/src/mono/netcore/nuget/Directory.Build.props
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-
-  <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props -->
-  <Import Project="../../Directory.Build.props" />
-  <Import Project="packaging.props" />
-
-  <PropertyGroup>
-    <!-- defined in Packaging.targets, but we need this before targets are imported -->
-    <PackagePlatform>AnyCPU</PackagePlatform>
-
-    <!-- build the transport package which includes product and symbols in addition to standard packages -->
-    <CreatePackedPackage Condition="'$(CreatePackedPackage)' == ''">true</CreatePackedPackage>
-
-    <!-- Distro rid is passed as runtimeos-arch-->
-    <_parseDistroRid>$(__DistroRid)</_parseDistroRid>
-    <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetsOSX)' == 'true'">osx.10.12-x64</_parseDistroRid>
-    <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetsWindows)' == 'true'">win-x64</_parseDistroRid>
-    <_distroRidIndex>$(_parseDistroRid.IndexOfAny("-"))</_distroRidIndex>
-    <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1))</_archRidIndex>
-    <OSRid Condition="'$(OSRid)' == '' and '$(_distroRidIndex)' != '-1'">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))</OSRid>
-    <OSRid Condition="'$(OSRid)' == ''">$(MonoTargetOS)</OSRid>
-
-    <RuntimeOS Condition="'$(RuntimeOS)' == ''">$(OSRid)</RuntimeOS>
-
-    <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;iOS;Android;Linux;FreeBSD</SupportedPackageOSGroups>
-    <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups>
-
-    <!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or
-         portable (e.g. osx).
-    -->
-    <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
-    <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
-    <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' == '-1'">$(RuntimeOS)</_runtimeOSFamily>
-    <PackageTargetRuntime>$(_runtimeOSFamily)</PackageTargetRuntime>
-    <_isSupportedOSGroup>true</_isSupportedOSGroup>
-  </PropertyGroup>
-
-  <!-- derive an OS Group based on the OS Family -->
-  <PropertyGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'osx'">OSX</_derivedPackageTargetOSGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'ios'">iOS</_derivedPackageTargetOSGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'android'">Android</_derivedPackageTargetOSGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'win'">Windows_NT</_derivedPackageTargetOSGroup>
-    <_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'">
-    <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup)</_packageTargetOSGroup>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    <OutputPath>$(PackageOutputPath)</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(IsLineupPackage)' == 'true'">
-    <SkipValidatePackage>true</SkipValidatePackage>
-    <IncludeRuntimeJson>true</IncludeRuntimeJson>
-  </PropertyGroup>
-
-  <Choose>
-    <When Condition="'$(PackageRID)' != ''" />
-    <When Condition="'$(OutputRID)' != ''">
-      <PropertyGroup>
-        <!-- If OutputRID is explicitly set use that as the PackageRID -->
-        <PackageRID>$(OutputRID)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(_runtimeOSFamily)' == 'win'">
-      <PropertyGroup>
-        <!-- Note: Windows builds are always portable (-PortableBuild=false is ignored) -->
-        <PackageRID>win-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(_runtimeOSFamily)' == 'osx'">
-      <PropertyGroup>
-        <PackageRID>osx.10.12-$(TargetArchitecture)</PackageRID>
-        <!-- Set the platform part of the RID if we are doing a portable build -->
-        <PackageRID Condition="'$(PortableBuild)' == 'true'">osx-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(_runtimeOSFamily)' == 'ios'">
-      <PropertyGroup>
-        <PackageRID>ios.$(iOSVersionMin.TrimEnd('.0'))-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(_runtimeOSFamily)' == 'freebsd'">
-      <PropertyGroup>
-        <PackageRID>freebsd.11-$(TargetArchitecture)</PackageRID>
-        <!-- Set the platform part of the RID if we are doing a portable build -->
-        <PackageRID Condition="'$(PortableBuild)' == 'true'">freebsd-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(_runtimeOSFamily)' == 'android'">
-      <PropertyGroup>
-        <PackageRID>android.21-$(TargetArchitecture)</PackageRID>
-        <!-- Set the platform part of the RID if we are doing a portable build -->
-        <PackageRID Condition="'$(PortableBuild)' == '1'">android-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(_runtimeOSFamily)' == 'rhel'">
-      <PropertyGroup>
-        <PackageRID>$(OSRid)-$(TargetArchitecture)</PackageRID>
-        <!-- Set the platform part of the RID if we are doing a portable build -->
-        <PackageRID Condition="'$(PortableBuild)' == 'true'">linux-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <PackageRID>$(RuntimeOS)-$(TargetArchitecture)</PackageRID>
-        <!-- Set the platform part of the RID if we are doing a portable build -->
-        <PackageRID Condition="'$(PortableBuild)' == 'true'">linux-$(TargetArchitecture)</PackageRID>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <Import Project="$(RepoRoot)eng\native\naming.props" />
-
-  <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-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" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';iOS;'))">
-    <OfficialBuildRID Include="ios-x64" />
-    <OfficialBuildRID Include="ios-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="ios-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Android;'))">
-    <OfficialBuildRID Include="android-x64" />
-    <OfficialBuildRID Include="android-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="android-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="android-arm64">
-      <Platform>arm64</Platform>
-    </OfficialBuildRID>
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';FreeBSD;'))">
-    <OfficialBuildRID Include="freebsd-x64" />
-  </ItemGroup>
-  <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Windows_NT;'))">
-    <OfficialBuildRID Include="win-x86">
-      <Platform>x86</Platform>
-    </OfficialBuildRID>
-    <OfficialBuildRID Include="win-x64" />
-    <OfficialBuildRID Include="win-arm">
-      <Platform>arm</Platform>
-    </OfficialBuildRID>
-    <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="$(PackageRID)"/>
-    <BuildRID Include="$(PackageRID)"
-              Condition="'$(_isSupportedOSGroup)' == 'true'">
-      <Platform Condition="'$(TargetArchitecture)' == 'x64'">x64</Platform>
-      <Platform Condition="'$(TargetArchitecture)' != 'x64'">$(TargetArchitecture)</Platform>
-    </BuildRID>
-  </ItemGroup>
-
-  <ItemGroup>
-    <_project Include="@(BuildRID)">
-      <Platform Condition="'%(Platform)' == ''">x64</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/mono/netcore/nuget/Directory.Build.targets b/src/mono/netcore/nuget/Directory.Build.targets
deleted file mode 100644
index 33132b9..0000000
--- a/src/mono/netcore/nuget/Directory.Build.targets
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="../../Directory.Build.targets" />
-
-  <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="'$(SymbolFileExtension)' != ''">
-      <AdditionalLibPackageExcludes Include="%2A%2A\%2A$(SymbolFileExtension)"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <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>
-      <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')" />
-
-      <!--
-        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)$(SymbolFileExtension)')" />
-
-      <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/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Directory.Build.props b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Directory.Build.props
deleted file mode 100644
index e4d014b..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.pkgproj b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.pkgproj
deleted file mode 100644
index a574cae..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.pkgproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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))" />
-
-  <Import Condition="'$(_packageTargetOSGroup)' != ''"  Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.proj b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.proj
deleted file mode 100644
index 85918b3..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/Microsoft.NETCore.Runtime.Mono.proj
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Android.Microsoft.NETCore.Runtime.Mono.props b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Android.Microsoft.NETCore.Runtime.Mono.props
deleted file mode 100644
index fb6909a..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Android.Microsoft.NETCore.Runtime.Mono.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libmonosgen-2.0.so" />
-    <NativeBinary Include="$(BinDir)libmonosgen-2.0.a" />
-    <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
-    <File Include="$(BinDir)include\**">
-      <SkipPackageFileCheck>true</SkipPackageFileCheck>
-      <TargetPath>tools\include\%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Linux.Microsoft.NETCore.Runtime.Mono.props b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Linux.Microsoft.NETCore.Runtime.Mono.props
deleted file mode 100644
index 35f875d..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Linux.Microsoft.NETCore.Runtime.Mono.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libcoreclr.so" />
-    <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.OSX.Microsoft.NETCore.Runtime.Mono.props b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.OSX.Microsoft.NETCore.Runtime.Mono.props
deleted file mode 100644
index 8789bd3..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.OSX.Microsoft.NETCore.Runtime.Mono.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libcoreclr.dylib" />
-    <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Windows_NT.Microsoft.NETCore.Runtime.Mono.props b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Windows_NT.Microsoft.NETCore.Runtime.Mono.props
deleted file mode 100644
index f60b2af..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.Windows_NT.Microsoft.NETCore.Runtime.Mono.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)coreclr.dll" />
-    <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.iOS.Microsoft.NETCore.Runtime.Mono.props b/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.iOS.Microsoft.NETCore.Runtime.Mono.props
deleted file mode 100644
index 00dddd2..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Runtime.Mono/runtime.iOS.Microsoft.NETCore.Runtime.Mono.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <NativeBinary Include="$(BinDir)libmono.dylib" />
-    <NativeBinary Include="$(BinDir)libmono.a" />
-    <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
-    <File Include="$(BinDir)include\**">
-      <SkipPackageFileCheck>true</SkipPackageFileCheck>
-      <TargetPath>tools\include\%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Directory.Build.props b/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Directory.Build.props
deleted file mode 100644
index e4d014b..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.pkgproj b/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.pkgproj
deleted file mode 100644
index a574cae..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.pkgproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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))" />
-
-  <Import Condition="'$(_packageTargetOSGroup)' != ''"  Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.proj b/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.proj
deleted file mode 100644
index 85918b3..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/Microsoft.NETCore.Tool.MonoAOT.proj
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.Android.Microsoft.NETCore.Tool.MonoAOT.props b/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.Android.Microsoft.NETCore.Tool.MonoAOT.props
deleted file mode 100644
index 6ed7866..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.Android.Microsoft.NETCore.Tool.MonoAOT.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-<!-- TODO 
-    <File Include="$(BinDir)/cross/mono-aot-cross">
-      <SkipPackageFileCheck>true</SkipPackageFileCheck>
-      <TargetPath>tools</TargetPath>
-    </File>
--->
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.iOS.Microsoft.NETCore.Tool.MonoAOT.props b/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.iOS.Microsoft.NETCore.Tool.MonoAOT.props
deleted file mode 100644
index d2f68d1..0000000
--- a/src/mono/netcore/nuget/Microsoft.NETCore.Tool.MonoAOT/runtime.iOS.Microsoft.NETCore.Tool.MonoAOT.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <ItemGroup>
-    <File Include="$(BinDir)/cross/mono-aot-cross">
-      <SkipPackageFileCheck>true</SkipPackageFileCheck>
-      <TargetPath>tools</TargetPath>
-    </File>
-  </ItemGroup>
-</Project>
diff --git a/src/mono/netcore/nuget/builds.targets b/src/mono/netcore/nuget/builds.targets
deleted file mode 100644
index 6aa99f6..0000000
--- a/src/mono/netcore/nuget/builds.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup Condition="'$(BuildIdentityPackage)' == ''">
-    <BuildIdentityPackage>true</BuildIdentityPackage>
-
-    <!-- Used to determine if we should build some packages only once across multiple official build legs.
-         For offline builds we still set OfficialBuildId but we need to build all the packages for a single
-         leg only, so we also take DotNetBuildFromSource into account. -->
-    <BuildingAnOfficialBuildLeg Condition="'$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
-
-    <!-- During an official build, only build identity packages on windows x64 legs -->
-    <BuildIdentityPackage Condition="'$(BuildingAnOfficialBuildLeg)' == 'true' AND ('$(OS)' != 'Windows_NT' OR '$(Platform)' != 'x64')">false</BuildIdentityPackage>
-  </PropertyGroup>
-
-  <Target Name="FilterProjects" BeforeTargets="Build">
-    <Error Condition="'$(PackageRID)' == ''" Text="'PackageRID' property must be specified."/>
-
-    <!-- Only build packages for current RID or non-RID-specific -->
-    <ItemGroup>
-      <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)'" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(BuildIdentityPackage)' == 'true'">
-      <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == ''" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="@(_projectsToBuild)" />
-    </ItemGroup>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/mono/netcore/nuget/descriptions.json b/src/mono/netcore/nuget/descriptions.json
deleted file mode 100644
index a3e8a02..0000000
--- a/src/mono/netcore/nuget/descriptions.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "Name": "RuntimePackage",
-        "Description": "Internal implementation package not meant for direct consumption.  Please do not reference directly.",
-        "CommonTypes": [ ]
-    },
-    {
-        "Name": "NuGet3MinVersion",
-        "Description": "When using NuGet 3.x this package requires at least version {0}.",
-        "CommonTypes": [ ]
-    },
-    {
-        "Name": "Microsoft.NETCore.Runtime.Mono",
-        "Description": "The Mono .NET Runtime 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.NETCore.Tool.MonoAOT",
-        "Description": "The Mono .NET Runtime AOT compiler for compiling IL into native code targetting a specific platform and architecture.",
-        "CommonTypes": [ ]
-    }
-]
diff --git a/src/mono/netcore/nuget/mono-packages.proj b/src/mono/netcore/nuget/mono-packages.proj
deleted file mode 100644
index e6ca457..0000000
--- a/src/mono/netcore/nuget/mono-packages.proj
+++ /dev/null
@@ -1,43 +0,0 @@
-<Project>
-  <Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />
-
-  <ItemGroup>
-    <ProjectReference Include="Microsoft.NETCore.Tool.MonoAOT\Microsoft.NETCore.Tool.MonoAOT.proj" Condition="('$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' != 'true') or ('$(TargetstvOS)' == 'true' and '$(TargetstvOSSimulator)' != 'true')" />
-    <ProjectReference Include="Microsoft.NETCore.Runtime.Mono\Microsoft.NETCore.Runtime.Mono.proj" />
-  </ItemGroup>
-
-  <!-- Generate a version.txt file we include in our packages
-       The InitializeSourceControlInformationFromSourceControlManager is part of Microsoft.Build.Tasks.Git
-       and is responsible for setting SourceRevisionId -->
-  <Target Name="GenerateVersionInfoFileForPackages"
-          BeforeTargets="Build"
-          DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager">
-
-    <Error Condition="'$(SourceRevisionId)' == ''" Text="SourceRevisionId is not set, which means the SourceLink targets are not included in the build. Those are needed to produce a correct sha for our build outputs." />
-
-    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(VersionTxtFile)))" />
-    <WriteLinesToFile
-      File="$(VersionTxtFile)"
-      Lines="$(SourceRevisionId)"
-      Overwrite="true" />
-  </Target>
-
-  <!-- Update the project references with additional properties calculated during the execution phase.
-       _InitializeAssemblyVersion is provided by Arcade. It sets the AssemblyVersion and FileVersion properties.
-       We depend on this private Arcade target instead of the SDK-defined GetAssemblyVersion since the packaging
-       build does not use the .NET SDK -->
-  <Target Name="UpdateAdditionalProperties"
-          BeforeTargets="Build"
-          DependsOnTargets="_InitializeAssemblyVersion">
-    <ItemGroup>
-      <!-- Pass the FileVersion calculated by _InitializeAssemblyVersion to referenced projects -->
-      <ProjectReference Update="@(ProjectReference)"
-                        AdditionalProperties="%(ProjectReference.AdditionalProperties);FileVersion=$(FileVersion)" />
-    </ItemGroup>
-  </Target>
-
-  <Import Sdk="Microsoft.Build.Traversal" Project="Sdk.targets" />
-
-  <!-- Ordering matters! Overwriting the Pack target which should just invoke Build. -->
-  <Target Name="Pack" DependsOnTargets="Build" />
-</Project>
diff --git a/src/mono/netcore/nuget/packageIndex.json b/src/mono/netcore/nuget/packageIndex.json
deleted file mode 100644
index 7a73a41..0000000
--- a/src/mono/netcore/nuget/packageIndex.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/src/mono/netcore/nuget/packaging.props b/src/mono/netcore/nuget/packaging.props
deleted file mode 100644
index c2d44d8..0000000
--- a/src/mono/netcore/nuget/packaging.props
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-
-  <PropertyGroup>
-    <PackageDescriptionFile>$(MSBuildThisFileDirectory)/descriptions.json</PackageDescriptionFile>
-    <PackageLicenseFile>$(RepoRoot)/LICENSE.TXT</PackageLicenseFile>
-    <PackageThirdPartyNoticesFile>$(RepoRoot)/THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
-
-    <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
-
-    <ProjectUrl>https://dot.net</ProjectUrl>
-
-    <PackageIndexFile>$(MSBuildThisFileDirectory)/packageIndex.json</PackageIndexFile>
-
-    <!-- mono doesn't currently use the index so don't force it to be in sync -->
-    <SkipIndexCheck>true</SkipIndexCheck>
-
-    <VersionTxtFile Condition="'$(VersionTxtFile)' == ''">$(ArtifactsObjDir)\mono\version.txt</VersionTxtFile>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
-    <!-- Add required legal files to packages -->
-    <File Condition="Exists('$(PackageLicenseFile)')"
-          Include="$(PackageLicenseFile)" >
-      <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    </File>
-    <File Condition="Exists('$(PackageThirdPartyNoticesFile)')"
-          Include="$(PackageThirdPartyNoticesFile)" >
-      <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    </File>
-    <PackageIndex Include="$(PackageIndexFile)" />
-
-    <!-- Add version file to packages -->
-    <File Include="$(VersionTxtFile)"
-          Condition="Exists('$(VersionTxtFile)')">
-          <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    </File>
-  </ItemGroup>
-</Project>
-- 
2.7.4