Skip to content

Commit 6ab5da6

Browse files
rmarinhormarinho
authored
[iOS] Update net10 iOS to rc2 (#31749)
* [iOS] Update net10 iOS to rc2 * Update Xcode * Fix missing version updates * Update default framework versions to 26.0 * Update Directory.Build.props * Update Issues16321.xaml.cs * Update Issue21948.xaml.cs * FOrce latest OSVersion 15.6 * Add to main pipeline OSVersion -equals 15.6 * Update iOS * Update sdk * [ci] Update iOS rc2 * Revert "Update sdk" This reverts commit fb40735. * Move to macOS-14
1 parent 12dff19 commit 6ab5da6

File tree

10 files changed

+74
-42
lines changed

10 files changed

+74
-42
lines changed

‎Directory.Build.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@
157157
<!-- version number information -->
158158
<PropertyGroup>
159159
<!-- Default versions from the SDKs (update when there is a new TFM version) -->
160-
<IosTargetFrameworkVersionSdkDefault>18.5</IosTargetFrameworkVersionSdkDefault>
161-
<TvosTargetFrameworkVersionSdkDefault>18.5</TvosTargetFrameworkVersionSdkDefault>
162-
<MacCatalystTargetFrameworkVersionSdkDefault>18.5</MacCatalystTargetFrameworkVersionSdkDefault>
163-
<MacosTargetFrameworkVersionSdkDefault>15.5</MacosTargetFrameworkVersionSdkDefault>
160+
<IosTargetFrameworkVersionSdkDefault>26.0</IosTargetFrameworkVersionSdkDefault>
161+
<TvosTargetFrameworkVersionSdkDefault>26.0</TvosTargetFrameworkVersionSdkDefault>
162+
<MacCatalystTargetFrameworkVersionSdkDefault>26.0</MacCatalystTargetFrameworkVersionSdkDefault>
163+
<MacosTargetFrameworkVersionSdkDefault>26.0</MacosTargetFrameworkVersionSdkDefault>
164164
<AndroidTargetFrameworkVersionSdkDefault>36.0</AndroidTargetFrameworkVersionSdkDefault>
165165
<!-- Current .NET -->
166-
<IosTargetFrameworkVersion>18.5</IosTargetFrameworkVersion>
167-
<TvosTargetFrameworkVersion>18.5</TvosTargetFrameworkVersion>
168-
<MacCatalystTargetFrameworkVersion>18.5</MacCatalystTargetFrameworkVersion>
169-
<MacosTargetFrameworkVersion>15.5</MacosTargetFrameworkVersion>
166+
<IosTargetFrameworkVersion>26.0</IosTargetFrameworkVersion>
167+
<TvosTargetFrameworkVersion>26.0</TvosTargetFrameworkVersion>
168+
<MacCatalystTargetFrameworkVersion>26.0</MacCatalystTargetFrameworkVersion>
169+
<MacosTargetFrameworkVersion>26.0</MacosTargetFrameworkVersion>
170170
<AndroidTargetFrameworkVersion>36.0</AndroidTargetFrameworkVersion>
171171
<WindowsTargetFrameworkVersion>10.0.19041.0</WindowsTargetFrameworkVersion>
172172
<Windows2TargetFrameworkVersion>10.0.20348.0</Windows2TargetFrameworkVersion>

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<add key="darc-pub-dotnet-android-1dcfb6f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1dcfb6f8-1/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-android -->
1212
<!-- Begin: Package sources from dotnet-macios -->
13-
<add key="darc-pub-dotnet-macios-4681bf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-macios-4681bf9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92-1/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-macios-177f431" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-177f4311/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-macios-177f431-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-177f4311-1/nuget/v3/index.json" />
1515
<!-- End: Package sources from dotnet-macios -->
1616
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1717
<add key="local" value="LOCAL_PLACEHOLDER" />

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,39 @@
1717
<Uri>https://github.com/dotnet/android</Uri>
1818
<Sha>1dcfb6f8779c33b6f768c996495cb90ecd729329</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_18.5" Version="18.5.10892-net10-rc.2">
20+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
2121
<Uri>https://github.com/dotnet/macios</Uri>
22-
<Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
22+
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.macOS.Sdk.net10.0_15.5" Version="15.5.10892-net10-rc.2">
24+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
2525
<Uri>https://github.com/dotnet/macios</Uri>
26-
<Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
26+
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.iOS.Sdk.net10.0_18.5" Version="18.5.10892-net10-rc.2">
28+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
2929
<Uri>https://github.com/dotnet/macios</Uri>
30-
<Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
30+
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_18.5" Version="18.5.10892-net10-rc.2">
32+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
3333
<Uri>https://github.com/dotnet/macios</Uri>
34-
<Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
34+
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
3535
</Dependency>
3636
<!-- Previous .NET iOS version(s) -->
3737
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
38-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_18.5">
38+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_26.0">
3939
<Uri>https://github.com/dotnet/macios</Uri>
40-
<Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
40+
<Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.macOS.Sdk.net9.0_15.5" Version="15.5.9227" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_15.5">
42+
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_26.0">
4343
<Uri>https://github.com/dotnet/macios</Uri>
44-
<Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
44+
<Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.iOS.Sdk.net9.0_18.5" Version="18.5.9227" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_18.5">
46+
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_26.0">
4747
<Uri>https://github.com/dotnet/macios</Uri>
48-
<Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
48+
<Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_18.5" Version="18.5.9227" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_18.5">
50+
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_26.0">
5151
<Uri>https://github.com/dotnet/macios</Uri>
52-
<Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
52+
<Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
5353
</Dependency>
5454
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
5555
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>

‎eng/Versions.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>
5757
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
5858
<!-- xamarin/xamarin-macios -->
59-
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10892-net10-rc.2</MicrosoftMacCatalystSdknet100_185PackageVersion>
60-
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10892-net10-rc.2</MicrosoftmacOSSdknet100_155PackageVersion>
61-
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10892-net10-rc.2</MicrosoftiOSSdknet100_185PackageVersion>
62-
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10892-net10-rc.2</MicrosofttvOSSdknet100_185PackageVersion>
59+
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftMacCatalystSdknet100_260PackageVersion>
60+
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftmacOSSdknet100_260PackageVersion>
61+
<MicrosoftiOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftiOSSdknet100_260PackageVersion>
62+
<MicrosofttvOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosofttvOSSdknet100_260PackageVersion>
6363
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
64-
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
65-
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
66-
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
67-
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
64+
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9752</MicrosoftMacCatalystSdknet90_260PackageVersion>
65+
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9752</MicrosoftmacOSSdknet90_260PackageVersion>
66+
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9752</MicrosoftiOSSdknet90_260PackageVersion>
67+
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9752</MicrosofttvOSSdknet90_260PackageVersion>
6868
<!-- Samsung/Tizen.NET -->
6969
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
7070
<!-- wasdk -->
@@ -211,9 +211,9 @@
211211
<DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
212212
<DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
213213
<DotNetTizenManifestVersionBand>9.0.100</DotNetTizenManifestVersionBand>
214-
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_185PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
215-
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_155PackageVersion)</MicrosoftmacOSSdkPackageVersion>
216-
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_185PackageVersion)</MicrosoftiOSSdkPackageVersion>
217-
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_185PackageVersion)</MicrosofttvOSSdkPackageVersion>
214+
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_260PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
215+
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_260PackageVersion)</MicrosoftmacOSSdkPackageVersion>
216+
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_260PackageVersion)</MicrosoftiOSSdkPackageVersion>
217+
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_260PackageVersion)</MicrosofttvOSSdkPackageVersion>
218218
</PropertyGroup>
219219
</Project>

