[net8.0] Merge main to net8

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "powershell": {
-      "version": "7.3.6",
+      "version": "7.3.7",
       "commands": [
         "pwsh"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "8.0.0-prerelease.23431.1",
+      "version": "8.0.0-prerelease.23471.1",
       "commands": [
         "xharness"
       ]

build.sh

@@ -20,11 +20,11 @@ done
 dotnet tool restore
 
 if [ $? -ne 0 ]; then
-    echo "An error occured while installing Cake."
+    echo "An error occurred while installing Cake."
     exit 1
 fi
 
 echo "${CAKE_ARGUMENTS[@]}"
 
 # Start Cake
-dotnet tool run dotnet-cake "$SCRIPT" "${CAKE_ARGUMENTS[@]}"
+dotnet tool run dotnet-cake "$SCRIPT" "${CAKE_ARGUMENTS[@]}"

eng/Microsoft.Extensions.targets

@@ -1,5 +1,29 @@
 <Project>
   <ItemGroup>
+    <PackageReference
+        Update="HarfBuzzSharp"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="HarfBuzzSharp.NativeAssets.Linux"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="HarfBuzzSharp.NativeAssets.macOS"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="HarfBuzzSharp.NativeAssets.Win32"
+        Version="$(_HarfBuzzSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.HarfBuzz"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.Extended"
+        Version="$(_SkiaSharpExtendedVersion)"
+    />
     <PackageReference
         Update="SkiaSharp"
         Version="$(_SkiaSharpVersion)"
@@ -8,12 +32,32 @@
         Update="SkiaSharp.Views"
         Version="$(_SkiaSharpVersion)"
     />
+    <PackageReference
+        Update="SkiaSharp.Views.Gtk3"
+        Version="$(_SkiaSharpVersion)"
+    />
     <PackageReference
         Update="SkiaSharp.Views.WinUI"
         Version="$(_SkiaSharpVersion)"
     />
     <PackageReference
-        Update="SkiaSharp.HarfBuzz"
+        Update="SkiaSharp.Views.WPF"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.Linux"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.Linux.NoDependencies"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.macOS"
+        Version="$(_SkiaSharpVersion)"
+    />
+    <PackageReference
+        Update="SkiaSharp.NativeAssets.Win32"
         Version="$(_SkiaSharpVersion)"
     />
     <PackageReference

eng/Version.Details.xml

@@ -83,17 +83,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23431.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23471.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>1446eababf78d7787af2aa86d5393c342c4b1b0b</Sha>
+      <Sha>06fd591dc00862e415eddbec734ae9ea77d35486</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23431.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23471.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>1446eababf78d7787af2aa86d5393c342c4b1b0b</Sha>
+      <Sha>06fd591dc00862e415eddbec734ae9ea77d35486</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23431.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23471.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>1446eababf78d7787af2aa86d5393c342c4b1b0b</Sha>
+      <Sha>06fd591dc00862e415eddbec734ae9ea77d35486</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-rc.2.23457.7">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -64,7 +64,7 @@
     <SystemIOUnmanagedMemoryStreamPackageVersion>4.3.0</SystemIOUnmanagedMemoryStreamPackageVersion>
     <SystemObjectModelPackageVersion>4.3.0</SystemObjectModelPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <_MicrosoftWebWebView2Version>1.0.1938.49</_MicrosoftWebWebView2Version>
+    <_MicrosoftWebWebView2Version>1.0.2045.28</_MicrosoftWebWebView2Version>
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
     <_XamarinAndroidGlideVersion>4.15.1.2</_XamarinAndroidGlideVersion>
@@ -78,13 +78,14 @@
        - Feed URI in the nuget.config
        - Native assets build and sha
     -->
-    <_SkiaSharpVersion>2.88.4-preview.82</_SkiaSharpVersion>
-    <_HarfBuzzSharpVersion>2.8.2.4-preview.82</_HarfBuzzSharpVersion>
-    <_SkiaSharpNativeAssetsVersion>0.0.0-commit.936270ba9372ac6c94505de44884ef4ba5d96aa2.588</_SkiaSharpNativeAssetsVersion>
+    <_SkiaSharpVersion>2.88.6</_SkiaSharpVersion>
+    <_SkiaSharpExtendedVersion>2.0.0-preview.86</_SkiaSharpExtendedVersion>
+    <_HarfBuzzSharpVersion>7.3.0</_HarfBuzzSharpVersion>
+    <_SkiaSharpNativeAssetsVersion>0.0.0-commit.e2c5c86249621857107c779af0f79b4d06613766.655</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23471.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23471.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23471.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

eng/devices/windows.cake

@@ -36,6 +36,7 @@ string DOTNET_PLATFORM = $"win10-x64";
 bool DEVICE_CLEANUP = Argument("cleanup", true);
 string certificateThumbprint = "";
 bool isPackagedTestRun = TEST_DEVICE.ToLower().Equals("packaged");
+bool isControlsProjectTestRun = PROJECT.FullPath.EndsWith("Controls.DeviceTests.csproj");
 
 // Certificate Common Name to use/generate (eg: CN=DotNetMauiTests)
 var certCN = Argument("commonname", "DotNetMAUITests");
@@ -176,11 +177,13 @@ Task("Build")
 		s.MSBuildSettings.Properties.Add("PackageCertificateThumbprint", new List<string> { certificateThumbprint });
 		s.MSBuildSettings.Properties.Add("AppxPackageSigningEnabled", new List<string> { "True" });
 		s.MSBuildSettings.Properties.Add("SelfContained", new List<string> { "True" });
+		s.MSBuildSettings.Properties.Add("ExtraDefineConstants", new List<string> { "PACKAGED" });
 	}
 	else
 	{
 		// Apply correct build properties for unpackaged builds
 		s.MSBuildSettings.Properties.Add("WindowsPackageType", new List<string> { "None" });
+		s.MSBuildSettings.Properties.Add("ExtraDefineConstants", new List<string> { "UNPACKAGED" });
 	}
 
 	// Set correct launchSettings.json setting for packaged/unpackaged
@@ -207,14 +210,23 @@ Task("Test")
 
 	Information("Cleaned directories");
 
-	var testResultsFile = MakeAbsolute((DirectoryPath)TEST_RESULTS).FullPath.Replace("/", "\\") + $"\\TestResults-{PACKAGEID.Replace(".", "_")}.xml";
+	var testResultsPath = MakeAbsolute((DirectoryPath)TEST_RESULTS).FullPath.Replace("/", "\\");
+	var testResultsFile = testResultsPath + $"\\TestResults-{PACKAGEID.Replace(".", "_")}.xml";
+	var testsToRunFile = MakeAbsolute((DirectoryPath)TEST_RESULTS).FullPath.Replace("/", "\\") + $"\\devicetestcategories.txt";
+
 	Information($"Test Results File: {testResultsFile}");
+	Information($"Tests To Run File: {testsToRunFile}");
 
 	if (FileExists(testResultsFile))
 	{
 		DeleteFile(testResultsFile);
 	}
 
+	if (FileExists(testsToRunFile))
+	{
+		DeleteFile(testsToRunFile);
+	}
+
 	if (isPackagedTestRun)
 	{
 		// Try to uninstall the app if it exists from before
@@ -238,24 +250,66 @@ Task("Test")
 		// Install the DeviceTests app
 		StartProcess("powershell", "Add-AppxPackage -Path \"" + MakeAbsolute(msixPath).FullPath + "\"");
 
-		var startArgs = "Start-Process shell:AppsFolder\\$((Get-AppxPackage -Name \"" + PACKAGEID + "\").PackageFamilyName)!App -Args \"" + testResultsFile + "\"";
+		if (isControlsProjectTestRun)
+		{
+			// Start the app once, this will trigger the discovery of the test categories
+			var startArgsInitial = "Start-Process shell:AppsFolder\\$((Get-AppxPackage -Name \"" + PACKAGEID + "\").PackageFamilyName)!App -ArgumentList \"" + testResultsFile + "\", \"-1\"";
+			StartProcess("powershell", startArgsInitial);
+
+			Information($"Waiting 10 seconds for process to finish...");
+			System.Threading.Thread.Sleep(10000);
+
+			var testCategoriesToRun = System.IO.File.ReadAllLines(testsToRunFile).Length;
+
+			for (int i = 0; i <= testCategoriesToRun; i++)
+			{
+				var startArgs = "Start-Process shell:AppsFolder\\$((Get-AppxPackage -Name \"" + PACKAGEID + "\").PackageFamilyName)!App -ArgumentList \"" + testResultsFile + "\", \"" + i + "\"";
+
+				Information(startArgs);
 
-		Information(startArgs);
+				// Start the DeviceTests app for packaged
+				StartProcess("powershell", startArgs);
 
-		// Start the DeviceTests app for packaged
-		StartProcess("powershell", startArgs);
+				Information($"Waiting 10 seconds for the next...");
+				System.Threading.Thread.Sleep(10000);
+			}
+		}
+		else
+		{
+			var startArgs = "Start-Process shell:AppsFolder\\$((Get-AppxPackage -Name \"" + PACKAGEID + "\").PackageFamilyName)!App -ArgumentList \"" + testResultsFile + "\"";
+
+			Information(startArgs);
+
+			// Start the DeviceTests app for packaged
+			StartProcess("powershell", startArgs);
+		}
 	}
 	else
 	{
 		// Unpackaged process blocks the thread, so we can wait shorter for the results
 		waitForResultTimeoutInSeconds = 30;
 
-		// Start the DeviceTests app for unpackaged
-		StartProcess(TEST_APP, testResultsFile);
+		if (isControlsProjectTestRun)
+		{
+			// Start the app once, this will trigger the discovery of the test categories
+			StartProcess(TEST_APP, testResultsFile + " -1");
+
+			var testCategoriesToRun = System.IO.File.ReadAllLines(testsToRunFile).Length;
+
+			for (int i = 0; i <= testCategoriesToRun; i++)
+			{
+				// Start the DeviceTests app for unpackaged
+				StartProcess(TEST_APP, testResultsFile + " " + i);
+			}
+		}
+		else
+		{
+			StartProcess(TEST_APP, testResultsFile);
+		}
 	}
 
 	var waited = 0;
-	while (!FileExists(testResultsFile)) {
+	while (System.IO.Directory.GetFiles(testResultsPath, "TestResults-*.xml").Length == 0) {
 		System.Threading.Thread.Sleep(1000);
 		waited++;
 
@@ -264,12 +318,48 @@ Task("Test")
 			break;
 	}
 
-	if(!FileExists(testResultsFile))
+	// If we're running the Controls project, double-check if we have all test result files
+	// and if the categories we expected to run match the test result files
+	if (isControlsProjectTestRun)
 	{
-		throw new Exception($"Test results file not found after {waited} seconds, process might have crashed or not completed yet.");
+		var expectedCategoriesRanCount = System.IO.File.ReadAllLines(testsToRunFile).Length-1;
+		var actualResultFileCount = System.IO.Directory.GetFiles(testResultsPath, "TestResults-*.xml").Length;
+
+		while (actualResultFileCount < expectedCategoriesRanCount) {
+			actualResultFileCount = System.IO.Directory.GetFiles(testResultsPath, "TestResults-*.xml").Length;
+			System.Threading.Thread.Sleep(1000);
+			waited++;
+
+			Information($"Waiting {waited} additional second(s) for tests to finish...");
+			if (waited >= 30)
+				break;
+		}
+
+		if (FileExists(testsToRunFile))
+		{
+			DeleteFile(testsToRunFile);
+		}
+
+		// While the count should match exactly, if we get more files somehow we'll allow it
+		// If it's less, throw an exception to fail the pipeline.
+		if (actualResultFileCount < expectedCategoriesRanCount)
+		{
+			throw new Exception($"Expected test result files: {expectedCategoriesRanCount}, actual files: {actualResultFileCount}, some process(es) might have crashed.");
+		}
 	}
 
-	Information($"Tests Finished");
+	if(System.IO.Directory.GetFiles(testResultsPath, "TestResults-*.xml").Length == 0)
+	{
+		throw new Exception($"Test result file(s) not found after {waited} seconds, process might have crashed or not completed yet.");
+	}
+
+	foreach(var file in System.IO.Directory.GetFiles(testResultsPath, "TestResults-*.xml"))
+	{
+		var failed = XmlPeek(file, "/assemblies/assembly[@failed > 0 or @errors > 0]/@failed");
+		if (!string.IsNullOrEmpty(failed)) {
+			throw new Exception($"At least {failed} test(s) failed.");
+		}
+	}
 });
 
 

