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 · ab47108 · ab47108
1 parent b4d7c85
commit ab47108
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/pkg/Microsoft.IO.Redist.pkgproj b/pkg/Microsoft.IO.Redist.pkgproj
diff --git a/src/Microsoft.IO.Redist.csproj b/src/Microsoft.IO.Redist.csproj
@@ -1,12 +1,20 @@
 <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>