Merge branch 'master' into fixes/textProcessingBugs

4 years ago · b4f2c92d1f
1 changed files with 2 additions and 1 deletions
--- a/build/System.Drawing.Common.props
+++ b/build/System.Drawing.Common.props
@ -1,5 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
+    <PackageReference Condition="'$(TargetFramework)'!='netstandard2.0'" Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Condition="'$(TargetFramework)'=='netstandard2.0'" Include="System.Drawing.Common" Version="4.5.0" />
  </ItemGroup>
 </Project>