Merge branch 'master' into dev/mazi/inapp-rating-googleplay

unoplatform · Oct 14, 2024 · 89f88fd · 89f88fd
2 parents 3569684 + 4babcb4
commit 89f88fd
Show file tree

Hide file tree

Showing 397 changed files with 18,026 additions and 5,011 deletions.
diff --git a/.github/workflows/uwp-autoconvert.yml b/.github/workflows/uwp-autoconvert.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  UnoCheck_Version: '1.26.0-dev.28'
+  UnoCheck_Version: '1.26.0-dev.63'
 
 jobs:
   build:

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -58,8 +58,8 @@ variables:
   linuxScaledPool: 'Ubuntu2204-20230918'
   macOSVMImage: 'macOS-14'
   macOSVMImage_UITests: 'macOS-14'
-  xCodeRoot: '/Applications/Xcode_15.4.app'
-  xCodeRoot_iOS_UITests: '/Applications/Xcode_15.4.app'
+  xCodeRoot: '/Applications/Xcode_16.app'
+  xCodeRoot_iOS_UITests: '/Applications/Xcode_16.app'
 
   # Offline validation to improve build performance
   NUGET_CERT_REVOCATION_MODE: offline

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,7 +21,7 @@
 		<NetCurrent>net9.0</NetCurrent>
 		<NetPrevious>net8.0</NetPrevious>
 
-		<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios17.5;$(NetCurrent)-maccatalyst17.5;$(NetCurrent)-macos14.5</NetCurrentNetCoreMobile>
+		<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios18.0;$(NetCurrent)-maccatalyst18.0;$(NetCurrent)-macos15.0</NetCurrentNetCoreMobile>
 		<NetPreviousNetCoreMobile>$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst17.0;$(NetPrevious)-macos14.0</NetPreviousNetCoreMobile>
 
 		<NetPreviousWpf>$(NetPrevious)-windows</NetPreviousWpf>

diff --git a/build/PackageDiffIgnore.xml b/build/PackageDiffIgnore.xml
@@ -1781,7 +1781,7 @@
 			<Member fullName="System.Void Windows.UI.Xaml.Controls.TimePickerFlyout.OnClockIdentifierChanged(System.String oldClockIdentifier, System.String newClockIdentifier)" reason="Not present in WinUI" />
 			<Member fullName="System.Void Windows.UI.Xaml.Controls.TimePickerFlyoutPresenter..ctor()" reason="Not present in WinUI" />
 			<!-- END TimePicker -->
-			
+
 			<!-- Multiple XamlRoots -->
 			<Member fullName="System.Void Windows.UI.Core.CoreWindow..ctor(UIKit.UIWindow window)" reason="Does not exist in UWP" />
 			<Member fullName="System.Void Windows.UI.Core.CoreWindow..ctor(AppKit.NSWindow window)" reason="Does not exist in UWP" />
@@ -1801,7 +1801,7 @@
 			<Member fullName="Microsoft.UI.Dispatching.DispatcherQueueTimer" reason="Only in UWP build. It shouldn't have existed." />
 
 			<Member fullName="Microsoft.UI.Xaml.Hosting.HostingContract" reason="No longer exists in WinAppSDK 1.4" />
-			
+
 			<Member fullName="Uno.WinUI.Runtime.Skia.LinuxFB.EventLoop" reason="Should be internal" />
 		</Types>
 
@@ -1827,7 +1827,7 @@
 			<Member fullName="System.Void Windows.ApplicationModel.Activation.SplashScreen..ctor()" reason="The signature differs in MUX" />
 			<Member fullName="System.Void Microsoft.UI.Xaml.Input.PointerRoutedEventArgs..ctor()" reason="Does not exist in WinUI" />
 			<Member fullName="System.Void Windows.UI.Xaml.Input.PointerRoutedEventArgs..ctor()" reason="Does not exist in WinUI" />
-			
+
 			<!-- Begin Skia Builder-->
 			<Member fullName="System.Void Uno.UI.Runtime.Skia.Linux.FrameBuffer.FrameBufferHost.Run()" reason="Non-breaking API, moved to SkiaHost" />
 			<!-- End Skia Builder-->
@@ -1905,18 +1905,86 @@
 
 		<Events>
 		</Events>
