Merge pull request dotnet/runtime#78354 from carlossanlop/Net8Changes…

…SecondAttempt Update assembly version from hardcoded to MajorVersion and update NetCoreAppCurrent to net8.0 Commit migrated from dotnet/runtime@315f4ab
dotnet · Dec 5, 2022 · c582503 · c582503
2 parents 64dfe0b + 0329d43
commit c582503
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 51 deletions.
diff --git a/src/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/System.Drawing.Common/ref/System.Drawing.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
   </PropertyGroup>
 

diff --git a/src/System.Drawing.Common/src/CompatibilitySuppressions.xml b/src/System.Drawing.Common/src/CompatibilitySuppressions.xml
@@ -30,55 +30,6 @@
     <Left>lib/netstandard2.0/System.Drawing.Common.dll</Left>
     <Right>lib/net462/System.Drawing.Common.dll</Right>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Drawing2D.Matrix.#ctor(System.Numerics.Matrix3x2)</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Drawing2D.Matrix.get_MatrixElements</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Drawing2D.Matrix.set_MatrixElements(System.Numerics.Matrix3x2)</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Graphics.get_TransformElements</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Graphics.GetContextInfo(System.Drawing.PointF@,System.Drawing.Region@)</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Graphics.GetContextInfo(System.Drawing.PointF@)</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:System.Drawing.Graphics.set_TransformElements(System.Numerics.Matrix3x2)</Target>
-    <Left>lib/netcoreapp3.1/System.Drawing.Common.dll</Left>
-    <Right>lib/netstandard2.0/System.Drawing.Common.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:System.Drawing.Imaging.Encoder.ColorSpace</Target>

diff --git a/src/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppPrevious)-windows;$(NetCoreAppPrevious);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);DRAWING_NAMESPACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>