From 91bf61262bfe90378e2072dba1b5a3a079d6fb54 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Aug 2021 11:03:23 +0200
Subject: [PATCH] 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                         |  4 ----
 ...em.Runtime.CompilerServices.Unsafe.pkgproj | 24 -------------------
 src/CompatibilitySuppressions.xml             | 11 +++++++++
 ...tem.Runtime.CompilerServices.Unsafe.ilproj |  8 +++++++
 4 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
 create mode 100644 src/CompatibilitySuppressions.xml

diff --git a/Directory.Build.props b/Directory.Build.props
index efa9bc2f8..e8d65546d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,9 +2,5 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
-    <PackageDescription>Provides the System.Runtime.CompilerServices.Unsafe class, which provides generic, low-level functionality for manipulating pointers.
-
-Commonly Used Types:
-System.Runtime.CompilerServices.Unsafe</PackageDescription>
   </PropertyGroup>
 </Project>
diff --git a/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
deleted file mode 100644
index 90d23508d..000000000
--- a/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <PackageIndex Include="$(PkgDir)baseline\packageBaseline.1.1.json" />
-    <ProjectReference Include="..\ref\System.Runtime.CompilerServices.Unsafe.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
-
-    <!-- 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" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file
diff --git a/src/CompatibilitySuppressions.xml b/src/CompatibilitySuppressions.xml
new file mode 100644
index 000000000..df781eabe
--- /dev/null
+++ b/src/CompatibilitySuppressions.xml
@@ -0,0 +1,11 @@
+<?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>.NETStandard,Version=v1.0</Target>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>PKV006</DiagnosticId>
+    <Target>.NETFramework,Version=v4.5</Target>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/System.Runtime.CompilerServices.Unsafe.ilproj
index d742a0bf2..db5ffe9e0 100644
--- a/src/System.Runtime.CompilerServices.Unsafe.ilproj
+++ b/src/System.Runtime.CompilerServices.Unsafe.ilproj
@@ -7,6 +7,11 @@
     <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateVersionFile</CoreCompileDependsOn>
     <DocumentationFile>$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe.xml</DocumentationFile>
     <IlasmFlags>$(IlasmFlags) -DEBUG=$(DebugOptimization)</IlasmFlags>
+    <IsPackable>true</IsPackable>
+    <PackageDescription>Provides the System.Runtime.CompilerServices.Unsafe class, which provides generic, low-level functionality for manipulating pointers.
+
+Commonly Used Types:
+System.Runtime.CompilerServices.Unsafe</PackageDescription>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETCoreApp'">
     <ExtraMacros>#define netcoreapp</ExtraMacros>
@@ -27,6 +32,9 @@
     <Reference Include="$(CoreAssembly)"
                Condition="'$(TargetFramework)' != 'netstandard2.0'" />
   </ItemGroup>
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
+  </ItemGroup>
 
   <Target Name="GenerateVersionFile"
           DependsOnTargets="GetAssemblyVersion;ResolveReferences"