Merge pull request #1476 from mortend/net6-drawing

mortend · web-flow · commit 888fca1b66f3 · 2023-07-21T01:17:48.000+02:00
Fuse.Drawing.Surface: update assembly references for .NET 6.0 (beta-3.0)
diff --git a/Source/Fuse.Drawing.Surface/DotNet.uxl b/Source/Fuse.Drawing.Surface/DotNet.uxl
@@ -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>
diff --git a/Source/Fuse.Drawing.Surface/DotNetSurface.uno b/Source/Fuse.Drawing.Surface/DotNetSurface.uno
@@ -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
 	{
@@ -996,7 +995,6 @@ namespace Fuse.Drawing
 
 	namespace DotNetNative
 	{
-
 		[DotNetType("System.Drawing.Imaging.ImageFormat")]
 		extern(DOTNET) internal class ImageFormat
 		{
@@ -1072,7 +1070,6 @@ namespace Fuse.Drawing
 			public override extern void Dispose();
 		}
 
-
 		[DotNetType("System.Drawing.Drawing2D.LinearGradientBrush")]
 		extern(DOTNET) internal class LinearGradientBrush : DotNetBrush
 		{
@@ -1098,7 +1095,6 @@ namespace Fuse.Drawing
 			public override extern void Dispose();
 		}
 
-
 		[DotNetType("System.Drawing.SolidBrush")]
 		extern(DOTNET) internal class SolidBrush : DotNetBrush
 		{
@@ -1137,7 +1133,6 @@ namespace Fuse.Drawing
 			// constructors
 			public extern BitmapData();
 
-
 			// properties
 			public extern int Height { get; set; }
 			public extern PixelFormat PixelFormat { get; set; }
@@ -1146,7 +1141,6 @@ namespace Fuse.Drawing
 			public extern int Width { get; set; }
 		}
 
-
 		[DotNetType("System.Drawing.Graphics")]
 		extern(DOTNET) internal class DotNetGraphics
 		{
@@ -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; }
@@ -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; }
@@ -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; }
diff --git a/Source/Fuse.Drawing.Surface/System.Drawing.Common.stuff b/Source/Fuse.Drawing.Surface/System.Drawing.Common.stuff
@@ -0,0 +1,3 @@
+if CIL {
+    System.Drawing.Common: "https://www.nuget.org/api/v2/package/System.Drawing.Common/6.0.0"
+}
diff --git a/Source/Fuse.ImageTools/DotNet.uxl b/Source/Fuse.ImageTools/DotNet.uxl
@@ -1,3 +1,3 @@
 <Extensions Backend="CIL">
-    <Require Assembly="System.Drawing" />
+	<Require Assembly="System.Drawing.Common/lib/net6.0/System.Drawing.Common.dll" />
 </Extensions>
