From 2ea0bf52431ae6307dac67134538ab46ae8ce68f Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 23 Oct 2025 14:37:37 -0400 Subject: [PATCH 1/7] chore: drop macos, bump ci uno-check --- .github/workflows/azure-static-webapp.yml | 2 +- .vscode/launch.json | 4 ++-- .vscode/tasks.json | 8 ++++---- build/workflow/pipeline.yml | 4 ++-- build/workflow/stage-uitests-wasm.yml | 17 +++++++++++++++++ .../templates/dotnet-workload-install-linux.yml | 4 ++-- .../templates/dotnet-workload-install-mac.yml | 4 ++-- .../dotnet-workload-install-windows.yml | 4 ++-- .../Uno.Toolkit.RuntimeTests.csproj | 2 +- src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj | 2 +- .../Uno.Toolkit.UI.Cupertino.csproj | 2 +- .../Uno.Toolkit.UI.Material.csproj | 2 +- src/tfms.props | 3 +-- 13 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.github/workflows/azure-static-webapp.yml b/.github/workflows/azure-static-webapp.yml index d161d57d9..c8bedeb0a 100644 --- a/.github/workflows/azure-static-webapp.yml +++ b/.github/workflows/azure-static-webapp.yml @@ -31,7 +31,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1.7.2 with: - dotnet-version: '9.0.200' + dotnet-version: '9.0.305' - uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2 id: nbgv diff --git a/.vscode/launch.json b/.vscode/launch.json index e866f88dd..0e5d1e625 100644 --- a/.vscode/launch.json +++ b/.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" } }, { diff --git a/.vscode/tasks.json b/.vscode/tasks.json index eb118f119..a3e95a5fb 100644 --- a/.vscode/tasks.json +++ b/.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" diff --git a/build/workflow/pipeline.yml b/build/workflow/pipeline.yml index 9a736b186..44b714cad 100644 --- a/build/workflow/pipeline.yml +++ b/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 diff --git a/build/workflow/stage-uitests-wasm.yml b/build/workflow/stage-uitests-wasm.yml index 4ce173bcb..e04f63494 100644 --- a/build/workflow/stage-uitests-wasm.yml +++ b/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 diff --git a/build/workflow/templates/dotnet-workload-install-linux.yml b/build/workflow/templates/dotnet-workload-install-linux.yml index 8e58d2f36..0bff6cba5 100644 --- a/build/workflow/templates/dotnet-workload-install-linux.yml +++ b/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: '' diff --git a/build/workflow/templates/dotnet-workload-install-mac.yml b/build/workflow/templates/dotnet-workload-install-mac.yml index dd00256b1..8c0b3049f 100644 --- a/build/workflow/templates/dotnet-workload-install-mac.yml +++ b/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: '' diff --git a/build/workflow/templates/dotnet-workload-install-windows.yml b/build/workflow/templates/dotnet-workload-install-windows.yml index 98892fc58..959ca83fd 100644 --- a/build/workflow/templates/dotnet-workload-install-windows.yml +++ b/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: diff --git a/src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.csproj b/src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.csproj index 9a12adc84..040ab2424 100644 --- a/src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.csproj +++ b/src/Uno.Toolkit.RuntimeTests/Uno.Toolkit.RuntimeTests.csproj @@ -2,7 +2,7 @@ $(TargetFrameworkOverride) net9.0-desktop;net9.0-browserwasm - $(TargetFrameworks);net9.0-ios;net9.0-macos;net9.0-android;net9.0-maccatalyst + $(TargetFrameworks);net9.0-ios;net9.0-android;net9.0-maccatalyst $(TargetFrameworks);net9.0-windows10.0.26100 true Library diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj index e1bb8c80f..47026c9cc 100644 --- a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj +++ b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj @@ -7,7 +7,7 @@ $(TargetFrameworkOverride) net8.0 - $(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst + $(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst $(TargetFrameworks);uap10.0.19041 true diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj index af064947d..8ef4f886b 100644 --- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj +++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj @@ -7,7 +7,7 @@ $(TargetFrameworkOverride) net8.0 - $(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst + $(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst $(TargetFrameworks);uap10.0.19041 true diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj index dbec55bf6..077913c2f 100644 --- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj +++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj @@ -7,7 +7,7 @@ $(TargetFrameworkOverride) net8.0 - $(TargetFrameworks);net8.0-ios;net8.0-macos;net8.0-android;net8.0-maccatalyst + $(TargetFrameworks);net8.0-ios;net8.0-android;net8.0-maccatalyst $(TargetFrameworks);uap10.0.19041 true diff --git a/src/tfms.props b/src/tfms.props index 7ee293adc..cc848e381 100644 --- a/src/tfms.props +++ b/src/tfms.props @@ -7,11 +7,10 @@ $(NetCurrent)-android $(NetCurrent)-ios $(NetCurrent)-maccatalyst - $(NetCurrent)-macos $(NetCurrent)-windows10.0.19041 - $(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst);$(NetCurrentMacOS) + $(NetCurrentAndroid);$(NetCurrentiOS);$(NetCurrentMacCatalyst) $(TargetFrameworkOverride);$(NetCurrent);$(NetCurrentMobile);$(NetCurrentWindows); From abb8363718bd34b739eb0225bbaad73681c0e7b3 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Sun, 2 Nov 2025 16:37:29 -0500 Subject: [PATCH 2/7] chore: show test pages --- .../Uno.Toolkit.Samples/App.xaml.Navigation.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs index fd31250d4..2075010fa 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.Navigation.cs @@ -134,11 +134,7 @@ private void AddNavigationItems(MUXC.NavigationView nv) .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)) { From 1844738dd80eb499ac81a1d99665901683af5a3d Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Sun, 2 Nov 2025 16:58:35 -0500 Subject: [PATCH 3/7] chore: log in release --- samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.cs index c67e2f9db..a322e06f6 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.cs +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/App.xaml.cs @@ -93,7 +93,6 @@ public bool IsExecuting /// 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 @@ public static void InitializeLogging() #if HAS_UNO global::Uno.UI.Adapter.Microsoft.Extensions.Logging.LoggingAdapter.Initialize(); -#endif #endif } From 513e8fb7a11d2486ba14f87cc436d44e649eac6b Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Sun, 2 Nov 2025 17:48:59 -0500 Subject: [PATCH 4/7] ci: fixes --- build/workflow/scripts/wasm-uitest-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/workflow/scripts/wasm-uitest-run.sh b/build/workflow/scripts/wasm-uitest-run.sh index 3ab920f89..781b6425a 100644 --- a/build/workflow/scripts/wasm-uitest-run.sh +++ b/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 From 5887be8a4f827009591fb7a1d3e48b55421f6fc2 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Sun, 2 Nov 2025 18:00:35 -0500 Subject: [PATCH 5/7] chore: test --- .../Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj index cd5acd834..816a54da1 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.csproj @@ -1,7 +1,8 @@  + net9.0-android;net9.0-ios;net9.0-maccatalyst $(SamplesTargetFrameworkOverride) - net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop + $(NetCurrentMobile);net9.0-windows10.0.26100;net9.0-browserwasm;net9.0-desktop Exe true WinUI From e9f4cacdcd07165452654973ec4164fe123f28df Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Mon, 3 Nov 2025 10:17:02 -0500 Subject: [PATCH 6/7] chore: bump uno --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 871467478..23694fb2d 100644 --- a/global.json +++ b/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":{ From 82bd7495746aaff9be7c6d9977f19a08d6ca056b Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Wed, 5 Nov 2025 13:28:41 -0500 Subject: [PATCH 7/7] chore: test --- src/Directory.Packages.props | 1 - .../Controls/Shadows/ShadowContainer.cs | 29 +++++++++---------- .../Uno.Toolkit.Skia.WinUI.csproj | 1 - 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 604459569..bfb0cf62a 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -24,7 +24,6 @@ - diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs index 06e3f6913..28226ae4d 100644 --- a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs +++ b/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); + // } + //} } diff --git a/src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj b/src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj index aba59cce2..678f21d90 100644 --- a/src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj +++ b/src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj @@ -19,7 +19,6 @@ -