Replace all remaining pkgprojs with NuGet Pack task (#56712)

* Runtime specific and doc file packaging fixes

* Replace all remaining pkgprojs with NuGet Pack task

* Avoid NuGet/Home/issues/10368

* Update PackageValidation package to latest

Directory.Build.props

@@ -258,7 +258,7 @@
     <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion>
     <IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
     <!-- We don't want Private packages to be shipped to NuGet.org -->
-    <IsShippingPackage Condition="($(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
+    <IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)">false</IsShippingPackage>
     <!-- A package isn't generated if in servicing or in runtimelab. Intended to be overridden at project level.
          Excluding .sfxprojs as they have their own incremental servicing infra. -->
     <GeneratePackage Condition="'$(GeneratePackage)' == ''">true</GeneratePackage>

eng/Versions.props

@@ -51,6 +51,8 @@
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
     <MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
     <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21375.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <!-- SDK dependencies -->
+    <MicrosoftDotNetPackageValidationVersion>1.0.0-rc.1.21404.21</MicrosoftDotNetPackageValidationVersion>
     <!-- Arcade dependencies -->
     <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21373.11</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21373.11</MicrosoftDotNetBuildTasksFeedVersion>

eng/packaging.targets

 <Project InitialTargets="_OverridePackDependsOnForCsProjToPkgProj">
   
   <PropertyGroup Condition="'$(IsPackable)' == 'true'">
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificAssemblies;LibIntellisenseDocs</TargetsForTfmSpecificContentInPackage>
-    <TargetsForTfmSpecificDebugSymbolsInPackage>$(TargetsForTfmSpecificDebugSymbolsInPackage);AddRuntimeDebugSymbolsWithTfm</TargetsForTfmSpecificDebugSymbolsInPackage>
+    <EnablePackageValidation Condition="'$(IsSourceProject)' == 'true' and !Exists('$(PkgProjPath)')">true</EnablePackageValidation>
+    <!-- Don't restore prebuilt packages during sourcebuild. -->
+    <DisablePackageBaselineValidation Condition="'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
+    <PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">$([MSBuild]::Subtract($(MajorVersion), 1)).0.0</PackageValidationBaselineVersion>
+    <SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddDocumentationFileToPackage;AddRuntimeSpecificFilesToPackage</TargetsForTfmSpecificContentInPackage>
+    <TargetsForTfmSpecificDebugSymbolsInPackage>$(TargetsForTfmSpecificDebugSymbolsInPackage);AddRuntimeSpecificSymbolToPackage</TargetsForTfmSpecificDebugSymbolsInPackage>
     <IncludeBuildOutput Condition="'$(TargetsAnyOS)' != 'true' or '$(ExcludeFromPackage)' == 'true'">false</IncludeBuildOutput>  
     <!-- Don't include target platform specific dependencies, since we use the target platform to represent RIDs instead -->
     <SuppressDependenciesWhenPacking Condition="'$(ExcludeFromPackage)' == 'true' or ('$(TargetsAnyOS)' != 'true' and $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0')))">true</SuppressDependenciesWhenPacking>
     <PackageDesignerMarkerFile>$(MSBuildThisFileDirectory)useSharedDesignerContext.txt</PackageDesignerMarkerFile>
-    <PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">$([MSBuild]::Subtract($(MajorVersion), 1)).0.0</PackageValidationBaselineVersion>
-    <BeforePack>IncludeAnalyzersInPackage;$(BeforePack)</BeforePack>
+    <GenerateNuspecDependsOn>IncludeAnalyzersInPackage;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(EnablePackageValidation)' == 'true'">
+    <PackageReference Include="Microsoft.DotNet.PackageValidation" Version="$(MicrosoftDotNetPackageValidationVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <!-- TODO: Remove when the SDK is upgraded to RC1. -->
+    <PackageDownload Include="$([MSBuild]::ValueOrDefault('$(PackageValidationBaselineName)', '$(PackageId)'))"
+                     Version="[$(PackageValidationBaselineVersion)]"
+                     Condition="'$(DisablePackageBaselineValidation)' != 'true' and '$(PackageValidationBaselinePath)' == '' and '$(PackageValidationBaselineVersion)' != ''" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(AddNETFrameworkAssemblyReferenceToPackage)' == 'true'">
+    <_FrameworkAssemblyReferences Include="$(MSBuildProjectName)"
+                                  TargetFramework="net461" />
+  </ItemGroup>
+
+  <Choose>
+    <When Condition="'$(IsPackable)' == 'true' and
+                     ('$(AddXamarinPlaceholderFilesToPackage)' == 'true' or '$(AddNETFrameworkPlaceholderFileToPackage)' == 'true')">
+      <PropertyGroup>
+        <!-- Placeholders don't need a dependency group. -->
+        <NoWarn>$(NoWarn);NU5128</NoWarn>
+      </PropertyGroup>
+      <ItemGroup Condition="'$(AddNETFrameworkPlaceholderFileToPackage)' == 'true'">
+        <None Include="$(PlaceholderFile)" PackagePath="lib/net461" Pack="true" />
+        <None Include="$(PlaceholderFile)" PackagePath="runtimes/win/lib/net461" Pack="true" Condition="$(TargetFrameworks.Contains('netstandard2.0-windows'))" />
+      </ItemGroup>
+      <ItemGroup Condition="'$(AddXamarinPlaceholderFilesToPackage)' == 'true'">
+        <None Include="$(PlaceholderFile)" PackagePath="lib\MonoAndroid10" Pack="true" />
+        <None Include="$(PlaceholderFile)" PackagePath="lib\MonoTouch10" Pack="true" />
+        <None Include="$(PlaceholderFile)" PackagePath="lib\xamarinios10" Pack="true" />
+        <None Include="$(PlaceholderFile)" PackagePath="lib\xamarinmac20" Pack="true" />
+        <None Include="$(PlaceholderFile)" PackagePath="lib\xamarintvos10" Pack="true" />
+        <None Include="$(PlaceholderFile)" PackagePath="lib\xamarinwatchos10" Pack="true" />
+      </ItemGroup>
+    </When>
+  </Choose>
+
   <!--     There are some packages where we require only one ref for a specific framework to be present. In order to avoid problems with this package when targetting 
            dektop with RAR we will make sure there are no exclude=compile references in the package.
     For more info, please check issues:
@@ -22,7 +61,7 @@
       <Dependency>
         <Exclude></Exclude>
       </Dependency>
-    </ItemGroup>    
+    </ItemGroup>
   </Target>
 
   <Target Name="ValidateExcludeCompileDesktop"
@@ -55,42 +94,62 @@
              Targets="Build" />
   </Target>
 
