Skip to content

Fuse.Drawing.Surface: update assembly references for .NET 6.0 (beta-3.0) #1476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2023
Merged

Fuse.Drawing.Surface: update assembly references for .NET 6.0 (beta-3.0) #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/Fuse.Drawing.Surface/DotNet.uxl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Extensions Backend="CIL">
<Require Assembly="System.Drawing" />
<Require Assembly="System.Windows.Forms" />
</Extensions>
<Require Assembly="System.Drawing.Common/lib/net6.0/System.Drawing.Common.dll" />
<Require Condition="HOST_WINDOWS" Assembly="System.Windows.Forms" />
</Extensions>
11 changes: 1 addition & 10 deletions Source/Fuse.Drawing.Surface/DotNetSurface.uno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ namespace Fuse.Drawing
}
}

[Require("Assembly", "System.Drawing")]
[extern(DOTNET) Require("Source.Include","XliPlatform/GL.h")]
[extern(DOTNET) Require("Source.Include", "XliPlatform/GL.h")]
extern(DOTNET)
internal class DotNetSurface : Surface
{
Expand Down Expand Up @@ -996,7 +995,6 @@ namespace Fuse.Drawing

namespace DotNetNative
{

[DotNetType("System.Drawing.Imaging.ImageFormat")]
extern(DOTNET) internal class ImageFormat
{
Expand Down Expand Up @@ -1072,7 +1070,6 @@ namespace Fuse.Drawing
public override extern void Dispose();
}


[DotNetType("System.Drawing.Drawing2D.LinearGradientBrush")]
extern(DOTNET) internal class LinearGradientBrush : DotNetBrush
{
Expand All @@ -1098,7 +1095,6 @@ namespace Fuse.Drawing
public override extern void Dispose();
}


[DotNetType("System.Drawing.SolidBrush")]
extern(DOTNET) internal class SolidBrush : DotNetBrush
{
Expand Down Expand Up @@ -1137,7 +1133,6 @@ namespace Fuse.Drawing
// constructors
public extern BitmapData();


// properties
public extern int Height { get; set; }
public extern PixelFormat PixelFormat { get; set; }
Expand All @@ -1146,7 +1141,6 @@ namespace Fuse.Drawing
public extern int Width { get; set; }
}


[DotNetType("System.Drawing.Graphics")]
extern(DOTNET) internal class DotNetGraphics
{
Expand Down Expand Up @@ -1258,7 +1252,6 @@ namespace Fuse.Drawing
public extern byte G { get; }
public extern byte B { get; }


public static extern Color Blue { get; }
public static extern Color Black { get; }
public static extern Color Orange { get; }
Expand Down Expand Up @@ -1296,7 +1289,6 @@ namespace Fuse.Drawing
// constructors
public extern PointF(float x, float y);


// properties
public extern bool IsEmpty { get; }
public extern float X { get; set; }
Expand Down Expand Up @@ -1344,7 +1336,6 @@ namespace Fuse.Drawing
public extern Pen(Color c);
public extern Pen(Color c, float width);


// properties
public extern DotNetBrush Brush { get; set; }
public extern Color Color { get; set; }
Expand Down
3 changes: 3 additions & 0 deletions Source/Fuse.Drawing.Surface/System.Drawing.Common.stuff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
if CIL {
System.Drawing.Common: "https://www.nuget.org/api/v2/package/System.Drawing.Common/6.0.0"
}
2 changes: 1 addition & 1 deletion Source/Fuse.ImageTools/DotNet.uxl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Extensions Backend="CIL">
<Require Assembly="System.Drawing" />
<Require Assembly="System.Drawing.Common/lib/net6.0/System.Drawing.Common.dll" />
</Extensions>
1 change: 0 additions & 1 deletion Source/Fuse.ImageTools/DotNetImageUtils.uno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ namespace Fuse.ImageTools

namespace DotNetNative
{
[Require("Assembly", "System.Drawing")]
[DotNetType("System.Drawing.Image")]
extern(DOTNET) internal class DotNetImage
{
Expand Down
3 changes: 3 additions & 0 deletions Source/Fuse.ImageTools/System.Drawing.Common.stuff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
if CIL {
System.Drawing.Common: "https://www.nuget.org/api/v2/package/System.Drawing.Common/6.0.0"
}
3 changes: 1 addition & 2 deletions Source/Fuse.Nodes/Tests/DrawRectsTest/DefineDrawRects.cil.uxl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Extensions Backend="CIL">
<Define FUSELIBS_DEBUG_DRAW_RECTS />

<Require Assembly="System.Windows.Forms" />
<Require Condition="HOST_WINDOWS" Assembly="System.Windows.Forms" />
</Extensions>
6 changes: 3 additions & 3 deletions Source/Fuse.Nodes/Tests/DrawRectsTest/DrawRects.Test.uno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,15 +336,15 @@ namespace DrawRectsTest
}
}

extern(DOTNET) static class MessagePumper
extern(DOTNET && HOST_WINDOWS) static class MessagePumper
{
public static void PumpMessages()
{
DotNetNative.Application.DoEvents();
}
}

extern(!DOTNET) static class MessagePumper
extern(!DOTNET || !HOST_WINDOWS) static class MessagePumper
{
public static void PumpMessages()
{
Expand Down Expand Up @@ -499,7 +499,7 @@ namespace DrawRectsTest
namespace DotNetNative
{
[DotNetType("System.Windows.Forms.Application")]
extern(DOTNET) public class Application
extern(DOTNET && HOST_WINDOWS) public class Application
{
public extern static void DoEvents();
}
Expand Down