MartinZikmund · Apr 16, 2026 · Sep 29, 2023 · Sep 29, 2023 · Sep 29, 2023 · Sep 29, 2023
diff --git a/build/PackageDiffIgnore.xml b/build/PackageDiffIgnore.xml
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net462</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
 	</PropertyGroup>
 
@@ -101,15 +101,10 @@
 		<!-- These filters contain Uno.UI project and its dependencies, which are what needs to be restored -->
 		<!-- In addition, the reference project needs to be restored as well. -->
 		<Exec Command="dotnet restore filters\Uno.UI-top-projects-for-sync-gen.slnf -p:Configuration=Release -p:InformationalVersion=$(NBGV_AssemblyInformationalVersion) -p:CI_Build=true -p:_IsCIBuild=true -p:SyncGeneratorRunning=true" />
-		<MSBuild
-			Properties="Configuration=Release;InformationalVersion=$(NBGV_AssemblyInformationalVersion);CI_Build=true;_IsCIBuild=true;SyncGeneratorRunning=true"
-			Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj;..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj"
-			Targets="Restore;Clean"
-			RebaseOutputs="false"
-			BuildInParallel="true" />
 
-		<MSBuild Properties="Configuration=Release" Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj" Targets="Build" />
-		<MSBuild Properties="Configuration=Release" Projects="..\src\Uno.UWPSyncGenerator.Reference\Uno.UWPSyncGenerator.Reference.csproj" Targets="Build" />
+		<!-- Use dotnet build (not MSBuild task) to ensure NuGet contentFiles (BuildHost-netcore) are copied to output -->
+		<Exec Command="dotnet build ..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj -c Release" />
+		<Exec Command="dotnet build ..\src\Uno.UWPSyncGenerator.Reference.WinUI\Uno.UWPSyncGenerator.Reference.WinUI.csproj -c Release" />
 
 	</Target>
 

diff --git a/build/ci/tests/.azure-devops-tests-android-native.yml b/build/ci/tests/.azure-devops-tests-android-native.yml
@@ -126,16 +126,17 @@ jobs:
           ALLOW_RERUN: false
           UITEST_TEST_TIMEOUT: '2600s'
 
-      'Snapshot Tests':
-        ANDROID_SIMULATOR_APILEVEL: 28
-        UITEST_TEST_MODE_DISPLAY_NAME: 'Snapshot Tests'
-        UITEST_TEST_MODE_NAME: Snapshots
-        UNO_UITEST_BUCKET_ID: Snapshot
-        SAMPLEAPP_ARTIFACT_NAME: uitests-android-netcoremobile-build
-        TARGETPLATFORM_NAME: net9
-        FAILBUILD_ON_FAILURE: true
-        ALLOW_RERUN: true
-        UITEST_TEST_TIMEOUT: '270s'
+      ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+        'Snapshot Tests':
+          ANDROID_SIMULATOR_APILEVEL: 28
+          UITEST_TEST_MODE_DISPLAY_NAME: 'Snapshot Tests'
+          UITEST_TEST_MODE_NAME: Snapshots
+          UNO_UITEST_BUCKET_ID: Snapshot
+          SAMPLEAPP_ARTIFACT_NAME: uitests-android-netcoremobile-build
+          TARGETPLATFORM_NAME: net9
+          FAILBUILD_ON_FAILURE: true
+          ALLOW_RERUN: true
+          UITEST_TEST_TIMEOUT: '270s'
 
       # Android 10 testing is disabled because of https://github.com/microsoft/appcenter/issues/1451
       # Android_10.0:

diff --git a/build/ci/tests/.azure-devops-tests-ios-native.yml b/build/ci/tests/.azure-devops-tests-ios-native.yml
@@ -15,6 +15,12 @@ parameters:
     value: '04'
   - key: '4'
     value: '05'
+  - key: '5'
+    value: '06'
+  - key: '6'
+    value: '07'
+  - key: '7'
+    value: '08'
 
   # Runtime Test Groups
   UITEST_RUNTIME_TEST_GROUP_COUNT: 8
@@ -172,21 +178,22 @@ jobs:
 #     SAMPLESAPP_BUNDLE_ID: 'uno.platform.samplesdev'
 #     xCodeRoot: ${{ parameters.xCodeRootTest }}
 