-  <Target Name="AddRuntimeSpecificAssemblies"
-          DependsOnTargets="BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup;$(TargetsForTfmSpecificBuildOutput)"
-          Condition="'$(TargetsAnyOS)' != 'true' and '$(ExcludeFromPackage)' == ''">
+  <Target Name="AddDocumentationFileToPackage"
+          Condition="'$(ExcludeFromPackage)' != 'true'">
+    <PropertyGroup>
+      <!-- Search for the documentation file in the intellisense package and otherwise pick up the generated one. -->
+      <_documentationFileToPackage Condition="Exists('$(XmlDocFileRoot)1033\$(TargetName).xml')">$(XmlDocFileRoot)1033\$(TargetName).xml</_documentationFileToPackage>
+      <_documentationFileToPackage Condition="'$(_documentationFileToPackage)' == '' and Exists('$(DocumentationFile)')">$(DocumentationFile)</_documentationFileToPackage>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(_documentationFileToPackage)' != ''">
+      <!-- Place the documentation file into the lib or runtimes/lib folder depending on if the build is runtime agnostic or specific. -->
+      <TfmSpecificPackageFile Include="$(_documentationFileToPackage)"
+                              PackagePath="$([MSBuild]::ValueOrDefault('$(BuildOutputTargetFolder)', 'lib'))/$(TargetFrameworkWithoutSuffix)"
+                              Condition="'$(TargetsAnyOS)' == 'true'" />
+      <TfmRuntimeSpecificPackageFile Include="$(_documentationFileToPackage)"
+                                     Condition="'$(TargetsAnyOS)' != 'true'" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AddRuntimeSpecificFilesToPackage"
+          DependsOnTargets="BuiltProjectOutputGroup;
+                            SatelliteDllsProjectOutputGroup;
+                            $(TargetsForTfmSpecificBuildOutput);
+                            AddDocumentationFileToPackage"
+          Condition="'$(ExcludeFromPackage)' != 'true' and
+                     '$(TargetsAnyOS)' != 'true'">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput);
-                            @(BuiltProjectOutputGroupOutput)">
-        <PackagePath>runtimes/$(_runtimeOS)/lib/$(TargetFrameworkWithoutSuffix)</PackagePath>
-      </TfmSpecificPackageFile>
+      <TfmRuntimeSpecificPackageFile Include="@(BuiltProjectOutputGroupOutput);
+                                              @(SatelliteDllsProjectOutputGroupOutput)" />
+      <TfmSpecificPackageFile Include="@(TfmRuntimeSpecificPackageFile)"
+                              PackagePath="runtimes/$(PackageTargetRuntime)/lib/$(TargetFrameworkWithoutSuffix)" />
+      <!-- Copy runtime specific assemblies into the rid agnostic 'lib' folder if the ridless tfm doesn't exist on .NETFramework.
+           The assumption holds that a ridless tfm doesn't follow a '-' charater. This is necessary to avoid NU5128. -->
+      <TfmSpecificPackageFile Include="@(TfmRuntimeSpecificPackageFile)"
+                              PackagePath="$([MSBuild]::ValueOrDefault('$(BuildOutputTargetFolder)', 'lib'))/$(TargetFrameworkWithoutSuffix)"
+                              Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and !$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFrameworks)', '$(TargetFrameworkWithoutSuffix)(?!-)'))" />
     </ItemGroup>
   </Target>
 
-  <!-- Runtime independent symbols are automatically added by the pack task.-->
-  <Target Name="AddRuntimeDebugSymbolsWithTfm"
-          Condition="'$(IncludeSymbols)' == 'true' and '$(TargetsAnyOS)' != 'true' and '$(ExcludeFromPackage)' == ''">
+  <!-- Runtime agnostic symbols are automatically added by the pack task.-->
+  <Target Name="AddRuntimeSpecificSymbolToPackage"
+          Condition="'$(ExcludeFromPackage)' != 'true' and
+                     '$(TargetsAnyOS)' != 'true' and
+                     '$(IncludeSymbols)' == 'true'">
     <PropertyGroup>
-      <RuntimeSymbolPath>$([System.IO.Path]::GetDirectoryName($(TargetPath)))\$(TargetName).pdb</RuntimeSymbolPath>
+      <RuntimeSymbolPath>$(TargetDir)$(TargetName).pdb</RuntimeSymbolPath>
     </PropertyGroup>
 
     <ItemGroup Condition="Exists('$(RuntimeSymbolPath)')">
-      <TfmSpecificDebugSymbolsFile Include="$(RuntimeSymbolPath)">
-        <TargetPath>/runtimes/$(_runtimeOS)/lib/$(TargetFrameworkWithoutSuffix)/$(TargetName).pdb</TargetPath>
-        <TargetFramework>$(TargetFrameworkWithoutSuffix)</TargetFramework>
-      </TfmSpecificDebugSymbolsFile>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="LibIntellisenseDocs"
-          Condition="'$(IncludeBuildOutput)' == 'true'">
-   <PropertyGroup>
-     <_intellisenseRootFolder>$(BuildOutputTargetFolder)</_intellisenseRootFolder>
-     <_intellisenseRootFolder Condition="'$(_intellisenseRootFolder)' == ''">lib</_intellisenseRootFolder>
-   </PropertyGroup>
-   <ItemGroup>
-      <TfmSpecificPackageFile Include="$(XmlDocFileRoot)1033\$(TargetName).xml"
-                              Condition="Exists('$(XmlDocFileRoot)1033\$(TargetName).xml')"
-                              PackagePath="$(_intellisenseRootFolder)/$(TargetFramework)" />
+      <TfmSpecificDebugSymbolsFile Include="$(RuntimeSymbolPath)"
+                                   TargetPath="/runtimes/$(PackageTargetRuntime)/lib/$(TargetFrameworkWithoutSuffix)"
+                                   TargetFramework="$(TargetFrameworkWithoutSuffix)" />
+      <!-- Copy runtime specific symbol into the rid agnostic 'lib' folder if the ridless tfm doesn't exist on .NETFramework.
+           The assumption holds that a ridless tfm doesn't follow a '-' charater. This is necessary to avoid NU5128. -->
+      <TfmSpecificDebugSymbolsFile Include="$(RuntimeSymbolPath)"
+                                   TargetPath="/$([MSBuild]::ValueOrDefault('$(BuildOutputTargetFolder)', 'lib'))/$(TargetFrameworkWithoutSuffix)"
+                                   TargetFramework="$(TargetFrameworkWithoutSuffix)"
+                                   Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and !$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFrameworks)', '$(TargetFrameworkWithoutSuffix)(?!-)'))" />
     </ItemGroup>
   </Target>
 

global.json

@@ -13,7 +13,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21373.11",
-    "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4",
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11",
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11",
     "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21373.11",

src/libraries/Directory.Build.props

@@ -72,8 +72,6 @@
   <!-- Import packaging props -->
   <Import Project="$(RepositoryEngineeringDir)packaging.props" />
 
-  <Import Sdk="Microsoft.DotNet.PackageValidation" Project="Sdk.props" Condition="'$(IsSourceProject)' == 'true'" />
-
   <PropertyGroup>
     <RefRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ref'))</RefRootPath>
   </PropertyGroup>

src/libraries/Directory.Build.targets

@@ -19,14 +19,11 @@
   <Import Project="..\..\Directory.Build.targets" />
 
   <PropertyGroup>
-    <GenerateNuspecDependsOn>IncludeAnalyzersInPackage;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
     <NetCoreAppCurrentBuildSettings>$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)</NetCoreAppCurrentBuildSettings>
     <NativeBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)'))</NativeBinDir>
     <NetCoreAppCurrentTestHostPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)'))</NetCoreAppCurrentTestHostPath>
     <NetCoreAppCurrentTestHostSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))</NetCoreAppCurrentTestHostSharedFrameworkPath>
 
-    <SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
-
     <NoWarn Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '3.0')))">$(NoWarn);nullable</NoWarn>
     <NoWarn Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">$(NoWarn);nullable;CA1052</NoWarn>
     <!-- Ignore Obsolete errors within the generated shims that type-forward types.
@@ -43,7 +40,7 @@
     <!-- Reset these properties back to blank, since they are defaulted by Microsoft.NET.Sdk -->
     <WarningsAsErrors Condition="'$(WarningsAsErrors)' == 'NU1605'" />
     <!-- Set the documentation output file globally. -->
-    <DocumentationFile Condition="'$(IsSourceProject)' == 'true' and '$(DocumentationFile)' == '' and '$(MSBuildProjectExtension)' != '.vbproj'">$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
+    <DocumentationFile Condition="'$(IsSourceProject)' == 'true' and '$(DocumentationFile)' == '' and '$(MSBuildProjectExtension)' != '.vbproj'">$(OutputPath)$(TargetName).xml</DocumentationFile>
     <IsNETCoreAppSrc Condition="'$(IsNETCoreAppSrc)' == '' and
                                 '$(IsSourceProject)' == 'true' and
                                 $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsNETCoreAppSrc>
