chore: fix main/canary ci

.github/workflows/azure-static-webapp.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/[email protected]
         with:
-          dotnet-version: '9.0.200'
+          dotnet-version: '9.0.305'
 
       - uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
         id: nbgv

.vscode/launch.json

@@ -29,7 +29,7 @@
         "args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Chefs (WebAssembly)"],
         "outputCapture": "std",
         "timeout": 30000,
-        "cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples"
+        "cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples"
       }
     },
     {
@@ -50,7 +50,7 @@
         "args": ["--no-build","-f","net9.0-browserwasm","--launch-profile", "Chefs (WebAssembly)"],
         "outputCapture": "std",
         "timeout": 30000,
-        "cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples"
+        "cwd": "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples"
       }
     },
     {

.vscode/tasks.json

@@ -7,7 +7,7 @@
       "type": "process",
       "args": [
         "build",
-        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
+        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
         "/property:GenerateFullPaths=true",
         "/property:TargetFramework=net9.0-browserwasm",
         "/consoleloggerparameters:NoSummary"
@@ -20,7 +20,7 @@
       "type": "process",
       "args": [
         "publish",
-        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
+        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
         "/property:GenerateFullPaths=true",
         "/property:TargetFramework=net9.0-browserwasm",
         "/consoleloggerparameters:NoSummary"
@@ -33,7 +33,7 @@
       "type": "process",
       "args": [
         "build",
-        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
+        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
         "/property:GenerateFullPaths=true",
         "/property:TargetFramework=net9.0-desktop",
         "/consoleloggerparameters:NoSummary"
@@ -46,7 +46,7 @@
       "type": "process",
       "args": [
         "publish",
-        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
+        "${workspaceFolder}/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj",
         "/property:GenerateFullPaths=true",
         "/property:TargetFramework=net9.0-desktop",
         "/consoleloggerparameters:NoSummary"

build/workflow/pipeline.yml

@@ -36,8 +36,8 @@ variables:
 
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
   IsReleaseBranch: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
-  XCODE_ROOT: '/Applications/Xcode_16.3.app'
-  XCODE_ROOT_UITESTS: '/Applications/Xcode_16.3.app'
+  XCODE_ROOT: '/Applications/Xcode_16.4.app'
+  XCODE_ROOT_UITESTS: '/Applications/Xcode_16.4.app'
 
 stages:
 - stage: Determine_Changes

build/workflow/scripts/wasm-uitest-run.sh

@@ -33,7 +33,7 @@ TEST_FAILED_FLAG=.tests-failed
 
 cd $UNO_UITEST_WASM_PROJECT
 
-dotnet publish -f net9.0-browserwasm /p:SamplesTargetFrameworkOverride=net9.0-browserwasm /p:TargetFrameworkOverride=net9.0 /p:Configuration=Release /p:IsUiAutomationMappingEnabled=True /p:DisableMobileTargets=True /bl:$BASE_ARTIFACTS_PATH/wasm-uitest.binlog
+dotnet publish -f net9.0-browserwasm /p:Configuration=Release /p:IsUiAutomationMappingEnabled=True /p:DisableMobileTargets=True /bl:$BASE_ARTIFACTS_PATH/wasm-uitest.binlog
 cd $BUILD_SOURCESDIRECTORY/build
 mkdir -p tools
 

build/workflow/stage-uitests-wasm.yml

@@ -45,6 +45,23 @@
       build/workflow/scripts/wasm-uitest-run.sh
     displayName: Run WASM UITests ($(XAML_FLAVOR_BUILD) / $(UITEST_TEST_MODE_NAME))
 
+  - task: CopyFiles@2
+    displayName: 'Publish Binaries'
+    retryCountOnTaskFailure: 3
+    inputs:
+      SourceFolder: $(build.sourcesdirectory)/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/bin/Release/net9.0-browserwasm/publish/wwwroot
+      Contents: '**/*.*'
+      TargetFolder: $(build.artifactstagingdirectory)/wwwroot
+      CleanTargetFolder: false
+      OverWrite: false
+      flattenFolders: false
+
+  - task: PublishBuildArtifacts@1
+    retryCountOnTaskFailure: 3
+    condition: always()
+    inputs:
+      ArtifactName: wasm-uitest-build
+
   - task: PublishTestResults@2
     condition: always()
     retryCountOnTaskFailure: 3

build/workflow/templates/dotnet-workload-install-linux.yml

@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '9.0.200'
-  UnoCheck_Version: '1.30.1'
+  DotNetVersion: '9.0.305'
+  UnoCheck_Version: '1.32.17'
   Dotnet_Tools: '~/.dotnet/tools'
   UnoCheckParameters: ''
 

build/workflow/templates/dotnet-workload-install-mac.yml

@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '9.0.200'
-  UnoCheck_Version: '1.30.1'
+  DotNetVersion: '9.0.305'
+  UnoCheck_Version: '1.32.17'
   Dotnet_Root: '/usr/local/share/dotnet/'
   Dotnet_Tools: '~/.dotnet/tools'
   UnoCheckParameters: ''

build/workflow/templates/dotnet-workload-install-windows.yml

@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '9.0.200'
-  UnoCheck_Version: '1.30.1'
+  DotNetVersion: '9.0.305'
+  UnoCheck_Version: '1.32.17'
   UnoCheckParameters: ''
 
 steps:

global.json

@@ -1,7 +1,7 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
     "msbuild-sdks": {
-        "Uno.Sdk.Private": "6.2.58",
+        "Uno.Sdk.Private": "6.3.62",
         "MSBuild.Sdk.Extras": "3.0.38"
     },
   "sdk":{

samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs

@@ -1,5 +1,5 @@
 using System.Reflection;
 using System.Reflection;
 using Uno.Extensions;
 
 using MUXC = Microsoft.UI.Xaml.Controls;
@@ -134,11 +134,7 @@
 			.OrderByDescending(x => x.SortOrder.HasValue)
 			.ThenBy(x => x.SortOrder)
 			.ThenBy(x => x.Title)
-			.GroupBy(x => x.Category)
-#if !DEBUG
-			.Where(x => x.Key != SampleCategory.Tests)
-#endif
-			;
+			.GroupBy(x => x.Category);
 
 		foreach (var category in categories.OrderBy(x => x.Key))
 		{

samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.cs

@@ -85,7 +85,7 @@
 				}
 			}
 
 			public event EventHandler IsExecutingChanged;
 		}
 
 	/// <summary>
@@ -93,7 +93,6 @@
 	/// </summary>
 	public static void InitializeLogging()
 	{
-#if DEBUG
 		// Logging is disabled by default for release builds, as it incurs a significant
 		// initialization cost from Microsoft.Extensions.Logging setup. If startup performance
 		// is a concern for your application, keep this disabled. If you're running on the web or
@@ -151,7 +150,6 @@
 
 #if HAS_UNO
 		global::Uno.UI.Adapter.Microsoft.Extensions.Logging.LoggingAdapter.Initialize();
-#endif
 #endif
 	}
 

samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Uno.Sdk.Private">
 	<PropertyGroup>
+		<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">net9.0-android;net9.0-ios;net9.0-maccatalyst</NetCurrentMobile>
 		<TargetFrameworks Condition="'$(SamplesTargetFrameworkOverride)'!=''">$(SamplesTargetFrameworkOverride)</TargetFrameworks>
-		<TargetFrameworks Condition="'$(SamplesTargetFrameworkOverride)'==''">net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
+		<TargetFrameworks Condition="'$(SamplesTargetFrameworkOverride)'==''">$(NetCurrentMobile);net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<UnoSingleProject>true</UnoSingleProject>
 		<FrameworkLineage>WinUI</FrameworkLineage>

src/Directory.Packages.props

@@ -24,7 +24,6 @@
     <PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
     <PackageVersion Include="Uno.UI" Version="5.4.22" />
 	<PackageVersion Include="Uno.WinUI" Version="6.2.58" />
-	<PackageVersion Include="Uno.WinUI.Graphics2DSK" Version="6.2.58" />
     <PackageVersion Include="Uno.XamlMerge.Task" Version="1.32.0-dev.61" />
     <PackageVersion Include="FluentAssertions" Version="5.10.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />

src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net9.0-desktop;net9.0-browserwasm</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net9.0-ios;net9.0-macos;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net9.0-ios;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);net9.0-windows10.0.26100</TargetFrameworks>
     <UnoSingleProject>true</UnoSingleProject>
     <OutputType>Library</OutputType>

src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs

@@ -10,7 +10,6 @@
 using SkiaSharp;
 using SkiaSharp.Views.Windows;
 using Uno.Disposables;
-using Uno.WinUI.Graphics2DSK;
 using Windows.Foundation;
 
 #if __ANDROID__
@@ -286,11 +285,11 @@ protected override void OnApplyTemplate()
 		_panel = GetTemplateChild(nameof(PART_ShadowOwner)) as Grid;
 
 		FrameworkElement skiaCanvas;
-		if (SKCanvasElement.IsSupportedOnCurrentPlatform())
-		{
-			skiaCanvas = new ShadowContainerSKCanvasElement() { Owner = this };
-		}
-		else
+		//if (SKCanvasElement.IsSupportedOnCurrentPlatform())
+		//{
+		//	skiaCanvas = new ShadowContainerSKCanvasElement() { Owner = this };
+		//}
+		//else
 		{
 			var skXamlCanvas= new SKXamlCanvas();
 			skXamlCanvas.PaintSurface += OnSurfacePainted;
@@ -387,7 +386,7 @@ private void InvalidateCanvasLayoutSize()
 
 	private void InvalidateShadows(bool force = false)
 	{
-		(_shadowHost as SKCanvasElement)?.Invalidate();
+	//	(_shadowHost as SKCanvasElement)?.Invalidate();
 		(_shadowHost as SKXamlCanvas)?.Invalidate();
 	}
 
@@ -425,12 +424,12 @@ private void InvalidateShadows(bool force = false)
 		};
 	}
 
-	private partial class ShadowContainerSKCanvasElement : SKCanvasElement
-	{
-		public ShadowContainer? Owner { get; set; }
-		protected override void RenderOverride(SKCanvas canvas, Size area)
-		{
-			Owner?.OnRenderOverride(canvas, area);
-		}
-	}
+	//private partial class ShadowContainerSKCanvasElement : SKCanvasElement
+	//{
+	//	public ShadowContainer? Owner { get; set; }
+	//	protected override void RenderOverride(SKCanvas canvas, Size area)
+	//	{
+	//		Owner?.OnRenderOverride(canvas, area);
+	//	}
+	//}
 }

src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj

@@ -19,7 +19,6 @@
 		<PackageReference Include="Uno.Core.Extensions.Collections" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" />
-		<PackageReference Include="Uno.WinUI.Graphics2DSK" />
 	</ItemGroup>
 
 	<Choose>

src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj

@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>

src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj

@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>

src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj

@@ -7,7 +7,7 @@
 	<PropertyGroup>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">net8.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableMobileTargets)'==''">$(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(TargetFrameworks);uap10.0.19041</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>

src/tfms.props

@@ -7,11 +7,10 @@
 		<NetCurrentAndroid Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-android</NetCurrentAndroid>
 		<NetCurrentiOS Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-ios</NetCurrentiOS>
 		<NetCurrentMacCatalyst Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-maccatalyst</NetCurrentMacCatalyst>
-		<NetCurrentMacOS Condition="'$(TargetFrameworkOverride)'==''">$(NetCurrent)-macos</NetCurrentMacOS>
 		<NetCurrentWindows Condition="'$(TargetFrameworkOverride)'=='' and '$(OS)'=='Windows_NT'">$(NetCurrent)-windows10.0.19041</NetCurrentWindows>
 
 
-		<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">$(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst);$(NetCurrentMacOS)</NetCurrentMobile>
+		<NetCurrentMobile Condition="'$(DisableMobileTargets)'==''">$(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst)</NetCurrentMobile>
 		<NetCurrentAll>$(TargetFrameworkOverride);$(NetCurrent);$(NetCurrentMobile);$(NetCurrentWindows);</NetCurrentAll>
 	</PropertyGroup>