-- ${{ each snapshotGroup in parameters.SNAPSHOT_GROUPS }}:
-  - template: .azure-devops-tests-ios-runner.yml
-    parameters:
-      nugetPackages: $(NUGET_PACKAGES)
-      JobName: 'iOS_Snapshot_Tests_Group_${{ snapshotGroup.value }}'
-      JobDisplayName: 'Snapshot Tests ${{ snapshotGroup.key }}'
-      TestRunName: 'iOS Native Snapshot Tests ${{ snapshotGroup.key }}'
-      JobTimeoutInMinutes: 60
-      SamplesAppArtifactName: 'ios-uitest-build'
-      vmImage: ${{ parameters.vmImageTest }}
-      UITEST_SNAPSHOTS_ONLY: true
-      UITEST_SNAPSHOTS_GROUP: '0${{ snapshotGroup.key }}' # Example: 01, 02, 03, 04, 05
-      UITEST_TEST_TIMEOUT: '10m'
-      UITEST_ALLOW_RERUN: 'false'
-      SAMPLESAPP_BUNDLE_ID: 'uno.platform.samplesdev'
-      xCodeRoot: ${{ parameters.xCodeRootTest }}
-      dependsOn:
-        - iOS_Build
+- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+  - ${{ each snapshotGroup in parameters.SNAPSHOT_GROUPS }}:
+    - template: .azure-devops-tests-ios-runner.yml
+      parameters:
+        nugetPackages: $(NUGET_PACKAGES)
+        JobName: 'iOS_Snapshot_Tests_Group_${{ snapshotGroup.value }}'
+        JobDisplayName: 'Snapshot Tests ${{ snapshotGroup.key }}'
+        TestRunName: 'iOS Native Snapshot Tests ${{ snapshotGroup.key }}'
+        JobTimeoutInMinutes: 90
+        SamplesAppArtifactName: 'ios-uitest-build'
+        vmImage: ${{ parameters.vmImageTest }}
+        UITEST_SNAPSHOTS_ONLY: true
+        UITEST_SNAPSHOTS_GROUP: '0${{ snapshotGroup.key }}' # Example: 01, 02, 03, 04, 05
+        UITEST_TEST_TIMEOUT: '10m'
+        UITEST_ALLOW_RERUN: 'false'
+        SAMPLESAPP_BUNDLE_ID: 'uno.platform.samplesdev'
+        xCodeRoot: ${{ parameters.xCodeRootTest }}
+        dependsOn:
+          - iOS_Build
diff --git a/build/ci/tests/.azure-devops-tests-webassembly-native.yml b/build/ci/tests/.azure-devops-tests-webassembly-native.yml
@@ -58,73 +58,73 @@ jobs:
       ArtifactName: wasm-uitest-binaries-logs
       ArtifactType: Container
 
