Skip to content

Commit

Permalink
Use System.Drawing.Primitives
Browse files Browse the repository at this point in the history
  • Loading branch information
YoshiRulz committed Jul 26, 2024
1 parent 413fd40 commit 7b644f7
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
<PackageVersion Include="System.Drawing.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<ItemGroup>
<PackageReference Include="Cyotek.Drawing.BitmapFont" />
<PackageReference Include="ImGui.NET" ExcludeAssets="native" />
<PackageReference Include="System.Drawing.Common" />
<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
<PackageReference Include="System.Drawing.Primitives" />
<PackageReference Include="Silk.NET.OpenGL" />
<PackageReference Include="Silk.NET.WGL.Extensions.NV" />
<PackageReference Include="ppy.SDL2-CS" ExcludeAssets="native;contentFiles" />
Expand Down
1 change: 1 addition & 0 deletions src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PackageReference Include="Microsoft.Data.Sqlite.Core" />
<PackageReference Include="SharpCompress" />
<PackageReference Include="SQLitePCLRaw.provider.e_sqlite3" />
<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
<EmbeddedResource Include="Resources/**/*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" />
<PackageReference Include="System.Drawing.Common" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
<EmbeddedResource Include="res/**/*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Drawing.Common" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
</ItemGroup>
</Project>

2 comments on commit 7b644f7

@Morilli
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the advantage of this?

@YoshiRulz
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Until today there was some explanation of this on #2261, but in short there is no benefit. MS just hates Mono users.

Please sign in to comment.