@@ -151,8 +148,6 @@
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 
-  <Import Sdk="Microsoft.DotNet.PackageValidation" Project="Sdk.targets" Condition="'$(IsSourceProject)' == 'true' and !Exists('$(PkgProjPath)')" />
-
   <Target Name="SetGenApiProperties"
           BeforeTargets="GenerateReferenceAssemblySource">
     <PropertyGroup>

src/libraries/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props

@@ -2,12 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
-    <!-- This assembly should never be placed inbox as it is only for downlevel compatibility. -->
-    <PackageDescription>Provides the IAsyncEnumerable&lt;T&gt; and IAsyncDisposable interfaces and helper types for .NET Standard 2.0. This package is not required starting with .NET Standard 2.1 and .NET Core 3.0.
-
-Commonly Used Types:
-System.IAsyncDisposable
-System.Collections.Generic.IAsyncEnumerable
-System.Collections.Generic.IAsyncEnumerator</PackageDescription>
   </PropertyGroup>
 </Project>

src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Bcl.AsyncInterfaces.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-</Project>
\ No newline at end of file

src/libraries/Microsoft.Bcl.AsyncInterfaces/src/CompatibilitySuppressions.xml

+<?xml version="1.0"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/Microsoft.Bcl.AsyncInterfaces.dll</Left>
+    <Right>lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/Microsoft.Bcl.AsyncInterfaces/src/Microsoft.Bcl.AsyncInterfaces.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <!-- This assembly should never be placed inbox as it is only for downlevel compatibility. -->
+    <PackageDescription>Provides the IAsyncEnumerable&lt;T&gt; and IAsyncDisposable interfaces and helper types for .NET Standard 2.0. This package is not required starting with .NET Standard 2.1 and .NET Core 3.0.
+
+Commonly Used Types:
+System.IAsyncDisposable
+System.Collections.Generic.IAsyncEnumerable
+System.Collections.Generic.IAsyncEnumerator</PackageDescription>
   </PropertyGroup>
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetFramework)' == 'netstandard2.1'">true</IsPartialFacadeAssembly>
@@ -33,8 +41,9 @@
       <Link>System.Private.CoreLib\System\Runtime\CompilerServices\EnumeratorCancellationAttribute.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
+  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
+    <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. -->
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" />
   </ItemGroup>
 </Project>

src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props

@@ -2,11 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
-    <PackageDescription>This package includes the class Microsoft.Diagnostics.Tracing.EventSource which enables firing ETW events from managed code. This is the "runtime" or "redist" EventSource package and should be referenced directly only by other NuGet packages that need the EventSource functionality. Application developers that need this functionality should instead reference the Microsoft.Diagnostics.Tracing.EventSource NuGet package which provides an enhanced developer experience.
-This package enables defining a strongly typed specification of an ETW provider that can be called by managed code. The EventSource class is also included in the .NET Framework, .NET Core, and netstandard2.0 in the System.Diagnostics.Tracing namespace. This package contains the latest version of EventSource and is meant to be used as a stop gap for .NET Framework developers until features and fixes are ported to System.Diagnostics.Tracing.EventSource in the .NET Framework.
-For more details, have a look at http://msdn.microsoft.com/en-us/library/system.diagnostics.tracing.eventsource.aspx.
-
-Commonly Used Types:
-Microsoft.Diagnostics.Tracing.EventSource</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj">
-      <SupportedFramework>net461</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <HarvestStablePackage>false</HarvestStablePackage>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <PackageDescription>This package includes the class Microsoft.Diagnostics.Tracing.EventSource which enables firing ETW events from managed code. This is the "runtime" or "redist" EventSource package and should be referenced directly only by other NuGet packages that need the EventSource functionality. Application developers that need this functionality should instead reference the Microsoft.Diagnostics.Tracing.EventSource NuGet package which provides an enhanced developer experience.
+This package enables defining a strongly typed specification of an ETW provider that can be called by managed code. The EventSource class is also included in the .NET Framework, .NET Core, and netstandard2.0 in the System.Diagnostics.Tracing namespace. This package contains the latest version of EventSource and is meant to be used as a stop gap for .NET Framework developers until features and fixes are ported to System.Diagnostics.Tracing.EventSource in the .NET Framework.
+For more details, have a look at http://msdn.microsoft.com/en-us/library/system.diagnostics.tracing.eventsource.aspx.
+
+Commonly Used Types:
+Microsoft.Diagnostics.Tracing.EventSource</PackageDescription>
+    <IsPackable>true</IsPackable>
+    <PackageId>$(MSBuildProjectName)</PackageId>
     <AssemblyName>Microsoft.Diagnostics.Tracing.EventSource</AssemblyName>
     <DefineConstants>$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;TARGET_WINDOWS</DefineConstants>
     <TargetFrameworks>net461-windows</TargetFrameworks>
     <Nullable>enable</Nullable>
-    <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
-  </PropertyGroup>
-  <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj

@@ -21,6 +21,8 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System.Security" />
+    <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj

@@ -22,4 +22,9 @@
     <ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Xml\src\Microsoft.Extensions.Configuration.Xml.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
+  </ItemGroup>
+
 </Project>

src/libraries/Microsoft.IO.Redist/Directory.Build.props

-<Project>
-  <Import Project="..\Directory.Build.props" />
-  <PropertyGroup>
-    <StrongNameKeyId>Open</StrongNameKeyId>
-    <PackageDescription>Downlevel support package for System.IO classes.</PackageDescription>
-  </PropertyGroup>
-</Project>

src/libraries/Microsoft.IO.Redist/pkg/Microsoft.IO.Redist.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.IO.Redist.csproj">
-      <SupportedFramework>net472</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Downlevel support package for System.IO classes.</PackageDescription>
     <DefineConstants>$(DefineConstants);MS_IO_REDIST</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ClsCompliant>false</ClsCompliant>
     <Nullable>annotations</Nullable>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
+    <TargetFrameworks>net472</TargetFrameworks>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="Microsoft\IO\Enumeration\" />
+    <None Include="PinvokeAnalyzerExceptionList.analyzerdata" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="$(CoreLibSharedDir)System\IO\Directory.cs"
              Link="Microsoft\IO\Directory.cs" />
@@ -205,15 +213,11 @@
     <Compile Include="Microsoft\IO\StringExtensions.cs" />
     <Compile Include="Microsoft\IO\ThrowHelper.cs" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Microsoft\IO\Enumeration\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="PinvokeAnalyzerExceptionList.analyzerdata" />
+    <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. -->
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" />
   </ItemGroup>
 </Project>

src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props

@@ -3,11 +3,5 @@
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey.
-
-Commonly Used Types:
-System.Security.AccessControl.RegistryAccessRule
-System.Security.AccessControl.RegistryAuditRule
-System.Security.AccessControl.RegistrySecurity</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\Microsoft.Win32.Registry.AccessControl.csproj">
-      <SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
-    <!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
-    <ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj

@@ -16,8 +16,8 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
     <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
-    <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project. -->
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
+    <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.Registry.AccessControl/src/CompatibilitySuppressions.xml

+<?xml version="1.0"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETFramework,Version=v4.6</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v1.3</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV007</DiagnosticId>
+    <Target>.NETFramework,Version=v4.6-win</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV007</DiagnosticId>
+    <Target>.NETStandard,Version=v1.3-win</Target>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey.
+
+Commonly Used Types:
+System.Security.AccessControl.RegistryAccessRule
+System.Security.AccessControl.RegistryAuditRule
+System.Security.AccessControl.RegistrySecurity</PackageDescription>
+    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netstandard2.0-windows;netstandard2.0;net461-windows</TargetFrameworks>
   </PropertyGroup>
 
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_RegistryAccessControl</GeneratePlatformNotSupportedAssemblyMessage>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETFramework' and
+                                                            '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_RegistryAccessControl</GeneratePlatformNotSupportedAssemblyMessage>
     <OmitResources Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</OmitResources>
   </PropertyGroup>
 
