From 53481cdd83f72cc2343c69ac7d1550ded35818df Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 24 Jun 2025 13:09:11 +0100 Subject: [PATCH 1/6] [ci] Update macios sdk versions --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f50fa994efc..f370a9b6d98f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,21 +17,21 @@ https://github.com/dotnet/android 9abff7703206541fdb83ffa80fe2c2753ad1997b - + https://github.com/dotnet/macios - 8126ccac5152f1f35e669de987e6e3f8456af548 + 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90 - + https://github.com/dotnet/macios - 8126ccac5152f1f35e669de987e6e3f8456af548 + 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90 - + https://github.com/dotnet/macios - 8126ccac5152f1f35e669de987e6e3f8456af548 + 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90 - + https://github.com/dotnet/macios - 8126ccac5152f1f35e669de987e6e3f8456af548 + 96ea7cf2db5943ee8dc6c5cf572db03edebd6a90 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 2782b56d3a05..3c313c53a46d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,10 +56,10 @@ 35.0.78 $(MicrosoftNETSdkAndroidManifest90100PackageVersion) - 18.4.10636-net10-p6 - 15.4.10636-net10-p6 - 18.4.10636-net10-p6 - 18.4.10636-net10-p6 + 18.5.10415-net10-p6 + 15.5.10415-net10-p6 + 18.5.10415-net10-p6 + 18.5.10415-net10-p6 8.0.148 From 94469ab86e972ba6cb82599437efd487a4326812 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 24 Jun 2025 14:17:07 +0100 Subject: [PATCH 2/6] Update Versions.props --- eng/Versions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3c313c53a46d..951e033d3acb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -191,7 +191,7 @@ - + @@ -211,9 +211,9 @@ $(DotNetVersionBand) $(DotNetVersionBand) 9.0.100 - $(MicrosoftMacCatalystSdknet100_184PackageVersion) - $(MicrosoftmacOSSdknet100_154PackageVersion) - $(MicrosoftiOSSdknet100_184PackageVersion) - $(MicrosofttvOSSdknet100_184PackageVersion) + $(MicrosoftMacCatalystSdknet100_185PackageVersion) + $(MicrosoftmacOSSdknet100_155PackageVersion) + $(MicrosoftiOSSdknet100_185PackageVersion) + $(MicrosofttvOSSdknet100_185PackageVersion) From 6e66ddc027b6644dcd42c49b175fa04891d077cd Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 24 Jun 2025 14:59:56 +0100 Subject: [PATCH 3/6] Update Directory.Build.props --- Directory.Build.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7b6ed5585a4b..38a8dc269865 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -147,10 +147,10 @@ - 18.4 - 18.4 - 18.4 - 15.4 + 18.5 + 18.5 + 18.5 + 15.5 36.0 18.4 From 12a9a246969a0c739105c4b88bc532077d9a2a93 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 24 Jun 2025 15:58:39 +0100 Subject: [PATCH 4/6] [iOS] Fix nullability --- src/Core/src/Handlers/MenuBar/MenuBarHandler.iOS.cs | 2 +- src/Core/src/Platform/iOS/ApplicationExtensions.cs | 2 +- src/Core/src/Platform/iOS/MenuExtensions.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Core/src/Handlers/MenuBar/MenuBarHandler.iOS.cs b/src/Core/src/Handlers/MenuBar/MenuBarHandler.iOS.cs index 328ebb7699f3..ee561cd4a019 100644 --- a/src/Core/src/Handlers/MenuBar/MenuBarHandler.iOS.cs +++ b/src/Core/src/Handlers/MenuBar/MenuBarHandler.iOS.cs @@ -51,7 +51,7 @@ void BuildNewMenu() } else { - PlatformView.InsertSiblingMenuBefore(menuItem, UIMenuIdentifier.File.GetConstant()); + PlatformView.InsertSiblingMenuBefore(menuItem, UIMenuIdentifier.File.GetConstant() ?? string.Empty); } } diff --git a/src/Core/src/Platform/iOS/ApplicationExtensions.cs b/src/Core/src/Platform/iOS/ApplicationExtensions.cs index 6e2e88643584..e16487903a8f 100644 --- a/src/Core/src/Platform/iOS/ApplicationExtensions.cs +++ b/src/Core/src/Platform/iOS/ApplicationExtensions.cs @@ -130,7 +130,7 @@ public static NSUserActivity ToUserActivity(this IPersistedState? state, string { foreach (var pair in state) { - userInfo.SetValueForKey(new NSString(pair.Value), new NSString(pair.Key)); + userInfo.SetValueForKey(new NSString(pair.Value ?? string.Empty), new NSString(pair.Key)); } } diff --git a/src/Core/src/Platform/iOS/MenuExtensions.cs b/src/Core/src/Platform/iOS/MenuExtensions.cs index d651eb81d9f0..da4b46fd946a 100644 --- a/src/Core/src/Platform/iOS/MenuExtensions.cs +++ b/src/Core/src/Platform/iOS/MenuExtensions.cs @@ -112,7 +112,7 @@ internal static UIMenu ToPlatformMenu( if (result != null) { platformMenu = - uIMenuBuilder.GetMenu(((UIMenuIdentifier)result).GetConstant()); + uIMenuBuilder.GetMenu(((UIMenuIdentifier)result).GetConstant() ?? string.Empty); } } From cb72909471ec9365d6daef0172b2d57e5a42c639 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 24 Jun 2025 16:20:31 +0100 Subject: [PATCH 5/6] Update xcode --- eng/pipelines/common/variables.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index dd7ee49c826e..ac94bee35b6f 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -8,9 +8,9 @@ variables: - name: DOTNET_VERSION value: 10.0.100-preview.2.25164.34 - name: REQUIRED_XCODE - value: 16.3.0 + value: 16.4.0 - name: DEVICETESTS_REQUIRED_XCODE - value: 16.3.0 + value: 16.4.0 - name: POWERSHELL_VERSION value: 7.4.0 # Localization variables @@ -64,7 +64,7 @@ variables: - ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui')) }}: - name: internalProvisioning value: true - - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - name: PrivateBuild value: false - name: _RunAsPublic @@ -90,4 +90,4 @@ variables: # DotNet-HelixApi-Access provides: HelixApiAccessToken - group: Publish-Build-Assets - group: DotNet-HelixApi-Access - - group: SDL_Settings \ No newline at end of file + - group: SDL_Settings From 00011c5eb278e5c0a0550f3be33f1a57e824788c Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 24 Jun 2025 19:27:32 +0100 Subject: [PATCH 6/6] Fix more references to version --- Directory.Build.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 38a8dc269865..84ba0b7c69db 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -153,10 +153,10 @@ 15.5 36.0 - 18.4 - 18.4 - 18.4 - 15.4 + 18.5 + 18.5 + 18.5 + 15.5 36.0 10.0.19041.0 10.0.20348.0