-		
+
 		<Fields>
 		</Fields>
 
 		<Properties>
+			<!-- BEGIN templated-parent rework -->
+
+			<!-- HorizontalGridView -->
+			<Member fullName="System\.Func`1&lt;Android\.Views\.View&gt; Uno\.UI\.Controls\.HorizontalGridView::(Item|Header|Footer)Template\(\)" reason="Not in UWP" isRegex="true" />
+
+			<!-- END templated-parent rework -->
 		</Properties>
 
 		<Methods>
 			<Member fullName="System.Void Microsoft.Web.WebView2.Core.CoreWebView2.set_DocumentTitle(System.String value)" reason="Does not exist in UWP" />
+
+			<!-- BEGIN templated-parent rework -->
+
+			<!-- DependencyObject (codegen for all descendants) -->
+			<Member fullName=".*DependencyProperty .*\.get_TemplatedParentProperty\(\)" reason="Not in UWP" isRegex="true" />
+			<Member fullName=".*DependencyObject .*\.get_TemplatedParent\(\)" reason="Not in UWP" isRegex="true" />
+			<Member fullName="System\.Void .*\.set_TemplatedParent\((Microsoft|Windows)\.UI\.Xaml\.DependencyObject value\)" reason="Not in UWP" isRegex="true" />
+
+			<!-- templates: FrameworkTemplate, DataTemplate, ControlTemplate, ItemsPanelTemplate -->
+			<Member fullName="(?&lt;ReturnType&gt;(Microsoft|Windows)\.UI\.Xaml\.(DataTemplate|Controls\.(ControlTemplate|ItemsPanelTemplate))) \k&lt;ReturnType&gt;\.op_Implicit\(System\.Func`1&lt;.*&gt; obj\)" reason="Not in UWP" isRegex="true" />
+			<Member fullName="System\.Func`1&lt;.*&gt; (?&lt;DeclaringType&gt;(Microsoft|Windows)\.UI\.Xaml\.(FrameworkTemplate|DataTemplate|Controls\.(ControlTemplate|ItemsPanelTemplate)))\.op_Implicit\(\k&lt;DeclaringType&gt; obj\)" reason="Not in UWP" isRegex="true" />
+
+			<!-- HorizontalGridView -->
+			<Member fullName="System\.Func`1&lt;Android\.Views\.View&gt; Uno\.UI\.Controls\.HorizontalGridView\.get_(Item|Header|Footer)Template\(\)" reason="Not in UWP" isRegex="true" />
+			<Member fullName="System\.Void Uno\.UI\.Controls\.HorizontalGridView\.set_(Item|Header|Footer)Template\(System\.Func`1&lt;Android\.Views\.View&gt; value\)" reason="Not in UWP" isRegex="true" />
+
+			<!-- ViewExtensions -->
+			<Member fullName="System\.String Uno\.UI\.Extensions\.ViewExtensions\.TreeGraph\((?&lt;_View&gt;.+) reference, System\.Func`2&lt;\k&lt;_View&gt;,System\.String&gt; describe\)" isRegex="true" reason="Not in UWP" />
+
+			<!-- END templated-parent rework -->
+
+			<!-- BEGIN ComboBox.IsEditable -->
+			<Member fullName="System.Void Windows.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView, System.Boolean forceFocus, Windows.UI.Xaml.FocusState focusState, System.Boolean animateIfBringIntoView)" reason="Does not exist in UWP" />
+			<Member fullName="System.Void Windows.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView, System.Boolean forceFocus, Windows.UI.Xaml.FocusState focusState, System.Boolean animateIfBringIntoView, Windows.UI.Xaml.Input.FocusNavigationDirection focusNavigationDirection)" reason="Does not exist in UWP" />
+			<Member fullName="System.Void Windows.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView, System.Boolean animateIfBringIntoView, Windows.UI.Xaml.Input.FocusNavigationDirection focusNavigationDirection)" reason="Does not exist in UWP" />
+			<Member fullName="System.Void Windows.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView)" reason="Does not exist in UWP" />
+			<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView, System.Boolean forceFocus, Microsoft.UI.Xaml.FocusState focusState, System.Boolean animateIfBringIntoView)" reason="Does not exist in WinUI" />
+			<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView, System.Boolean forceFocus, Microsoft.UI.Xaml.FocusState focusState, System.Boolean animateIfBringIntoView, Microsoft.UI.Xaml.Input.FocusNavigationDirection focusNavigationDirection)" reason="Does not exist in WinUI" />
+			<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView, System.Boolean animateIfBringIntoView, Microsoft.UI.Xaml.Input.FocusNavigationDirection focusNavigationDirection)" reason="Does not exist in WinUI" />
+			<Member fullName="System.Void Microsoft.UI.Xaml.Controls.Primitives.Selector.SetFocusedItem(System.Int32 index, System.Boolean shouldScrollIntoView)" reason="Does not exist in WinUI" />
+			<!-- END ComboBox.IsEditable -->
+
+			<!-- BEGIN TypeMappings -->
+			<Member fullName="System.Threading.Tasks.Task Uno.UI.Helpers.TypeMappings.WaitForMappingsToResume()" reason="Not really considered a public API, used by internal tooling" />
+			<Member fullName="System.Threading.Tasks.Task`1&lt;System.Boolean&gt; Uno.UI.Helpers.TypeMappings.WaitForResume()" reason="Not really considered a public API, used by internal tooling" />
+			<Member fullName="System.Void Uno.UI.Helpers.TypeMappings.Resume(System.Boolean updateLayout)" reason="Not really considered a public API, used by internal tooling" />
+			<!-- END TypeMappings -->
+		</Methods>
+	</IgnoreSet>
+
+	<IgnoreSet baseVersion="5.5">
+		<Assemblies>
+		</Assemblies>
+
+		<Types>
+		</Types>
+
+		<Events>
+		</Events>
+
+		<Fields>
+		</Fields>
+
+		<Properties>
+		</Properties>
+
+		<Methods>
+			<!-- BEGIN TypeMappings -->
+			<Member fullName="System.Threading.Tasks.Task Uno.UI.Helpers.TypeMappings.WaitForMappingsToResume()" reason="Not really considered a public API, used by internal tooling" />
+			<Member fullName="System.Threading.Tasks.Task`1&lt;System.Boolean&gt; Uno.UI.Helpers.TypeMappings.WaitForResume()" reason="Not really considered a public API, used by internal tooling" />
+			<Member fullName="System.Void Uno.UI.Helpers.TypeMappings.Resume(System.Boolean updateLayout)" reason="Not really considered a public API, used by internal tooling" />
+			<!-- END TypeMappings -->
 		</Methods>
 	</IgnoreSet>