-- job: Wasm_UITests_Snap
-  displayName: 'WebAssembly Snapshot Tests'
-  cancelTimeoutInMinutes: 0
-  dependsOn:
-  - Wasm_UITests_Build
-  condition: and(succeededOrFailed(), or(ne(variables['Build.Reason'], 'PullRequest'), eq(stageDependencies.Setup.outputs['SetScope.RequireNativeWasm'], 'true')))
-
-  container: nv-bionic-wasm
-
-  pool: ${{ parameters.poolName }}
-
-  variables:
-    NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
-    SITE_SUFFIX: 'net10.0'
-
-  steps:
-  - checkout: self
-    clean: true
-
-  - template: ../templates/dotnet-install.yml
-
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '18.x'
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Restoring uitest binaries
-    inputs:
-      artifact: wasm-uitest-binaries
-      path: $(build.sourcesdirectory)/build/wasm-uitest-binaries
-
-  - bash: |
-      set -euo pipefail
-      set -x
-      IFS=$'\n\t'
-      dotnet tool uninstall dotnet-serve -g || true
-      dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
-      dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
-      export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
-      $BUILD_SOURCESDIRECTORY/build/tools/dotnet-serve -p 8000 -d "$BUILD_SOURCESDIRECTORY/build/wasm-uitest-binaries/site-net10.0-WinUI" &
-      cd $BUILD_SOURCESDIRECTORY/src/SamplesApp/SamplesApp.Wasm.UITests
-      npm install
-      node app
-
-    env:
-      BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
-      BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)"
-      SITE_SUFFIX: "$(SITE_SUFFIX)"
-
-    displayName: 'Running UI Tests'
-
-  - task: CopyFiles@2
-    displayName: 'Publish Wasm Tests results'
-    inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Wasm.UITests/out
-      Contents: '**/*.*'
-      TargetFolder: $(build.artifactstagingdirectory)/screenshots/wasm
-      CleanTargetFolder: false
-      OverWrite: false
-      flattenFolders: false
-
-  - task: PublishBuildArtifacts@1
-    retryCountOnTaskFailure: 3
-    inputs:
-      PathtoPublish: $(build.artifactstagingdirectory)
-      ArtifactName: uitests-results
-      ArtifactType: Container
+- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
+  - job: Wasm_UITests_Snap
+    displayName: 'WebAssembly Snapshot Tests'
+    cancelTimeoutInMinutes: 0
+    dependsOn:
+    - Wasm_UITests_Build
+
+    container: nv-bionic-wasm
+
+    pool: ${{ parameters.poolName }}
+
+    variables:
+      NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
+      SITE_SUFFIX: 'net10.0'
+
+    steps:
+    - checkout: self
+      clean: true
+
+    - template: ../templates/dotnet-install.yml
+
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '18.x'
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Restoring uitest binaries
+      inputs:
+        artifact: wasm-uitest-binaries
+        path: $(build.sourcesdirectory)/build/wasm-uitest-binaries
+
+    - bash: |
+        set -euo pipefail
+        set -x
+        IFS=$'\n\t'
+        dotnet tool uninstall dotnet-serve -g || true
+        dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
+        dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true
+        export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
+        $BUILD_SOURCESDIRECTORY/build/tools/dotnet-serve -p 8000 -d "$BUILD_SOURCESDIRECTORY/build/wasm-uitest-binaries/site-net10.0-WinUI" &
+        cd $BUILD_SOURCESDIRECTORY/src/SamplesApp/SamplesApp.Wasm.UITests
+        npm install
+        node app
+
+      env:
+        BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)"
+        BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)"
+        SITE_SUFFIX: "$(SITE_SUFFIX)"
+
+      displayName: 'Running UI Tests'
+
+    - task: CopyFiles@2
+      displayName: 'Publish Wasm Tests results'
+      inputs:
+        SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Wasm.UITests/out
+        Contents: '**/*.*'
+        TargetFolder: $(build.artifactstagingdirectory)/screenshots/wasm
+        CleanTargetFolder: false
+        OverWrite: false
+        flattenFolders: false
+
+    - task: PublishBuildArtifacts@1
+      retryCountOnTaskFailure: 3
+      inputs:
+        PathtoPublish: $(build.artifactstagingdirectory)
+        ArtifactName: uitests-results
+        ArtifactType: Container
 
 
 - job: Wasm_UITests_Automated

diff --git a/doc/articles/uno-development/building-uno-ui.md b/doc/articles/uno-development/building-uno-ui.md
@@ -119,7 +119,7 @@ When updating the versions of NuGet packages, make sure to update all the .nuspe
 
 Uno Platform uses a tool which synchronizes all WinRT and WinUI APIs with the type implementations already present in Uno. This ensures that all APIs are present for consumers of Uno, even if some are not implemented.
 
-The synchronization process takes the APIs provided by the WinMD files referenced by the `Uno.UWPSyncGenerator.Reference` project and generates stubbed classes for types in the `Generated` folders of Uno.UI, Uno.Foundation and Uno.WinRT projects. If the generated classes have been partially implemented in Uno (in the non-Generated folders), the tool will automatically skip those implemented methods.
+The synchronization process takes the APIs provided by the WinMD files referenced by the `Uno.UWPSyncGenerator.Reference.WinUI` project and generates stubbed classes for types in the `Generated` folders of Uno.UI, Uno.Foundation and Uno.WinRT projects. If the generated classes have been partially implemented in Uno (in the non-Generated folders), the tool will automatically skip those implemented methods.
 
 The tool needs to be run on Windows because of its dependency on the Windows SDK WinMD files.
 

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -155,7 +155,9 @@
 		<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Update="CommunityToolkit.Mvvm" Version="$(CommunityToolkitMvvmVersion)" />
 		<PackageReference Update="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-		<PackageReference Update="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+		<PackageReference Update="Microsoft.Web.WebView2" Version="1.0.2592.51" Condition="'$(MSBuildProjectName)' != 'Uno.UWPSyncGenerator.Reference.WinUI'" />