@@ -21,8 +29,12 @@
     <Reference Include="System.Security.AccessControl" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
     <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
   </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj

@@ -7,5 +7,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
+    <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props

@@ -3,9 +3,5 @@
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides access to Windows system event notifications.
-
-Commonly Used Types:
-Microsoft.Win32.SystemEvents</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\Microsoft.Win32.SystemEvents.csproj">
-      <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\Microsoft.Win32.SystemEvents.csproj" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/Microsoft.Win32.SystemEvents/src/CompatibilitySuppressions.xml

+<?xml version="1.0"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll</Left>
+    <Right>lib/net461/Microsoft.Win32.SystemEvents.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides access to Windows system event notifications.
+
+Commonly Used Types:
+Microsoft.Win32.SystemEvents</PackageDescription>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
   </PropertyGroup>
+
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
     <!-- Constrained Execution Regions only apply to netstandard2.0 and net4* -->
     <DefineConstants Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETCoreApp'">$(DefineConstants);FEATURE_CER</DefineConstants>
-    <IsPartialFacadeAssembly Condition="'$(TargetFramework)' == 'net461'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetsAnyOS)' == 'true'">SR.PlatformNotSupported_SystemEvents</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
+
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"
              Link="Common\Interop\Windows\Interop.Libraries.cs" />
@@ -115,6 +122,7 @@
              Link="System\Runtime\InteropServices\SuppressGCTransitionAttribute.cs"
              Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <Reference Include="System.Collections" />
     <Reference Include="System.ComponentModel.EventBasedAsync" />
@@ -128,4 +136,8 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props

 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <SkipValidatePackage>true</SkipValidatePackage>
     <AssemblyFileVersion>$(AssemblyVersion)</AssemblyFileVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
-    <PackageDescription>Creates an Xml serialization assembly for types contained in an assembly in order to improve the startup performance of Xml serialization when serializing or de-serializing objects of those types using XmlSerializer.</PackageDescription>
   </PropertyGroup>
 </Project>

src/libraries/Microsoft.XmlSerializer.Generator/pkg/GenerateNupkgProps.targets

-<Project>
-  <PropertyGroup>
-      <BuildDependsOn>
-        GenerateNupkgProps;
-        $(BuildDependsOn)
-      </BuildDependsOn>
-      <PackageBuildPath>$(PackageOutputPath)build/</PackageBuildPath>
-      <PropsFilePath>$(PackageBuildPath)$(Id).props</PropsFilePath>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageFile Include="$(PropsFilePath)">
-      <TargetPath>build\</TargetPath>
-    </PackageFile>
-  </ItemGroup>
-  <Target Name="GenerateNupkgProps" DependsOnTargets="CalculatePackageVersion">
-    <PropertyGroup>
-      <PropsFileContents>
-&lt;Project&gt;
-  &lt;ItemGroup&gt;
-    &lt;DotNetCliToolReference Include="$(Id)" Version="$(PackageVersion)" /&gt;
-  &lt;/ItemGroup&gt;
-&lt;/Project&gt;
-      </PropsFileContents>
-    </PropertyGroup>
-    <MakeDir Directories="$(PackageBuildPath)"/>  
-    <WriteLinesToFile
-      File="$(PropsFilePath)"
-      Lines="$(PropsFileContents)"
-      Overwrite="true" />
-  </Target>
-</Project>
\ No newline at end of file

src/libraries/Microsoft.XmlSerializer.Generator/pkg/Microsoft.XmlSerializer.Generator.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.XmlSerializer.Generator.csproj" />
-  </ItemGroup>
-  <PropertyGroup>
-    <PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=863421</PackageReleaseNotes>
-    <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=858594</PackageProjectUrl>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    <HarvestStablePackage>false</HarvestStablePackage>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageFile Include=".\build\prefercliruntime"/>
-    <PackageFile Include=".\build\Microsoft.XmlSerializer.Generator.targets">
-      <TargetPath>build\</TargetPath>
-    </PackageFile>
-    <PackageFile Include=".\build\dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json">
-      <TargetPath>\lib\netstandard2.0\</TargetPath>
-    </PackageFile>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-  <Import Project=".\GenerateNupkgProps.targets" />
-</Project>

src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateNupkgProps.targets

+<Project>
+  <PropertyGroup>
+    <BeforePack>GenerateNupkgProps;$(BeforePack)</BeforePack>
+    <PropsFilePath>$(BaseIntermediateOutputPath)$(PackageId).props</PropsFilePath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(PropsFilePath)"
+          PackagePath="build"
+          Pack="true" />
+  </ItemGroup>
+
+  <Target Name="GenerateNupkgProps">
+    <PropertyGroup>
+      <PropsFileContents>
+&lt;Project&gt;
+  &lt;ItemGroup&gt;
+    &lt;DotNetCliToolReference Include="$(PackageId)" Version="$(PackageVersion)" /&gt;
+  &lt;/ItemGroup&gt;
+&lt;/Project&gt;
+      </PropsFileContents>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(PropsFilePath)"
+                      Lines="$(PropsFileContents)"
+                      Overwrite="true" />
+  </Target>
+</Project>
\ No newline at end of file

src/libraries/Microsoft.XmlSerializer.Generator/src/GenerateThisAssemblyCs.targets

 <Project>
   <ItemGroup>
-    <Compile Include="$(IntermediateOutputPath)\ThisAssembly.cs"/>
+    <Compile Include="$(IntermediateOutputPath)ThisAssembly.cs"/>
   </ItemGroup>
 
   <Target Name="GenerateThisAssemblyCs"
@@ -41,7 +41,7 @@ namespace Microsoft.XmlSerializer.Generator
 
     <!-- Write ThisAssembly.cs if this is a new version number, or it is missing -->
     <WriteLinesToFile
-      File="$(IntermediateOutputPath)\ThisAssembly.cs"
+      File="$(IntermediateOutputPath)ThisAssembly.cs"
       Lines="$(ThisAssemblyCsContents)"
       Overwrite="true"
       Encoding="Unicode"/>

src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj

@@ -7,12 +7,31 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <EnableSingleFileAnalyzer>false</EnableSingleFileAnalyzer>
+    <IsPackable>true</IsPackable>
+    <PackageId>$(MSBuildProjectName)</PackageId>
+    <PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=863421</PackageReleaseNotes>
+    <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=858594</PackageProjectUrl>
+    <PackageDescription>Creates an Xml serialization assembly for types contained in an assembly in order to improve the startup performance of Xml serialization when serializing or de-serializing objects of those types using XmlSerializer.</PackageDescription>
+    <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="Sgen.cs" />
   </ItemGroup>
 
-  <Import Project=".\GenerateThisAssemblyCs.targets" />
+  <ItemGroup>
+    <None Include="build\prefercliruntime"
+          PackagePath="/"
+          Pack="true" />
+    <None Include="build\Microsoft.XmlSerializer.Generator.targets"
+          PackagePath="build"
+          Pack="true" />
+    <None Include="build\dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json"
+          PackagePath="lib\netstandard2.0"
+          Pack="true" />
+  </ItemGroup>
+
+  <Import Project="GenerateThisAssemblyCs.targets" />
+  <Import Project="GenerateNupkgProps.targets" />
 
 </Project>