‎eng/pipelines/common/variables.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ variables:
88
- name: DOTNET_VERSION
99
value: 10.0.100-preview.2.25164.34
1010
- name: REQUIRED_XCODE
11-
value: 16.4.0
11+
value: 26.0.0
1212
- name: DEVICETESTS_REQUIRED_XCODE
13-
value: 16.4.0
13+
value: 26.0.0
1414
- name: POWERSHELL_VERSION
1515
value: 7.4.0
1616
# Localization variables

‎eng/pipelines/device-tests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ parameters:
7373
vmImage: $(iosDeviceTestsVmImage)
7474
demands:
7575
- macOS.Name -equals Sequoia
76+
- Agent.OSVersion -equals 15.6
7677

7778
- name: catalystPool
7879
type: object
@@ -81,6 +82,7 @@ parameters:
8182
vmImage: $(iosDeviceTestsVmImage)
8283
demands:
8384
- macOS.Name -equals Sequoia
85+
- Agent.OSVersion -equals 15.6
8486

8587
- name: windowsPool
8688
type: object

‎eng/pipelines/handlers.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ parameters:
8080
demands:
8181
- macOS.Name -equals Sequoia
8282
- macOS.Architecture -equals x64
83+
- Agent.OSVersion -equals 15.6
8384
artifact: build-macos
8485