+
+		<PackageReference Update="Basic.Reference.Assemblies.Net100" Version="1.8.4" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0-android'">

diff --git a/src/SamplesApp/SamplesApp.UITests.Generator/SnapShotTestGenerator.cs b/src/SamplesApp/SamplesApp.UITests.Generator/SnapShotTestGenerator.cs
@@ -27,7 +27,7 @@ public class SnapShotTestGenerator : ISourceGenerator
 
 		private static readonly string[] _defaultCategories = new[] { "Default" };
 
-		private const int GroupCount = 5;
+		private const int GroupCount = 8;
 
 		public void Initialize(GeneratorInitializationContext context)
 		{

diff --git a/...ourceGenerators/Uno.UI.SourceGenerators.Internal/Mixins/BaseActivityCallbacksGenerator.cs b/...ourceGenerators/Uno.UI.SourceGenerators.Internal/Mixins/BaseActivityCallbacksGenerator.cs
@@ -67,6 +67,10 @@ public static string Generate()
 			.Select(method =>
 			{
 				var match = methodRegex.Match(method);
+				if (!match.Success)
+				{
+					throw new InvalidOperationException($"BaseActivityCallbacks: unable to parse method line: {method}");
+				}
 				var name = match.Groups["name"].Value;
 				var nameOverride = match.Groups["nameOverride"].Value;
 				var eventName = string.IsNullOrEmpty(nameOverride) ? name : nameOverride;
@@ -129,14 +133,16 @@ public static string Generate()
 				sb.AppendLine("\t\t\t{");
 				foreach (var p in parameters)
 				{
-					var propName = char.ToUpper(p.ParamName[0], System.Globalization.CultureInfo.InvariantCulture) + p.ParamName.Substring(1);
-					sb.AppendLine($"\t\t\t\t{propName} = {p.ParamName}; ");
+					var normalizedParamName = p.ParamName.TrimStart('@');
+					var propName = char.ToUpper(normalizedParamName[0], System.Globalization.CultureInfo.InvariantCulture) + normalizedParamName.Substring(1);
+					sb.AppendLine($"\t\t\t\tthis.{propName} = {p.ParamName}; ");
 				}
 				sb.AppendLine("\t\t\t}");
 				sb.AppendLine();
 				foreach (var p in parameters)
 				{
-					var propName = char.ToUpper(p.ParamName[0], System.Globalization.CultureInfo.InvariantCulture) + p.ParamName.Substring(1);
+					var normalizedParamName = p.ParamName.TrimStart('@');
+					var propName = char.ToUpper(normalizedParamName[0], System.Globalization.CultureInfo.InvariantCulture) + normalizedParamName.Substring(1);
 					sb.AppendLine($"\t\t\tpublic {p.Type} {propName} {{ get; }} ");
 				}
 				sb.AppendLine("\t\t}");
@@ -197,7 +203,7 @@ public static string Generate()
 		}
 
 		sb.AppendLine("}");
-		sb.AppendLine("#endif ");
+		sb.AppendLine("#endif");
 
 		return sb.ToString();
 	}

diff --git a/...nerators/Uno.UI.SourceGenerators.Internal/Mixins/FrameworkElementAndroidMixinGenerator.cs b/...nerators/Uno.UI.SourceGenerators.Internal/Mixins/FrameworkElementAndroidMixinGenerator.cs
@@ -964,7 +964,7 @@ private static void GenerateAndroidMixin(StringBuilder sb, MixinParams m)
 			sb.AppendLine("\t\t\tif (newSize != previousSize)");
 			sb.AppendLine("\t\t\t{");
 			sb.AppendLine("\t\t\t\tSizeChanged?.Invoke(this, new SizeChangedEventArgs(this, previousSize, newSize));");
-			sb.AppendLine("\t\t\t\t_renderTransform?.UpdateSize(newSize); // TODO: Move ** BEFORE ** base.OnLayout() ???");
+			sb.AppendLine("\t\t\t\t_renderTransform?.UpdateSize(newSize);");
 			sb.AppendLine("\t\t\t}");
 			sb.AppendLine("\t\t}");
 			sb.AppendLine();

diff --git a/...Generators/Uno.UI.SourceGenerators.Internal/Mixins/FrameworkElementUIKitMixinGenerator.cs b/...Generators/Uno.UI.SourceGenerators.Internal/Mixins/FrameworkElementUIKitMixinGenerator.cs
@@ -217,6 +217,8 @@ public static string GenerateFrameworkElementMixins()
 		sb.AppendLine();
 		sb.AppendLine("#if UNO_MIXIN_GENERATION && __APPLE_UIKIT__");
 		sb.AppendLine();
+		sb.AppendLine("#nullable disable");
+		sb.AppendLine();
 		sb.AppendLine("#pragma warning disable 414");
 		sb.AppendLine();
 		sb.AppendLine("using System;");

diff --git a/src/Uno.Foundation/Extensions/VectorExtensions.cs b/src/Uno.Foundation/Extensions/VectorExtensions.cs
@@ -9,7 +9,7 @@
 
 namespace System.Numerics;
 
-public static class VectorExtensions
+public static partial class VectorExtensions
 {
 	/// <summary>
 	/// Converts a <see cref="Vector2"/> to <see cref="Point"/>

diff --git a/src/Uno.Foundation/Generated/2.0.0.0/Microsoft.UI.Xaml.Data/BindableCustomProperty.cs b/src/Uno.Foundation/Generated/2.0.0.0/Microsoft.UI.Xaml.Data/BindableCustomProperty.cs
@@ -0,0 +1,20 @@
+// <auto-generated>
+#pragma warning disable 108 // new keyword hiding
+#pragma warning disable 114 // new keyword hiding
+namespace Microsoft.UI.Xaml.Data
+{
+#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+	[global::Uno.NotImplemented]
+#endif
+	public partial class BindableCustomProperty
+	{
+#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
+		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
+		public BindableCustomProperty(bool canRead, bool canWrite, string name, global::System.Type type, global::System.Func<object, object> getValue, global::System.Action<object, object> setValue, global::System.Func<object, object, object> getIndexedValue, global::System.Action<object, object, object> setIndexedValue)
+		{
+			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Microsoft.UI.Xaml.Data.BindableCustomProperty", "BindableCustomProperty.BindableCustomProperty(bool canRead, bool canWrite, string name, Type type, Func<object, object> getValue, Action<object, object> setValue, Func<object, object, object> getIndexedValue, Action<object, object, object> setIndexedValue)");
+		}
+#endif
+		// Forced skipping of method Microsoft.UI.Xaml.Data.BindableCustomProperty.BindableCustomProperty(bool, bool, string, System.Type, System.Func<object, object>, System.Action<object, object>, System.Func<object, object, object>, System.Action<object, object, object>)
+	}
+}
diff --git a/...0/Windows.UI.Composition/InkTrailPoint.cs → .../IBindableCustomPropertyImplementation.cs b/...0/Windows.UI.Composition/InkTrailPoint.cs → .../IBindableCustomPropertyImplementation.cs
@@ -1,19 +1,18 @@
 // <auto-generated>
 #pragma warning disable 108 // new keyword hiding
 #pragma warning disable 114 // new keyword hiding
-namespace Windows.UI.Composition
+namespace Microsoft.UI.Xaml.Data
 {
 #if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
 	[global::Uno.NotImplemented]
 #endif
-	public partial struct InkTrailPoint
+	public partial interface IBindableCustomPropertyImplementation
 	{
-		// Forced skipping of method Windows.UI.Composition.InkTrailPoint.InkTrailPoint()
 #if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
-		public global::Windows.Foundation.Point Point;
+		global::Microsoft.UI.Xaml.Data.BindableCustomProperty GetProperty(string name);
 #endif
 #if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
-		public float Radius;
+		global::Microsoft.UI.Xaml.Data.BindableCustomProperty GetProperty(global::System.Type indexParameterType);
 #endif
 	}
 }