Skip to content

[net10] [ci] Update iOS and Android workloads #33017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmarinho merged 8 commits into from
Dec 11, 2025
Merged

[net10] [ci] Update iOS and Android workloads #33017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4363b04
[ci] Update iOS and Android workloads
rmarinho Dec 5, 2025
b9bffea
Update feeds
rmarinho Dec 5, 2025
d6a9388
Merge branch 'net10.0' into update-ios-names
rmarinho Dec 5, 2025
a50082d
Update MacCatalyst, macOS, iOS, and tvOS SDK versions
rmarinho Dec 5, 2025
8f6a8d4
Update versions again
rmarinho Dec 5, 2025
c9650ca
Add feed
rmarinho Dec 5, 2025
96e6ee2
Aspnetcore 9.0.12 feed
rmarinho Dec 9, 2025
7fac6cb
[tests] Suppress Xcode version check
rmarinho Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-android -->
<add key="darc-pub-dotnet-android-78068f5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-78068f54/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-02dfa78" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-02dfa783/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-bff50fc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-bff50fc0/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-0b260c0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0b260c05/nuget/v3/index.json" />

<add key="darc-pub-dotnet-macios-8acf4462" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-8acf4462/nuget/v3/index.json" />

<!-- End: Package sources from dotnet-macios -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="local" value="LOCAL_PLACEHOLDER" />
Expand All @@ -20,6 +24,8 @@
<add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
Expand All @@ -31,18 +37,13 @@
<add key="darc-pub-dotnet-runtime-efd48bdf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-efd48bdf/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 9.0.12 -->
<add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2b2a06c8/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 9.0.12 -->
<add key="darc-pub-dotnet-aspnetcore-553d4e88" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-553d4e88/nuget/v3/index.json" />

<!-- Added manually for .NET 9 Android -->
<add key="darc-pub-dotnet-android-1719a35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1719a35b/nuget/v3/index.json" />
<!-- Added manually for .NET 8 Android -->
<add key="darc-pub-dotnet-android-cdb777a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-cdb777a0/nuget/v3/index.json" />
<!-- Added manually for .NET 9 macios -->
<add key="darc-pub-dotnet-macios-0e1a194" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-0e1a194-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-8071534" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-80715342/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="darc-pub-dotnet-macios-491c55ca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-491c55ca/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,46 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>02dfa783c1f4223a5590a1b689ef381c337db1ab</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="36.1.2">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="36.1.6">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>01024bb616e7b80417a2c6d320885bfdb956f20a</Sha>
<Sha>78068f54d4a3495501c0e1c377936bee000bfd4b</Sha>
</Dependency>
<!-- Previous .NET Android version(s) -->
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.105" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>1dcfb6f8779c33b6f768c996495cb90ecd729329</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11020">
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.1" Version="26.1.10508">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340</Sha>
<Sha>0b260c058e3828b90df58b04dbd8aaabcfb538ac</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.0" Version="26.0.11020">
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.1" Version="26.1.10508">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340</Sha>
<Sha>0b260c058e3828b90df58b04dbd8aaabcfb538ac</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.0" Version="26.0.11020">
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.1" Version="26.1.10508">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340</Sha>
<Sha>0b260c058e3828b90df58b04dbd8aaabcfb538ac</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.0" Version="26.0.11020">
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.1" Version="26.1.10508">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340</Sha>
<Sha>0b260c058e3828b90df58b04dbd8aaabcfb538ac</Sha>
</Dependency>
<!-- Previous .NET iOS version(s) -->
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_26.0">
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>e5afbf5332820488c4a2d26dad02df88c0110136</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_26.0">
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>e5afbf5332820488c4a2d26dad02df88c0110136</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_26.0">
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>e5afbf5332820488c4a2d26dad02df88c0110136</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_26.0">
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9766" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_26.1">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>e5afbf5332820488c4a2d26dad02df88c0110136</Sha>
</Dependency>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
<MicrosoftExtensionsPrimitivesVersion>10.0.2</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.2</MicrosoftExtensionsHostingAbstractionsVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>36.1.2</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>36.1.6</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11020</MicrosoftMacCatalystSdknet100_260PackageVersion>
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11020</MicrosoftmacOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11020</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11020</MicrosofttvOSSdknet100_260PackageVersion>
<MicrosoftMacCatalystSdknet100_261PackageVersion>26.1.10508</MicrosoftMacCatalystSdknet100_261PackageVersion>
<MicrosoftmacOSSdknet100_261PackageVersion>26.1.10508</MicrosoftmacOSSdknet100_261PackageVersion>
<MicrosoftiOSSdknet100_261PackageVersion>26.1.10508</MicrosoftiOSSdknet100_261PackageVersion>
<MicrosofttvOSSdknet100_261PackageVersion>26.1.10508</MicrosofttvOSSdknet100_261PackageVersion>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9766</MicrosoftMacCatalystSdknet90_260PackageVersion>
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9766</MicrosoftmacOSSdknet90_260PackageVersion>
Expand Down Expand Up @@ -213,9 +213,9 @@
<DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
<DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
<DotNetTizenManifestVersionBand>9.0.100</DotNetTizenManifestVersionBand>
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_260PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_260PackageVersion)</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_260PackageVersion)</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_260PackageVersion)</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_261PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_261PackageVersion)</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_261PackageVersion)</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_261PackageVersion)</MicrosofttvOSSdkPackageVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ variables:
- name: DOTNET_VERSION
value: 10.0.100
- name: REQUIRED_XCODE
value: 26.0.1
value: 26.1.0
- name: DEVICETESTS_REQUIRED_XCODE
value: 26.0.1
value: 26.1.0
- name: XCODE
value: 26.0.1
value: 26.1.0
- name: POWERSHELL_VERSION
value: 7.4.0
# Localization variables
Expand Down
2 changes: 2 additions & 0 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public string TestName
"TreatWarningsAsErrors=true",
// Detailed trimmer warnings, if present
"TrimmerSingleWarn=false",
// Suppress Xcode version check
"ValidateXcodeVersion=false"
};


Expand Down