8586
- name: PackPlatforms
@@ -107,6 +108,7 @@ parameters:
107108
demands:
108109
- macOS.Name -equals Sequoia
109110
- macOS.Architecture -equals x64
111+
- Agent.OSVersion -equals 15.6
110112
artifact: build-macos
111113

112114
- name: RunTemplatePlatforms
@@ -117,13 +119,15 @@ parameters:
117119
demands:
118120
- macOS.Name -equals Sequoia
119121
- macOS.Architecture -equals x64
122+
- Agent.OSVersion -equals 15.6
120123
testName: RunOnAndroid
121124
artifact: templates-run-android
122125
- name: $(iosTestsVmPool)
123126
vmImage: $(iosTestsVmImage)
124127
demands:
125128
- macOS.Name -equals Sequoia
126129
- macOS.Architecture -equals x64
130+
- Agent.OSVersion -equals 15.6
127131
testName: RunOniOS
128132
artifact: templates-run-ios
129133

@@ -135,6 +139,7 @@ parameters:
135139
demands:
136140
- macOS.Name -equals Sequoia
137141
- macOS.Architecture -equals arm64
142+
- Agent.OSVersion -equals 15.6
138143

139144
resources:
140145
repositories:

‎eng/pipelines/ui-tests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ parameters:
7474
demands:
7575
- macOS.Name -equals Sequoia
7676
- macOS.Architecture -equals x64
77+
- Agent.OSVersion -equals 15.6
7778

7879
- name: androidPoolLinux
7980
type: object
@@ -91,6 +92,7 @@ parameters:
9192
demands:
9293
- macOS.Name -equals Sequoia
9394
- macOS.Architecture -equals x64
95+
- Agent.OSVersion -equals 15.6
9496

9597
- name: windowsBuildPool
9698
type: object

‎src/Controls/tests/TestCases.HostApp/Issues/Issue21948.xaml.cs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,23 @@ public void OpenNewWindowClicked(object obj, EventArgs e)
2424
#if IOS || MACCATALYST
2525
async void OpenNewWindow()
2626
{
27-
var uIWindow = new UIWindow();
27+
2828
var keyWindow = (this.Window.Handler.PlatformView as UIWindow);
2929
if (keyWindow?.WindowLevel == UIWindowLevel.Normal)
3030
keyWindow.WindowLevel = -1;
3131

32+
UIWindow uIWindow;
33+
if (OperatingSystem.IsIOSVersionAtLeast(13) && keyWindow?.WindowScene is not null)
34+
{
35+
uIWindow = new UIWindow(keyWindow.WindowScene);
36+
}
37+
else
38+
{
39+
#pragma warning disable CA1422 // This call site is reachable on iOS < 13.0
40+
uIWindow = new UIWindow();
41+
#pragma warning restore CA1422
42+
}
43+
3244
var page = new ContentPage();
3345
this.AddLogicalChild(page);
3446
var handler = page.ToHandler(this.Handler.MauiContext);

‎src/Controls/tests/TestCases.HostApp/Issues/Issues16321.xaml.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,19 @@ async void OpenActionSheetWithModals(System.Object sender, System.EventArgs e)
4646

4747
async void OpenPrompt(System.Object sender, System.EventArgs e, Func<Page, Task> promptAction)
4848
{
49-
var uIWindow = new UIWindow();
5049
var keyWindow = (this.Window.Handler.PlatformView as UIWindow);
50+
51+
UIWindow uIWindow;
52+
if (OperatingSystem.IsIOSVersionAtLeast(13) && keyWindow?.WindowScene is not null)
53+
{
54+
uIWindow = new UIWindow(keyWindow.WindowScene);
55+
}
56+
else
57+
{
58+
#pragma warning disable CA1422 // This call site is reachable on iOS < 13.0
59+
uIWindow = new UIWindow();
60+
#pragma warning restore CA1422
61+
}
5162
if (keyWindow?.WindowLevel == UIWindowLevel.Normal)
5263
keyWindow.WindowLevel = -1;
5364

0 commit comments

Comments
 (0)