-	
+
 	<![CDATA[
 		The 'baseVersion' should be the current latest stable version published on nuget, 
 		NOT what will be published by the PR in progress.

diff --git a/build/cSpell.json b/build/cSpell.json
@@ -87,6 +87,7 @@
 	"signalr",
 	"Skia",
 	"skiasharp",
+	"Snapcraft",
 	"Storyboarded",
 	"struct",
 	"Syncfusion",

diff --git a/build/ci/.azure-devops-android-tests.yml b/build/ci/.azure-devops-android-tests.yml
@@ -72,6 +72,8 @@ jobs:
   - Android_Build_NetCoreMobile_For_Tests
 
   timeoutInMinutes: 45
+  cancelTimeoutInMinutes: 1
+
   variables:
     CI_Build: true
     SourceLinkEnabled: false
@@ -178,6 +180,8 @@ jobs:
 
   ## First tests run (https://github.com/unoplatform/uno/issues/6714)
   - bash: |
+      # always set execute bit, as git has a tendency to remove it
+      chmod +x $(build.sourcesdirectory)/build/test-scripts/android-uitest-run.sh
       $(build.sourcesdirectory)/build/test-scripts/android-uitest-run.sh
 
     displayName: Run Android Tests

diff --git a/build/ci/.azure-devops-ios-tests-run.yml b/build/ci/.azure-devops-ios-tests-run.yml
@@ -12,6 +12,7 @@ parameters:
 jobs:
 - job: ${{ parameters.JobName }}
   timeoutInMinutes: ${{ parameters.JobTimeoutInMinutes }}
+  cancelTimeoutInMinutes: 1
   dependsOn:
   - iOS_Build
 

diff --git a/build/ci/.azure-devops-ios-tests.yml b/build/ci/.azure-devops-ios-tests.yml
@@ -149,10 +149,10 @@ jobs:
   - bash: |
       cd $(BUILD.SOURCESDIRECTORY)/src/SamplesApp/SamplesApp.netcoremobile
       dotnet publish \
-        -f net8.0-ios \
+        -f net9.0-ios \
         -c Release \
         -p:BuildForTestFlight=true \
-        -p:UnoTargetFrameworkOverride=net8.0-ios \
+        -p:UnoTargetFrameworkOverride=net9.0-ios \
         /bl:$(build.artifactstagingdirectory)/ios-netcoremobile-sampleapp-testflight.binlog
 
     displayName: Build iOS App for TestFlight
@@ -164,7 +164,7 @@ jobs:
 
   - task: CopyFiles@2
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile/bin/Release/net8.0-ios/ios-arm64/publish
+      SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.netcoremobile/bin/Release/net9.0-ios/ios-arm64/publish
       Contents: '**'
       TargetFolder: $(build.artifactstagingdirectory)/TestFlight
       CleanTargetFolder: false

diff --git a/build/ci/.azure-devops-package-netcoremobile.yml b/build/ci/.azure-devops-package-netcoremobile.yml
@@ -7,6 +7,7 @@ jobs:
 - job: netcoremobile_win_build
   displayName: '.NET Mobile Package Binaries'
   timeoutInMinutes: 90
+  cancelTimeoutInMinutes: 1
 
   pool: ${{ parameters.poolName }}
 
@@ -74,7 +75,7 @@ jobs:
       msbuildLocationMethod: version
       msbuildVersion: latest
       msbuildArchitecture: x86
-      msbuildArguments: /r /m /v:m /p:Configuration=Release /p:BuildGraphics3DGLForWindows=true /detailedsummary /bl:$(build.artifactstagingdirectory)/build-$(GitVersion.FullSemVer)-graphics3dgl-windows-$(XAML_FLAVOR_BUILD)-binaries.binlog
+      msbuildArguments: /r /m /v:m /p:Configuration=Release /p:BuildGraphics3DGLForWindows=true /p:PackageVersion=$(GITVERSION.SemVer) /p:InformationalVersion=$(GITVERSION.InformationalVersion) /p:PackageOutputPath=$(build.artifactstagingdirectory)\vslatest-netcoremobile /detailedsummary /bl:$(build.artifactstagingdirectory)/build-$(GitVersion.FullSemVer)-graphics3dgl-windows-$(XAML_FLAVOR_BUILD)-binaries.binlog
       clean: false
       restoreNugetPackages: false
       logProjectEvents: false

diff --git a/build/ci/.azure-devops-pipeline-validations.yml b/build/ci/.azure-devops-pipeline-validations.yml
@@ -5,24 +5,11 @@ jobs:
 - job: Pipeline_Validations
   displayName: 'Pipeline Validations'
 
-  strategy:
-    matrix:
-      Ubuntu:
-        localVmImage: 'ubuntu-latest'
-
-      Windows:
-        localVmImage: 'windows-latest'
-
-      macOS:
-        localVmImage: 'macos-latest'
-
   pool:
-    vmImage: $(localVmImage)
+    vmImage: ubuntu-latest
 
   steps:
   - checkout: self
     clean: true
 
-  - template: templates/gitversion.yml
-    parameters:
-      skipCacheDownload: true
+  - template: templates/gitversion-run.yml
diff --git a/build/ci/.azure-devops-project-template-tests.yml b/build/ci/.azure-devops-project-template-tests.yml
@@ -9,6 +9,7 @@ jobs:
 - job: Dotnet_Template_Tests_NetCoreMobile_windows
   displayName: 'Run .NET Templates Tests Windows'
   timeoutInMinutes: 120
+  cancelTimeoutInMinutes: 1
 
   pool: ${{ parameters.poolName }}
 
@@ -57,6 +58,7 @@ jobs:
 - job: Dotnet_Template_Tests_NetCoreMobile_macos
   displayName: 'Run .NET Templates Tests macOS'
   timeoutInMinutes: 120
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.macOSImageName }}