src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <GeneratorRuntimeConfig>$(MSBuildThisFileDirectory)..\pkg\build\dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json</GeneratorRuntimeConfig>
+    <GeneratorRuntimeConfig>$(MSBuildThisFileDirectory)..\src\build\dotnet-Microsoft.XmlSerializer.Generator.runtimeconfig.json</GeneratorRuntimeConfig>
     <GeneratorCommand>"$(DotNetTool)"</GeneratorCommand>
     <GeneratorCommand Condition="'$(OS)' == 'Windows_NT'">set DOTNET_MULTILEVEL_LOOKUP=0 &amp; $(GeneratorCommand)</GeneratorCommand>
     <GeneratorCommand Condition="'$(OS)' != 'Windows_NT'">export DOTNET_MULTILEVEL_LOOKUP=0 &amp;&amp; $(GeneratorCommand)</GeneratorCommand>

src/libraries/System.CodeDom/Directory.Build.props

 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <StrongNameKeyId>Open</StrongNameKeyId>
-    <PackageDescription>Provides types that can be used to model the structure of a source code document and to output source code for that model in a supported language.
-
-Commonly Used Types:
-System.CodeDom.CodeObject
-System.CodeDom.Compiler.CodeDomProvider
-Microsoft.CSharp.CSharpCodeProvider
-Microsoft.VisualBasic.VBCodeProvider</PackageDescription>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
     <UnsupportedOSPlatforms>browser;ios;tvos;maccatalyst</UnsupportedOSPlatforms>
   </PropertyGroup>

src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.CodeDom.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.CodeDom.csproj" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.CodeDom/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.CodeDom.dll</Left>
+    <Right>lib/net461/System.CodeDom.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.CodeDom/src/System.CodeDom.csproj

@@ -4,10 +4,18 @@
     <DefineConstants>$(DefineConstants);CODEDOM</DefineConstants>
     <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
     <SetIsTrimmable>false</SetIsTrimmable>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides types that can be used to model the structure of a source code document and to output source code for that model in a supported language.
+
+Commonly Used Types:
+System.CodeDom.CodeObject
+System.CodeDom.Compiler.CodeDomProvider
+Microsoft.CSharp.CSharpCodeProvider
+Microsoft.VisualBasic.VBCodeProvider</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
-    <IsPartialFacadeAssembly Condition="'$(TargetFramework)' == 'net461'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="Microsoft\CSharp\CSharpCodeGenerator.cs" />
@@ -143,4 +151,7 @@
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Threading" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Collections.Immutable/Directory.Build.props

@@ -2,24 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
-    <PackageDescription>This package provides collections that are thread safe and guaranteed to never change their contents, also known as immutable collections. Like strings, any methods that perform modifications will not change the existing instance but instead return a new instance. For efficiency reasons, the implementation uses a sharing mechanism to ensure that newly created instances share as much data as possible with the previous instance while ensuring that operations have a predictable time complexity.
-
-Commonly Used Types:
-System.Collections.Immutable.ImmutableArray
-System.Collections.Immutable.ImmutableArray&lt;T&gt;
-System.Collections.Immutable.ImmutableDictionary
-System.Collections.Immutable.ImmutableDictionary&lt;TKey,TValue&gt;
-System.Collections.Immutable.ImmutableHashSet
-System.Collections.Immutable.ImmutableHashSet&lt;T&gt;
-System.Collections.Immutable.ImmutableList
-System.Collections.Immutable.ImmutableList&lt;T&gt;
-System.Collections.Immutable.ImmutableQueue
-System.Collections.Immutable.ImmutableQueue&lt;T&gt;
-System.Collections.Immutable.ImmutableSortedDictionary
-System.Collections.Immutable.ImmutableSortedDictionary&lt;TKey,TValue&gt;
-System.Collections.Immutable.ImmutableSortedSet
-System.Collections.Immutable.ImmutableSortedSet&lt;T&gt;
-System.Collections.Immutable.ImmutableStack
-System.Collections.Immutable.ImmutableStack&lt;T&gt;</PackageDescription>
   </PropertyGroup>
 </Project>

src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\System.Collections.Immutable.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-
-    <!-- Since UAP and .NETCoreApp are package based we still want to enable
-         OOBing libraries that happen to overlap with their framework package.
-         This avoids us having to lock the API in our NuGet packages just 
-         to match what shipped inbox: since we can provide a new library 
-         we can update it to add API without raising the netstandard version. -->
-    <ValidatePackageSuppression Include="TreatAsOutOfBox">
-      <Value>.NETCoreApp;UAP</Value>
-    </ValidatePackageSuppression>
-
-    <!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
-    <ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;net45;net451;net46;wp8;wpa81" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.Collections.Immutable/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v1.0</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v1.3</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETPortable,Version=v0.0,Profile=Profile259</Target>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj

@@ -2,6 +2,26 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>This package provides collections that are thread safe and guaranteed to never change their contents, also known as immutable collections. Like strings, any methods that perform modifications will not change the existing instance but instead return a new instance. For efficiency reasons, the implementation uses a sharing mechanism to ensure that newly created instances share as much data as possible with the previous instance while ensuring that operations have a predictable time complexity.
+
+Commonly Used Types:
+System.Collections.Immutable.ImmutableArray
+System.Collections.Immutable.ImmutableArray&lt;T&gt;
+System.Collections.Immutable.ImmutableDictionary
+System.Collections.Immutable.ImmutableDictionary&lt;TKey,TValue&gt;
+System.Collections.Immutable.ImmutableHashSet
+System.Collections.Immutable.ImmutableHashSet&lt;T&gt;
+System.Collections.Immutable.ImmutableList
+System.Collections.Immutable.ImmutableList&lt;T&gt;
+System.Collections.Immutable.ImmutableQueue
+System.Collections.Immutable.ImmutableQueue&lt;T&gt;
+System.Collections.Immutable.ImmutableSortedDictionary
+System.Collections.Immutable.ImmutableSortedDictionary&lt;TKey,TValue&gt;
+System.Collections.Immutable.ImmutableSortedSet
+System.Collections.Immutable.ImmutableSortedSet&lt;T&gt;
+System.Collections.Immutable.ImmutableStack
+System.Collections.Immutable.ImmutableStack&lt;T&gt;</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\InternalsVisibleTo.cs" />
@@ -103,4 +123,7 @@
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <PackageReference Include="System.Memory"  Version="$(SystemMemoryVersion)" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.ComponentModel.Composition.Registration/Directory.Build.props

@@ -2,14 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
-    <PackageDescription>This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.
-
-Commonly Used Types:
-System.ComponentModel.Composition.Registration.RegistrationBuilder
-System.ComponentModel.Composition.Registration.PartBuilder
-System.ComponentModel.Composition.Registration.PartBuilder&lt;T&gt;
-System.ComponentModel.Composition.Registration.ParameterImportBuilder
-System.ComponentModel.Composition.Registration.ImportBuilder
-System.ComponentModel.Composition.Registration.ExportBuilder</PackageDescription>
   </PropertyGroup>
 </Project>

src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj

-<Project DefaultTargets="Build">
-    <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-    <ItemGroup>
-    <ProjectReference Include="..\ref\System.ComponentModel.Composition.Registration.csproj">
-      <SupportedFramework>netcoreapp3.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <SupportedFramework Include="net461" Version="4.0.0.0" />
-    <ProjectReference Include="..\src\System.ComponentModel.Composition.Registration.csproj" />
-    <InboxOnTargetFramework Include="net461">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj

@@ -2,6 +2,18 @@
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.1</TargetFrameworks>
     <SetIsTrimmable>false</SetIsTrimmable>
+    <IsPackable>true</IsPackable>
+    <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
+    <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
+    <PackageDescription>This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.
+
+Commonly Used Types:
+System.ComponentModel.Composition.Registration.RegistrationBuilder
+System.ComponentModel.Composition.Registration.PartBuilder
+System.ComponentModel.Composition.Registration.PartBuilder&lt;T&gt;
+System.ComponentModel.Composition.Registration.ParameterImportBuilder
+System.ComponentModel.Composition.Registration.ImportBuilder
+System.ComponentModel.Composition.Registration.ExportBuilder</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,4 +50,8 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading" />
   </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.ComponentModel.Composition/Directory.Build.props

