diff --git a/Directory.Build.props b/Directory.Build.props
index 7b7cb9895e75..f111f8cd451e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -157,16 +157,16 @@
- 18.5
- 18.5
- 18.5
- 15.5
+ 26.0
+ 26.0
+ 26.0
+ 26.0
36.0
- 18.5
- 18.5
- 18.5
- 15.5
+ 26.0
+ 26.0
+ 26.0
+ 26.0
36.0
10.0.19041.0
10.0.20348.0
diff --git a/NuGet.config b/NuGet.config
index 4bbfbb4870a2..ecc01588d899 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0294981e9f94..41a5ba0d02ab 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,39 +17,39 @@
https://github.com/dotnet/android
1dcfb6f8779c33b6f768c996495cb90ecd729329
-
+
https://github.com/dotnet/macios
- f7fc1a300221412643d5e29802d78f93acadd8b0
+ 042ba3e24d9c81be1f2a19e84cebc17d672080b2
-
+
https://github.com/dotnet/macios
- f7fc1a300221412643d5e29802d78f93acadd8b0
+ 042ba3e24d9c81be1f2a19e84cebc17d672080b2
-
+
https://github.com/dotnet/macios
- f7fc1a300221412643d5e29802d78f93acadd8b0
+ 042ba3e24d9c81be1f2a19e84cebc17d672080b2
-
+
https://github.com/dotnet/macios
- f7fc1a300221412643d5e29802d78f93acadd8b0
+ 042ba3e24d9c81be1f2a19e84cebc17d672080b2
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 177f4311930b32eecc1e462a71ebbe34b7e01a0b
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 177f4311930b32eecc1e462a71ebbe34b7e01a0b
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 177f4311930b32eecc1e462a71ebbe34b7e01a0b
-
+
https://github.com/dotnet/macios
- 4681bf928d70aa79cff2c33ad324b3be9c62b66d
+ 177f4311930b32eecc1e462a71ebbe34b7e01a0b
https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal
diff --git a/eng/Versions.props b/eng/Versions.props
index 5ef7aff55062..d998f773ef75 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,15 +56,15 @@
35.0.105
$(MicrosoftNETSdkAndroidManifest90100PackageVersion)
- 18.5.10892-net10-rc.2
- 15.5.10892-net10-rc.2
- 18.5.10892-net10-rc.2
- 18.5.10892-net10-rc.2
+ 26.0.10970-net10-rc.2
+ 26.0.10970-net10-rc.2
+ 26.0.10970-net10-rc.2
+ 26.0.10970-net10-rc.2
- 18.5.9227
- 15.5.9227
- 18.5.9227
- 18.5.9227
+ 26.0.9752
+ 26.0.9752
+ 26.0.9752
+ 26.0.9752
8.0.148
@@ -211,9 +211,9 @@
$(DotNetVersionBand)
$(DotNetVersionBand)
9.0.100
- $(MicrosoftMacCatalystSdknet100_185PackageVersion)
- $(MicrosoftmacOSSdknet100_155PackageVersion)
- $(MicrosoftiOSSdknet100_185PackageVersion)
- $(MicrosofttvOSSdknet100_185PackageVersion)
+ $(MicrosoftMacCatalystSdknet100_260PackageVersion)
+ $(MicrosoftmacOSSdknet100_260PackageVersion)
+ $(MicrosoftiOSSdknet100_260PackageVersion)
+ $(MicrosofttvOSSdknet100_260PackageVersion)
diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index 292ba731b8b8..f1ebe091237e 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.4.0
+ value: 26.0.0
- name: DEVICETESTS_REQUIRED_XCODE
- value: 16.4.0
+ value: 26.0.0
- name: POWERSHELL_VERSION
value: 7.4.0
# Localization variables
diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index 4e6f21d5e4d5..577f0d40f645 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -73,6 +73,7 @@ parameters:
vmImage: $(iosDeviceTestsVmImage)
demands:
- macOS.Name -equals Sequoia
+ - Agent.OSVersion -equals 15.6
- name: catalystPool
type: object
@@ -81,6 +82,7 @@ parameters:
vmImage: $(iosDeviceTestsVmImage)
demands:
- macOS.Name -equals Sequoia
+ - Agent.OSVersion -equals 15.6
- name: windowsPool
type: object
diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
index d79c5288fae8..2e9bf1acc4c5 100644
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@@ -80,6 +80,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals x64
+ - Agent.OSVersion -equals 15.6
artifact: build-macos
- name: PackPlatforms
@@ -107,6 +108,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals x64
+ - Agent.OSVersion -equals 15.6
artifact: build-macos
- name: RunTemplatePlatforms
@@ -117,6 +119,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals x64
+ - Agent.OSVersion -equals 15.6
testName: RunOnAndroid
artifact: templates-run-android
- name: $(iosTestsVmPool)
@@ -124,6 +127,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals x64
+ - Agent.OSVersion -equals 15.6
testName: RunOniOS
artifact: templates-run-ios
@@ -135,6 +139,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals arm64
+ - Agent.OSVersion -equals 15.6
resources:
repositories:
diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
index 1674c8da69cd..97ad89296771 100644
--- a/eng/pipelines/ui-tests.yml
+++ b/eng/pipelines/ui-tests.yml
@@ -74,6 +74,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals x64
+ - Agent.OSVersion -equals 15.6
- name: androidPoolLinux
type: object
@@ -91,6 +92,7 @@ parameters:
demands:
- macOS.Name -equals Sequoia
- macOS.Architecture -equals x64
+ - Agent.OSVersion -equals 15.6
- name: windowsBuildPool
type: object
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21948.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21948.xaml.cs
index 24bd7f75a5cc..6f5afaeb6724 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue21948.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21948.xaml.cs
@@ -24,11 +24,23 @@ public void OpenNewWindowClicked(object obj, EventArgs e)
#if IOS || MACCATALYST
async void OpenNewWindow()
{
- var uIWindow = new UIWindow();
+
var keyWindow = (this.Window.Handler.PlatformView as UIWindow);
if (keyWindow?.WindowLevel == UIWindowLevel.Normal)
keyWindow.WindowLevel = -1;
+ UIWindow uIWindow;
+ if (OperatingSystem.IsIOSVersionAtLeast(13) && keyWindow?.WindowScene is not null)
+ {
+ uIWindow = new UIWindow(keyWindow.WindowScene);
+ }
+ else
+ {
+#pragma warning disable CA1422 // This call site is reachable on iOS < 13.0
+ uIWindow = new UIWindow();
+#pragma warning restore CA1422
+ }
+
var page = new ContentPage();
this.AddLogicalChild(page);
var handler = page.ToHandler(this.Handler.MauiContext);
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issues16321.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issues16321.xaml.cs
index 06f5e3541d50..a4276b387937 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issues16321.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issues16321.xaml.cs
@@ -46,8 +46,19 @@ async void OpenActionSheetWithModals(System.Object sender, System.EventArgs e)
async void OpenPrompt(System.Object sender, System.EventArgs e, Func promptAction)
{
- var uIWindow = new UIWindow();
var keyWindow = (this.Window.Handler.PlatformView as UIWindow);
+
+ UIWindow uIWindow;
+ if (OperatingSystem.IsIOSVersionAtLeast(13) && keyWindow?.WindowScene is not null)
+ {
+ uIWindow = new UIWindow(keyWindow.WindowScene);
+ }
+ else
+ {
+#pragma warning disable CA1422 // This call site is reachable on iOS < 13.0
+ uIWindow = new UIWindow();
+#pragma warning restore CA1422
+ }
if (keyWindow?.WindowLevel == UIWindowLevel.Normal)
keyWindow.WindowLevel = -1;