diff --git a/Source/Fuse.ImageTools/DotNetImageUtils.uno b/Source/Fuse.ImageTools/DotNetImageUtils.uno
@@ -43,7 +43,6 @@ namespace Fuse.ImageTools
 
 	namespace DotNetNative
 	{
-		[Require("Assembly", "System.Drawing")]
 		[DotNetType("System.Drawing.Image")]
 		extern(DOTNET) internal class DotNetImage
 		{
diff --git a/Source/Fuse.ImageTools/System.Drawing.Common.stuff b/Source/Fuse.ImageTools/System.Drawing.Common.stuff
@@ -0,0 +1,3 @@
+if CIL {
+    System.Drawing.Common: "https://www.nuget.org/api/v2/package/System.Drawing.Common/6.0.0"
+}
diff --git a/Source/Fuse.Nodes/Tests/DrawRectsTest/DefineDrawRects.cil.uxl b/Source/Fuse.Nodes/Tests/DrawRectsTest/DefineDrawRects.cil.uxl
@@ -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>
diff --git a/Source/Fuse.Nodes/Tests/DrawRectsTest/DrawRects.Test.uno b/Source/Fuse.Nodes/Tests/DrawRectsTest/DrawRects.Test.uno
@@ -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()
 			{
@@ -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();
 		}

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,7 @@ namespace Fuse.Drawing`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`- [Require("Assembly", "System.Drawing")]`
`125`		`- [extern(DOTNET) Require("Source.Include","XliPlatform/GL.h")]`
	`124`	`+ [extern(DOTNET) Require("Source.Include", "XliPlatform/GL.h")]`
`126`	`125`	`extern(DOTNET)`
`127`	`126`	`internal class DotNetSurface : Surface`
`128`	`127`	`{`
`@@ -996,7 +995,6 @@ namespace Fuse.Drawing`
`996`	`995`
`997`	`996`	`namespace DotNetNative`
`998`	`997`	`{`
`999`		`-`
`1000`	`998`	`[DotNetType("System.Drawing.Imaging.ImageFormat")]`
`1001`	`999`	`extern(DOTNET) internal class ImageFormat`
`1002`	`1000`	`{`
`@@ -1072,7 +1070,6 @@ namespace Fuse.Drawing`
`1072`	`1070`	`public override extern void Dispose();`
`1073`	`1071`	`}`
`1074`	`1072`
`1075`		`-`
`1076`	`1073`	`[DotNetType("System.Drawing.Drawing2D.LinearGradientBrush")]`
`1077`	`1074`	`extern(DOTNET) internal class LinearGradientBrush : DotNetBrush`
`1078`	`1075`	`{`
`@@ -1098,7 +1095,6 @@ namespace Fuse.Drawing`
`1098`	`1095`	`public override extern void Dispose();`
`1099`	`1096`	`}`
`1100`	`1097`
`1101`		`-`
`1102`	`1098`	`[DotNetType("System.Drawing.SolidBrush")]`
`1103`	`1099`	`extern(DOTNET) internal class SolidBrush : DotNetBrush`
`1104`	`1100`	`{`
`@@ -1137,7 +1133,6 @@ namespace Fuse.Drawing`
`1137`	`1133`	`// constructors`
`1138`	`1134`	`public extern BitmapData();`
`1139`	`1135`
`1140`		`-`
`1141`	`1136`	`// properties`
`1142`	`1137`	`public extern int Height { get; set; }`
`1143`	`1138`	`public extern PixelFormat PixelFormat { get; set; }`
`@@ -1146,7 +1141,6 @@ namespace Fuse.Drawing`
`1146`	`1141`	`public extern int Width { get; set; }`
`1147`	`1142`	`}`
`1148`	`1143`
`1149`		`-`
`1150`	`1144`	`[DotNetType("System.Drawing.Graphics")]`
`1151`	`1145`	`extern(DOTNET) internal class DotNetGraphics`
`1152`	`1146`	`{`
`@@ -1258,7 +1252,6 @@ namespace Fuse.Drawing`
`1258`	`1252`	`public extern byte G { get; }`
`1259`	`1253`	`public extern byte B { get; }`
`1260`	`1254`
`1261`		`-`
`1262`	`1255`	`public static extern Color Blue { get; }`
`1263`	`1256`	`public static extern Color Black { get; }`
`1264`	`1257`	`public static extern Color Orange { get; }`
`@@ -1296,7 +1289,6 @@ namespace Fuse.Drawing`
`1296`	`1289`	`// constructors`
`1297`	`1290`	`public extern PointF(float x, float y);`
`1298`	`1291`
`1299`		`-`
`1300`	`1292`	`// properties`
`1301`	`1293`	`public extern bool IsEmpty { get; }`
`1302`	`1294`	`public extern float X { get; set; }`
`@@ -1344,7 +1336,6 @@ namespace Fuse.Drawing`
`1344`	`1336`	`public extern Pen(Color c);`
`1345`	`1337`	`public extern Pen(Color c, float width);`
`1346`	`1338`
`1347`		`-`
`1348`	`1339`	`// properties`
`1349`	`1340`	`public extern DotNetBrush Brush { get; set; }`
`1350`	`1341`	`public extern Color Color { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+if CIL {`
	`2`	`+ System.Drawing.Common: "https://www.nuget.org/api/v2/package/System.Drawing.Common/6.0.0"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ namespace Fuse.ImageTools`
`43`	`43`
`44`	`44`	`namespace DotNetNative`
`45`	`45`	`{`
`46`		`- [Require("Assembly", "System.Drawing")]`
`47`	`46`	`[DotNetType("System.Drawing.Image")]`
`48`	`47`	`extern(DOTNET) internal class DotNetImage`
`49`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -336,15 +336,15 @@ namespace DrawRectsTest`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
`339`		`- extern(DOTNET) static class MessagePumper`
	`339`	`+ extern(DOTNET && HOST_WINDOWS) static class MessagePumper`
`340`	`340`	`{`
`341`	`341`	`public static void PumpMessages()`
`342`	`342`	`{`
`343`	`343`	`DotNetNative.Application.DoEvents();`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`
`347`		`- extern(!DOTNET) static class MessagePumper`
	`347`	`+ extern(!DOTNET \|\| !HOST_WINDOWS) static class MessagePumper`
`348`	`348`	`{`
`349`	`349`	`public static void PumpMessages()`
`350`	`350`	`{`
`@@ -499,7 +499,7 @@ namespace DrawRectsTest`
`499`	`499`	`namespace DotNetNative`
`500`	`500`	`{`
`501`	`501`	`[DotNetType("System.Windows.Forms.Application")]`
`502`		`- extern(DOTNET) public class Application`
	`502`	`+ extern(DOTNET && HOST_WINDOWS) public class Application`
`503`	`503`	`{`
`504`	`504`	`public extern static void DoEvents();`
`505`	`505`	`}`