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
carlossanlop · Aug 5, 2021 · 91bf612 · 91bf612
1 parent a9dcbb9
commit 91bf612
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 28 deletions.
diff --git 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
diff --git a/src/CompatibilitySuppressions.xml 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>
diff --git 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"