diff --git a/build/ci/.azure-devops-screenshot-compare.yml b/build/ci/.azure-devops-screenshot-compare.yml
@@ -7,6 +7,7 @@ jobs:
   displayName: 'UI Tests Screenshots Comparison'
 
   timeoutInMinutes: 90
+  cancelTimeoutInMinutes: 1
 
   condition: or(succeeded(), and(failed(), ge(variables['System.StageAttempt'], 5)))
 

diff --git a/build/ci/.azure-devops-skia-tests.yml b/build/ci/.azure-devops-skia-tests.yml
@@ -24,6 +24,7 @@ jobs:
 - job: Skia_Tests_Build
   displayName: 'Build Skia Samples App UI Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
   dependsOn: skia_package_macos_native_build
 
   pool: ${{ parameters.poolName }}
@@ -107,6 +108,7 @@ jobs:
 - job: Skia_Gtk_Screenshot_Tests
   displayName: 'Run Skia GTK Snapshot Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.vmImage }}
@@ -153,6 +155,7 @@ jobs:
 - job: Skia_Gtk_Runtime_Tests_Build
   displayName: 'Run Skia GTK Runtime Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.vmImage }}
@@ -239,6 +242,7 @@ jobs:
 - job: Skia_Windows_Screenshot_Tests
   displayName: 'Run Skia Windows Snapshot Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.vmImage }}