eng/pipelines/device-tests.yml

@@ -150,8 +150,7 @@ stages:
           android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           catalyst: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
-          # Skip this one for Windows for now, it's crashing
-          windows: #$(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
+          windows: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
         - name: blazorwebview
           desc: BlazorWebView
           androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome

src/Compatibility/ControlGallery/src/Android/Issue10182Activity.cs

@@ -30,7 +30,7 @@
 //			base.OnCreate(savedInstanceState);
 
 //#pragma warning disable CS0612 // Type or member is obsolete
-//			Forms.Init(new MauiContext(MauiApplication.Current.Services, this));
+//			Forms.Init(new MauiContext(IPlatformApplication.Current.Services, this));
 //#pragma warning restore CS0612 // Type or member is obsolete
 //			LoadApplication(new Issue10182Application());
 

src/Compatibility/Core/src/AppHostBuilderExtensions.Android.cs

@@ -19,7 +19,7 @@ static void OnConfigureLifeCycle(IAndroidLifecycleBuilder android)
 					// any UI has appeared.
 					// This creates a dummy MauiContext that wraps the Application.
 
-					var services = MauiApplication.Current.Services;
+					var services = IPlatformApplication.Current.Services;
 					var mauiContext = new MauiContext(services, app);
 					var state = new ActivationState(mauiContext);
 #pragma warning disable CS0612 // Type or member is obsolete