@@ -3,23 +3,5 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
-    <PackageDescription>This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.
-
-Commonly Used Types:
-System.ComponentModel.Composition.ChangeRejectedException
-System.ComponentModel.Composition.CompositionContractMismatchException
-System.ComponentModel.Composition.CompositionError
-System.ComponentModel.Composition.CompositionException
-System.ComponentModel.Composition.ExportAttribute
-System.ComponentModel.Composition.ImportAttribute
-System.ComponentModel.Composition.ImportCardinalityMismatchException
-System.ComponentModel.Composition.Hosting.AggregateCatalog
-System.ComponentModel.Composition.Hosting.ApplicationCatalog
-System.ComponentModel.Composition.Hosting.AssemblyCatalog
-System.ComponentModel.Composition.Hosting.CompositionContainer
-System.ComponentModel.Composition.Primitives.ComposablePartException
-System.ComponentModel.Composition.Primitives.ExportDefinition
-System.ComponentModel.Composition.Primitives.ImportDefinition
-System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices</PackageDescription>
   </PropertyGroup>
 </Project>

src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.ComponentModel.Composition.csproj">
-      <SupportedFramework>uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.ComponentModel.Composition.csproj" />
-    <InboxOnTargetFramework Include="net461">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <InboxOnTargetFramework Include="uap10.0.16299" />
-    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj

@@ -3,6 +3,27 @@
     <TargetFrameworks>$(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <SetIsTrimmable>false</SetIsTrimmable>
+    <IsPackable>true</IsPackable>
+    <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
+    <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
+    <PackageDescription>This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.
+
+Commonly Used Types:
+System.ComponentModel.Composition.ChangeRejectedException
+System.ComponentModel.Composition.CompositionContractMismatchException
+System.ComponentModel.Composition.CompositionError
+System.ComponentModel.Composition.CompositionException
+System.ComponentModel.Composition.ExportAttribute
+System.ComponentModel.Composition.ImportAttribute
+System.ComponentModel.Composition.ImportCardinalityMismatchException
+System.ComponentModel.Composition.Hosting.AggregateCatalog
+System.ComponentModel.Composition.Hosting.ApplicationCatalog
+System.ComponentModel.Composition.Hosting.AssemblyCatalog
+System.ComponentModel.Composition.Hosting.CompositionContainer
+System.ComponentModel.Composition.Primitives.ComposablePartException
+System.ComponentModel.Composition.Primitives.ExportDefinition
+System.ComponentModel.Composition.Primitives.ImportDefinition
+System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -211,4 +232,8 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Text.Encoding.Extensions" />
   </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props

 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <StrongNameKeyId>Open</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
     <UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
-    <PackageDescription>Provides types that support using configuration files.
-
-Commonly Used Types:
-System.Configuration.Configuration
-System.Configuration.ConfigurationManager</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Configuration.ConfigurationManager.csproj">
-      <SupportedFramework>netcoreapp2.0;net461;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.Configuration.ConfigurationManager/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.Configuration.ConfigurationManager.dll</Left>
+    <Right>lib/net461/System.Configuration.ConfigurationManager.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj

@@ -4,10 +4,16 @@
     <!-- opt-out of trimming until it works https://github.com/dotnet/runtime/issues/49062 -->
     <SetIsTrimmable>false</SetIsTrimmable>
     <NoWarn>$(NoWarn);CA1847</NoWarn>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides types that support using configuration files.
+
+Commonly Used Types:
+System.Configuration.Configuration
+System.Configuration.ConfigurationManager</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
-    <IsPartialFacadeAssembly Condition="'$(TargetFramework)' == 'net461'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="System\Configuration\DictionarySectionHandler.cs" />
@@ -255,6 +261,10 @@
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs"
              Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))" />
   </ItemGroup>
+  <!-- Since this package is compatible with .NETStandard, it must also ensure its .NETFramework and .NETCoreApp behavior is compatible with its .NETStandard behavior.-->
+  <ItemGroup>
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <Reference Include="System.Collections" />
     <Reference Include="System.Collections.NonGeneric" />
@@ -285,9 +295,11 @@
   </ItemGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\src\System.Security.Permissions.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System.Configuration" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj

@@ -102,7 +102,9 @@
   <ItemGroup>
     <ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="System.Configuration" />
+    <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>

src/libraries/System.Data.Odbc/Directory.Build.props

@@ -4,15 +4,5 @@
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
     <UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
-    <PackageDescription>Provides a collection of classes used to access an ODBC data source in the managed space
-
-Commonly Used Types:
-System.Data.Odbc.OdbcCommand
-System.Data.Odbc.OdbcConnection
-System.Data.Odbc.OdbcDataReader
-System.Data.Odbc.OdbcDataAdapter
-System.Data.Odbc.OdbcParameter
-System.Data.Odbc.OdbcParameterCollection
-System.Data.Odbc.OdbcTransaction</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Data.Odbc.csproj">
-      <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Data.Odbc.csproj" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.Data.Odbc/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/net461/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/freebsd/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/illumos/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/illumos/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/ios/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/ios/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/linux/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/linux/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/osx/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/osx/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/solaris/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/solaris/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/tvos/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/tvos/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/win/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/net6.0/System.Data.Odbc.dll</Left>
+    <Right>runtimes/win/lib/net6.0/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/freebsd/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/linux/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/osx/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>lib/netcoreapp3.1/System.Data.Odbc.dll</Left>
+    <Right>runtimes/win/lib/netcoreapp3.1/System.Data.Odbc.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Data.Odbc.ODBC32</Target>
+    <Left>runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>runtimes/freebsd/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Data.Odbc.ODBC32</Target>
+    <Left>runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>runtimes/linux/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Data.Odbc.ODBC32</Target>
+    <Left>runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>runtimes/osx/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Data.Odbc.ODBC32</Target>
+    <Left>runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.get_Offset</Target>
+    <Left>runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:System.Data.Odbc.OdbcParameter.set_Offset(System.Int32)</Target>
+    <Left>runtimes/win/lib/netcoreapp2.0/System.Data.Odbc.dll</Left>
+    <Right>lib/netstandard2.0/System.Data.Odbc.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj

 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461-windows</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-FreeBSD;$(NetCoreAppCurrent)-illumos;$(NetCoreAppCurrent)-Solaris;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-FreeBSD;netcoreapp3.1-Linux;netcoreapp3.1-OSX;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CA2249;CA1838</NoWarn>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides a collection of classes used to access an ODBC data source in the managed space
+
+Commonly Used Types:
+System.Data.Odbc.OdbcCommand
+System.Data.Odbc.OdbcConnection
+System.Data.Odbc.OdbcDataReader
+System.Data.Odbc.OdbcDataAdapter
+System.Data.Odbc.OdbcParameter
+System.Data.Odbc.OdbcParameterCollection
+System.Data.Odbc.OdbcTransaction</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
-    <IsPartialFacadeAssembly Condition="$(TargetFramework.StartsWith('net4'))">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly>
     <!-- https://github.com/dotnet/arcade/issues/5717 -->
     <NoWarn Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">$(NoWarn);SA1121</NoWarn>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsAnyOS)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">SR.Odbc_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
@@ -166,4 +177,7 @@
     <Reference Include="System.Transactions.Local" />
     <Reference Include="System.Xml.ReaderWriter" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Data.OleDb/Directory.Build.props

@@ -2,16 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides a collection of classes for OLEDB.
-
-Commonly Used Types:
-System.Data.OleDb.OleDbCommand
-System.Data.OleDb.OleDbCommandBuilder
-System.Data.OleDb.OleDbConnection
-System.Data.OleDb.OleDbDataAdapter
-System.Data.OleDb.OleDbDataReader
-System.Data.OleDb.OleDbParameter
-System.Data.OleDb.OleDbParameterCollection
-System.Data.OleDb.OleDbTransaction</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Data.OleDb/pkg/System.Data.OleDb.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Data.OleDb.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Data.OleDb.csproj" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.Data.OleDb/ref/System.Data.OleDb.csproj