@@ -277,6 +281,7 @@ jobs:
 - job: Skia_Windows_Runtime_Tests_Build
   displayName: 'Run Skia Windows Runtime Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.vmImage }}
@@ -316,6 +321,7 @@ jobs:
 - job: Uno_Islands_Skia_Wpf_Runtime_Tests_Build
   displayName: 'Run Uno Islands Skia WPF Runtime Tests'
   timeoutInMinutes: 45
+  cancelTimeoutInMinutes: 1
   condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
   pool:
     vmImage: ${{ parameters.vmImage }}
@@ -359,6 +365,7 @@ jobs:
 - job: Skia_Linux_Screenshot_Tests
   displayName: 'Run Skia Linux Snapshot Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.vmLinuxImage }}
@@ -398,6 +405,7 @@ jobs:
 - job: Skia_Linux_Runtime_Tests_Build
   displayName: 'Run Skia Linux Runtime Tests'
   timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 1
 
   pool:
     vmImage: ${{ parameters.vmLinuxImage }}

diff --git a/build/ci/.azure-devops-unit-tests.yml b/build/ci/.azure-devops-unit-tests.yml
@@ -5,6 +5,7 @@ jobs:
 - job: Unit_Tests
   displayName: 'Unit Tests'
   timeoutInMinutes: 90
+  cancelTimeoutInMinutes: 1
 
   pool: ${{ parameters.poolName }}
 

diff --git a/build/ci/net9/global.json b/build/ci/net9/global.json
@@ -1,11 +1,11 @@
 {
 	"sdk": {
-		"version": "9.0.100-rc.1.24452.12",
+		"version": "9.0.100-rc.2.24474.11",
 		"allowPrerelease": true,
 		"rollForward": "disable"
 	},
 	"tools": {
-		"dotnet": "9.0.100-rc.1.24452.12"
+		"dotnet": "9.0.100-rc.2.24474.11"
 	},
 	"msbuild-sdks": {
 		"MSBuild.Sdk.Extras": "3.0.44",

diff --git a/build/ci/templates/dotnet-mobile-install-linux.yml b/build/ci/templates/dotnet-mobile-install-linux.yml
@@ -1,5 +1,5 @@
 parameters:
-  UnoCheck_Version: '1.26.0-dev.40'
+  UnoCheck_Version: '1.26.0-dev.63'
 
 steps:
 

diff --git a/build/ci/templates/dotnet-mobile-install-mac.yml b/build/ci/templates/dotnet-mobile-install-mac.yml
@@ -1,5 +1,5 @@
 parameters:
-  UnoCheck_Version: '1.26.0-dev.40'
+  UnoCheck_Version: '1.26.0-dev.63'
 
 steps:
 

diff --git a/build/ci/templates/dotnet-mobile-install-windows.yml b/build/ci/templates/dotnet-mobile-install-windows.yml
@@ -1,5 +1,5 @@
 parameters:
-  UnoCheck_Version: '1.26.0-dev.40'
+  UnoCheck_Version: '1.26.0-dev.63'
 
 steps: