Fix more tests.

dotnet · Jan 28, 2022 · 9096a27 · 9096a27 · vs-mobiletools-engineering-service2 · Jan 29, 2022
1 parent 35df9eb
commit 9096a27
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/tests/common/DotNetGlobals.cs b/tests/common/DotNetGlobals.cs
@@ -1,3 +1,5 @@
+#nullable enable
+
 global using nfloat = System.Runtime.InteropServices.NFloat;
 global using System.Runtime.InteropServices;
 
@@ -167,24 +169,24 @@ public static void AddLineToPoint (this CGPath self, CGAffineTransform transform
 		}
 
 		// CopyByDashingPath
-		public static CGPath CopyByDashingPath (this CGPath self, CGAffineTransform transform, float [] lengths)
+		public static CGPath CopyByDashingPath (this CGPath self, CGAffineTransform transform, float []? lengths)
 		{
-			return self.CopyByDashingPath (transform, NFloatHelpers.ConvertArray (lengths));
+			return self.CopyByDashingPath (transform, NFloatHelpers.ConvertArray (lengths)!);
 		}
 
-		public static CGPath CopyByDashingPath (this CGPath self, CGAffineTransform transform, float [] lengths, float phase)
+		public static CGPath CopyByDashingPath (this CGPath self, CGAffineTransform transform, float []? lengths, float phase)
 		{
-			return self.CopyByDashingPath (transform, NFloatHelpers.ConvertArray (lengths), new NFloat (phase));
+			return self.CopyByDashingPath (transform, NFloatHelpers.ConvertArray (lengths)!, new NFloat (phase));
 		}
 
-		public static CGPath CopyByDashingPath (this CGPath self, float [] lengths)
+		public static CGPath CopyByDashingPath (this CGPath self, float []? lengths)
 		{
-			return self.CopyByDashingPath (NFloatHelpers.ConvertArray (lengths));
+			return self.CopyByDashingPath (NFloatHelpers.ConvertArray (lengths)!);
 		}
 
-		public static CGPath CopyByDashingPath (this CGPath self, float [] lengths, float phase)
+		public static CGPath CopyByDashingPath (this CGPath self, float []? lengths, float phase)
 		{
-			return self.CopyByDashingPath (NFloatHelpers.ConvertArray (lengths), new NFloat (phase));
+			return self.CopyByDashingPath (NFloatHelpers.ConvertArray (lengths)!, new NFloat (phase));
 		}
 	}
 

diff --git a/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs b/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
@@ -591,7 +591,11 @@ public static HardwareVersion Version {
 						ret = HardwareVersion.Unknown;
 #else
 						if (UIDevice.CurrentDevice.Model.Contains("iPhone"))
+#if NO_NFLOAT_OPERATORS
+							ret = UIScreen.MainScreen.Bounds.Height.Value * UIScreen.MainScreen.Scale.Value == 960 || UIScreen.MainScreen.Bounds.Width.Value * UIScreen.MainScreen.Scale.Value == 960 ? HardwareVersion.iPhone4Simulator : HardwareVersion.iPhoneSimulator;
+#else
 							ret = UIScreen.MainScreen.Bounds.Height * UIScreen.MainScreen.Scale == 960 || UIScreen.MainScreen.Bounds.Width * UIScreen.MainScreen.Scale == 960 ? HardwareVersion.iPhone4Simulator : HardwareVersion.iPhoneSimulator;
+#endif
 						else
 							ret = HardwareVersion.iPadSimulator;
 #endif