@@ -22,10 +22,10 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" />
     <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Permissions\ref\System.Security.Permissions.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Data.OleDb/src/CompatibilitySuppressions.xml

+<?xml version="1.0"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.Data.OleDb.dll</Left>
+    <Right>lib/net461/System.Data.OleDb.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj

@@ -10,6 +10,18 @@
     <NoWarn>$(NoWarn);SYSLIB0004</NoWarn>
     <!-- Suppress CA1845: Use span-based 'string.Concat' and 'AsSpan' instead of 'Substring' to avoid ifdefs. -->
     <NoWarn>$(NoWarn);CA1845</NoWarn>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides a collection of classes for OLEDB.
+
+Commonly Used Types:
+System.Data.OleDb.OleDbCommand
+System.Data.OleDb.OleDbCommandBuilder
+System.Data.OleDb.OleDbConnection
+System.Data.OleDb.OleDbDataAdapter
+System.Data.OleDb.OleDbDataReader
+System.Data.OleDb.OleDbParameter
+System.Data.OleDb.OleDbParameterCollection
+System.Data.OleDb.OleDbTransaction</PackageDescription>
   </PropertyGroup>
 
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
@@ -141,7 +153,12 @@
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" PrivateAssets="all" />
+    <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. -->
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
   </ItemGroup>
 </Project>

src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props

@@ -2,10 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
-    <PackageDescription>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools)
-
-Commonly Used Types:
-System.Diagnostics.DiagnosticListener
-System.Diagnostics.DiagnosticSource</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\System.Diagnostics.DiagnosticSource.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    
-    <!-- Since UAP and .NETCoreApp are package based we still want to enable
-         OOBing libraries that happen to overlap with their framework package.
-         This avoids us having to lock the API in our NuGet packages just 
-         to match what shipped inbox: since we can provide a new library 
-         we can update it to add API without raising the netstandard version. -->
-    <ValidatePackageSuppression Include="TreatAsOutOfBox">
-      <Value>.NETCoreApp;UAP</Value>
-    </ValidatePackageSuppression>
-
-    <!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
-    <ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore45;netcore451;netcore50;uap10.0;wp8;wpa81;net45;net451;net46" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.Diagnostics.DiagnosticSource/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETFramework,Version=v4.5</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETFramework,Version=v4.6</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v1.1</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v1.3</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETPortable,Version=v0.0,Profile=Profile111</Target>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj

@@ -5,6 +5,12 @@
     <NoWarn>$(NoWarn);SA1205;CA1845</NoWarn>
     <Nullable>enable</Nullable>
     <TargetFrameworks>$(NetCoreAppCurrent);net5.0;netstandard2.0;net461</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools)
+
+Commonly Used Types:
+System.Diagnostics.DiagnosticListener
+System.Diagnostics.DiagnosticSource</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -120,4 +126,7 @@
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Diagnostics.EventLog/Directory.Build.props

@@ -4,9 +4,5 @@
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsAspNetCoreApp>true</IsAspNetCoreApp>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides the System.Diagnostics.EventLog class, which allows the applications to use the windows event log service.
-
-Commonly Used Types:
-System.Diagnostics.EventLog</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Diagnostics.EventLog.csproj">
-      <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> 
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Diagnostics.EventLog.csproj" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.Diagnostics.EventLog/ref/System.Diagnostics.EventLog.csproj

@@ -19,4 +19,7 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.InteropServices" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" PrivateAssets="all" />
+  </ItemGroup>
 </Project>

src/libraries/System.Diagnostics.EventLog/src/CompatibilitySuppressions.xml

+<?xml version="1.0"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.Diagnostics.EventLog.dll</Left>
+    <Right>lib/net461/System.Diagnostics.EventLog.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj

@@ -3,10 +3,15 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1838;CA1847</NoWarn>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides the System.Diagnostics.EventLog class, which allows the applications to use the windows event log service.
+
+Commonly Used Types:
+System.Diagnostics.EventLog</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
-    <IsPartialFacadeAssembly Condition="'$(TargetFramework)' == 'net461'">true</IsPartialFacadeAssembly>
+    <IsPartialFacadeAssembly Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetsWindows)' != 'true'">SR.PlatformNotSupported_EventLog</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
@@ -103,12 +108,13 @@
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\UnconditionalSuppressMessageAttribute.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Threading.AccessControl\src\System.Threading.AccessControl.csproj" />
     <Reference Include="netstandard" Condition="$(TargetFramework.StartsWith('netcoreapp3.1'))" />
     <Reference Include="Microsoft.Win32.Primitives" />
     <Reference Include="Microsoft.Win32.Registry" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" />
@@ -133,15 +139,15 @@
     <Reference Include="System.Threading.ThreadPool" />
     <Reference Include="System.Threading.Overlapped" />
   </ItemGroup>
-  <!-- Ensure we run ResolveProjectReferences to add the message DLL to the package.
-       We do this here rather than in the pkgproj to ensure the package paths are in sync -->
+
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <ProjectReference Include="Messages\System.Diagnostics.EventLog.Messages.csproj"
                       ReferenceOutputAssembly="false"
-                      OutputItemType="AdditionalFileToPackage"  />
+                      OutputItemType="TfmRuntimeSpecificPackageFile"
+                      PrivateAssets="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
   </ItemGroup>
-  <Target Name="AddMessagesToPackage"
-          Condition="'$(TargetsWindows)' == 'true'"
-          DependsOnTargets="ResolveProjectReferences"
-          BeforeTargets="GetFilesToPackage" />
 </Project>

src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml

@@ -3,121 +3,6 @@
   <!-- These types are forwarded on net461 https://github.com/dotnet/sdk/issues/18203-->
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.CounterCreationData</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.CounterCreationDataCollection</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.CounterSample</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.CounterSampleCalculator</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.ICollectData</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.InstanceData</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.InstanceDataCollection</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.InstanceDataCollectionCollection</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceCounter</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceCounterCategory</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceCounterCategoryType</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceCounterInstanceLifetime</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceCounterManager</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceCounterType</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceData.CounterData</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceData.CounterSet</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceData.CounterSetInstance</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceData.CounterSetInstanceCounterDataSet</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceData.CounterSetInstanceType</Target>
-    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
-    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:System.Diagnostics.PerformanceData.CounterType</Target>
     <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
     <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
   </Suppression>

src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props

@@ -7,6 +7,5 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides uniform access and manipulation of user, computer, and group security principals across the multiple principal stores: Active Directory Domain Services (AD DS), Active Directory Lightweight Directory Services (AD LDS), and Machine SAM (MSAM).</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.DirectoryServices.AccountManagement.csproj">
-      <SupportedFramework>uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.DirectoryServices.AccountManagement.csproj" />
-    <InboxOnTargetFramework Include="net461">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <File Include="$(PlaceHolderFile)">
-      <TargetPath>runtimes/win/lib/net461</TargetPath>
-    </File>
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj

@@ -5,6 +5,10 @@
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CA2249</NoWarn>
+    <IsPackable>true</IsPackable>
+    <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
+    <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
+    <PackageDescription>Provides uniform access and manipulation of user, computer, and group security principals across the multiple principal stores: Active Directory Domain Services (AD DS), Active Directory Lightweight Directory Services (AD LDS), and Machine SAM (MSAM).</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -121,4 +125,7 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Xml.ReaderWriter" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.DirectoryServices.Protocols/Directory.Build.props

@@ -8,6 +8,5 @@
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
     <UnsupportedOSPlatforms>browser;android;ios;tvos</UnsupportedOSPlatforms>
