Skip to content

Commit

Permalink
Replace all remaining pkgprojs with NuGet Pack task (dotnet/runtime#5…
Browse files Browse the repository at this point in the history
…6712)

* 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

Commit migrated from dotnet/runtime@503ae51
  • Loading branch information
ViktorHofer authored Aug 5, 2021
1 parent b5cc83b commit 14ade70
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 23 deletions.
11 changes: 0 additions & 11 deletions src/System.Drawing.Common/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 0 additions & 12 deletions src/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj

This file was deleted.

20 changes: 20 additions & 0 deletions src/System.Drawing.Common/src/CompatibilitySuppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?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>
16 changes: 16 additions & 0 deletions src/System.Drawing.Common/src/System.Drawing.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

0 comments on commit 14ade70

Please sign in to comment.