src/Compatibility/Core/src/AppHostBuilderExtensions.Tizen.cs

@@ -19,7 +19,7 @@ static void OnConfigureLifeCycle(ITizenLifecycleBuilder tizen)
 				// Forms.Init(). This happens before any UI has appeared.
 				// This creates a dummy MauiContext.
 
-				var services = MauiApplication.Current.Services;
+				var services = IPlatformApplication.Current.Services;
 				MauiContext mauiContext = new MauiContext(services);
 				ActivationState state = new ActivationState(mauiContext);
 

src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs

@@ -33,7 +33,7 @@ static void OnConfigureLifeCycle(IWindowsLifecycleBuilder windows)
 				// Inside OnLaunched we grab the MauiContext that's on the window so we can have the correct
 				// MauiContext inside Forms
 
-				var services = MauiWinUIApplication.Current.Services;
+				var services = IPlatformApplication.Current?.Services ?? throw new InvalidOperationException("Unable to find Application Services");
 				var mauiContext = new MauiContext(services);
 				var state = new ActivationState(mauiContext, args);
 #pragma warning disable CS0612 // Type or member is obsolete

src/Compatibility/Core/src/AppHostBuilderExtensions.cs

@@ -125,7 +125,8 @@ public void Initialize(IServiceProvider services)
 #if WINDOWS
 				var dispatcher =
 					services.GetService<IDispatcher>() ??
-					MauiWinUIApplication.Current.Services.GetRequiredService<IDispatcher>();
+					IPlatformApplication.Current?.Services.GetRequiredService<IDispatcher>() ??
+					throw new InvalidOperationException("Unable to find Application Services");
 
 					dispatcher.DispatchIfRequired(() =>
 					{

src/Compatibility/Core/src/AppHostBuilderExtensions.iOS.cs

@@ -17,7 +17,7 @@ static void OnConfigureLifeCycle(IiOSLifecycleBuilder iOS)
 					// Forms.Init(). This happens before any UI has appeared.
 					// This creates a dummy MauiContext.
 
-					var services = MauiUIApplicationDelegate.Current.Services;
+					var services = IPlatformApplication.Current.Services;
 					var mauiContext = new MauiContext(services);
 					var state = new ActivationState(mauiContext);
 #pragma warning disable CS0612 // Type or member is obsolete