-    <PackageDescription>Provides the methods defined in the Lightweight Directory Access Protocol (LDAP) version 3 (V3) and Directory Services Markup Language (DSML) version 2.0 (V2) standards.</PackageDescription>
   </PropertyGroup>
 </Project>

src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.DirectoryServices.Protocols.csproj">
-      <SupportedFramework>uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.DirectoryServices.Protocols.csproj" />
-
-    <InboxOnTargetFramework Include="net461">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <File Include="$(PlaceHolderFile)">
-      <TargetPath>runtimes/win/lib/net461</TargetPath>
-    </File>
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj

@@ -3,6 +3,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-OSX;netcoreapp3.1-Linux;netcoreapp3.1;netstandard2.0</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
+    <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
+    <PackageDescription>Provides the methods defined in the Lightweight Directory Access Protocol (LDAP) version 3 (V3) and Directory Services Markup Language (DSML) version 2.0 (V2) standards.</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -106,4 +110,7 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Xml.ReaderWriter" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.DirectoryServices/Directory.Build.props

@@ -7,16 +7,5 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides easy access to Active Directory Domain Services.
-
-Commonly Used Types:
-System.DirectoryServices.DirectoryEntry
-System.DirectoryServices.DirectorySearcher
-System.DirectoryServices.ActiveDirectory.ActiveDirectorySite
-System.DirectoryServices.ActiveDirectory.ApplicationPartition
-System.DirectoryServices.ActiveDirectory.DirectoryContext
-System.DirectoryServices.ActiveDirectory.DirectoryServer
-System.DirectoryServices.ActiveDirectory.Domain
-System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.DirectoryServices.csproj">
-      <SupportedFramework>uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.DirectoryServices.csproj" />
-    
-    <InboxOnTargetFramework Include="net461">
-      <AsFrameworkReference>true</AsFrameworkReference>
-    </InboxOnTargetFramework>
-    <File Include="$(PlaceHolderFile)">
-      <TargetPath>runtimes/win/lib/net461</TargetPath>
-    </File>
-
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj

@@ -32,7 +32,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <!-- Manually reference the transitive dependency to make NuGet pick the package over the transitive project: https://github.com/NuGet/Home/issues/10368 -->
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj

@@ -4,6 +4,20 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
+    <AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
+    <PackageDescription>Provides easy access to Active Directory Domain Services.
+
+Commonly Used Types:
+System.DirectoryServices.DirectoryEntry
+System.DirectoryServices.DirectorySearcher
+System.DirectoryServices.ActiveDirectory.ActiveDirectorySite
+System.DirectoryServices.ActiveDirectory.ApplicationPartition
+System.DirectoryServices.ActiveDirectory.DirectoryContext
+System.DirectoryServices.ActiveDirectory.DirectoryServer
+System.DirectoryServices.ActiveDirectory.Domain
+System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -176,4 +190,7 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Drawing.Common/Directory.Build.props

@@ -3,16 +3,5 @@
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <SupportedOSPlatforms>windows</SupportedOSPlatforms>
-    <PackageDescription>Provides access to GDI+ graphics functionality.
-
-Commonly Used Types:
-System.Drawing.Bitmap
-System.Drawing.BitmapData
-System.Drawing.Brush
-System.Drawing.Font
-System.Drawing.Graphics
-System.Drawing.Icon
-
-Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows for more information.</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Drawing.Common.csproj">
-      <SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Drawing.Common.csproj" />
-    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.Drawing.Common/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
+    <Right>lib/net461/System.Drawing.Common.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Drawing.ColorTranslator</Target>
+    <Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
+    <Right>lib/netcoreapp3.1/System.Drawing.Common.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Drawing.SystemColors</Target>
+    <Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
+    <Right>lib/netcoreapp3.1/System.Drawing.Common.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file

src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj

@@ -7,6 +7,19 @@
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1-Unix;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <AddXamarinPlaceholderFilesToPackage>true</AddXamarinPlaceholderFilesToPackage>
+    <PackageDescription>Provides access to GDI+ graphics functionality.
+
+Commonly Used Types:
+System.Drawing.Bitmap
+System.Drawing.BitmapData
+System.Drawing.Brush
+System.Drawing.Font
+System.Drawing.Graphics
+System.Drawing.Icon
+
+Unix support is disabled by default. See https://aka.ms/systemdrawingnonwindows for more information.</PackageDescription>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -404,4 +417,7 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Text.Encoding.Extensions" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Formats.Asn1/Directory.Build.props

-<Project>
-  <Import Project="..\Directory.Build.props" />
-  <PropertyGroup>
-    <StrongNameKeyId>Open</StrongNameKeyId>
-    <PackageDescription>Provides classes that can read and write the ASN.1 BER, CER, and DER data formats.
-
-Commonly Used Types:
-System.Formats.Asn1.AsnReader
-System.Formats.Asn1.AsnWriter</PackageDescription>
-  </PropertyGroup>
-</Project>

src/libraries/System.Formats.Asn1/pkg/System.Formats.Asn1.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\System.Formats.Asn1.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj

@@ -3,6 +3,12 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
     <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides classes that can read and write the ASN.1 BER, CER, and DER data formats.
+
+Commonly Used Types:
+System.Formats.Asn1.AsnReader
+System.Formats.Asn1.AsnWriter</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
@@ -59,10 +65,14 @@
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
+    <!-- S.R.C.Unsafe isn't a primary but transitive dependency and this P2P makes sure that the live version is used. -->
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System.Numerics" />
     <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 </Project>

src/libraries/System.Formats.Cbor/Directory.Build.props

-<Project>
-  <Import Project="..\Directory.Build.props" />
-  <PropertyGroup>
-    <PackageDescription>Provides classes that can read and write the CBOR data format.
-
-Commonly Used Types:
-System.Formats.Cbor.CborReader
-System.Formats.Cbor.CborWriter</PackageDescription>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

src/libraries/System.Formats.Cbor/pkg/System.Formats.Cbor.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\src\System.Formats.Cbor.csproj">
-      <SupportedFramework>net5.0</SupportedFramework>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>

src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj

@@ -3,6 +3,12 @@
     <TargetFrameworks>$(NetCoreAppCurrent);net5.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides classes that can read and write the CBOR data format.
+
+Commonly Used Types:
+System.Formats.Cbor.CborReader
+System.Formats.Cbor.CborWriter</PackageDescription>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs" Link="Common\System\Memory\PointerMemoryManager.cs" />
@@ -31,14 +37,14 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Collections" />
     <Reference Include="System.Buffers" />
+    <Reference Include="System.Collections" />
     <Reference Include="System.Memory" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe" />
     <Reference Include="System.Runtime.Numerics" />
     <Reference Include="System.Security.Cryptography.Algorithms" />
-    <Reference Include="System.Threading" />
     <Reference Include="System.Text.Encoding.Extensions" />
+    <Reference Include="System.Threading" />
   </ItemGroup>
 </Project>

src/libraries/System.IO.Packaging/Directory.Build.props

@@ -2,6 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
-    <PackageDescription>Provides classes that support storage of multiple data objects in a single container.</PackageDescription>
   </PropertyGroup>
 </Project>
\ No newline at end of file

src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj

-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.IO.Packaging.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.IO.Packaging.csproj" />
-
-    <!-- Exclude TFMs that aren't supported by the package anymore from validation. -->
-    <ExcludeHarvestedSupportedFramework Include="netcoreapp1.0;netcoreapp1.1;netcore50;uap10.0;net46" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

src/libraries/System.IO.Packaging/src/CompatibilitySuppressions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Left>lib/netstandard2.0/System.IO.Packaging.dll</Left>
+    <Right>lib/net461/System.IO.Packaging.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETFramework,Version=v4.6</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETStandard,Version=v1.3</Target>
+  </Suppression>
+</Suppressions>
\ No newline at end of file