From 4363b04df9af5f4177c3d1086af9bdb6cbc80d07 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 5 Dec 2025 10:38:43 +0000 Subject: [PATCH 1/7] [ci] Update iOS and Android workloads --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 18 +++++++++--------- eng/pipelines/common/variables.yml | 6 +++--- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 083e02d0a576..f9f547ed51d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,15 +6,13 @@ - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e943802690a3..d52312ab7224 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,37 +17,37 @@ https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios e5afbf5332820488c4a2d26dad02df88c0110136 - + https://github.com/dotnet/macios e5afbf5332820488c4a2d26dad02df88c0110136 - + https://github.com/dotnet/macios e5afbf5332820488c4a2d26dad02df88c0110136 - + https://github.com/dotnet/macios e5afbf5332820488c4a2d26dad02df88c0110136 diff --git a/eng/Versions.props b/eng/Versions.props index cb42797ee093..63431320387c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,14 +53,14 @@ 10.0.1 10.0.1 - 36.1.2 + 36.1.6 35.0.105 $(MicrosoftNETSdkAndroidManifest90100PackageVersion) - 26.0.11020 - 26.0.11020 - 26.0.11020 - 26.0.11020 + 26.1.10507 + 26.1.10507 + 26.1.10507 + 26.1.10507 26.0.9766 26.0.9766 @@ -213,9 +213,9 @@ $(DotNetVersionBand) $(DotNetVersionBand) 9.0.100 - $(MicrosoftMacCatalystSdknet100_260PackageVersion) - $(MicrosoftmacOSSdknet100_260PackageVersion) - $(MicrosoftiOSSdknet100_260PackageVersion) - $(MicrosofttvOSSdknet100_260PackageVersion) + $(MicrosoftMacCatalystSdknet100_261PackageVersion) + $(MicrosoftmacOSSdknet100_261PackageVersion) + $(MicrosoftiOSSdknet100_261PackageVersion) + $(MicrosofttvOSSdknet100_261PackageVersion) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 02a0495355d5..4b12290dfc33 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -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 From b9bffeafcf0b001895642b1aec465181cde3c6dd Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 5 Dec 2025 17:03:23 +0000 Subject: [PATCH 2/7] Update feeds --- NuGet.config | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index f9f547ed51d5..e34069556c44 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,6 +21,8 @@ + + @@ -34,16 +36,9 @@ - - - - - - - - - + + From a50082de048178259f3f5dfa04b35b93324eb219 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 5 Dec 2025 18:27:49 +0000 Subject: [PATCH 3/7] Update MacCatalyst, macOS, iOS, and tvOS SDK versions --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b868fc5d773..c9f5c6b0247e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,19 +17,19 @@ https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 - + https://github.com/dotnet/macios bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 From 8f6a8d4ffc6aaf192d69cf148ebe433a1e21fbe9 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 5 Dec 2025 18:40:56 +0000 Subject: [PATCH 4/7] Update versions again --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3225d568a22..53dbf84c36b6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,13 @@ + - + @@ -37,7 +38,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9f5c6b0247e..4b6c00f283c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,30 +8,30 @@ https://github.com/dotnet/dotnet 02dfa783c1f4223a5590a1b689ef381c337db1ab - + https://github.com/dotnet/android - 01024bb616e7b80417a2c6d320885bfdb956f20a + 78068f54d4a3495501c0e1c377936bee000bfd4b https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios - bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 + 0b260c058e3828b90df58b04dbd8aaabcfb538ac - + https://github.com/dotnet/macios - bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 + 0b260c058e3828b90df58b04dbd8aaabcfb538ac - + https://github.com/dotnet/macios - bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 + 0b260c058e3828b90df58b04dbd8aaabcfb538ac - + https://github.com/dotnet/macios - bff50fc0645305ad9f8a2bfbb9cfd4f753f4d340 + 0b260c058e3828b90df58b04dbd8aaabcfb538ac diff --git a/eng/Versions.props b/eng/Versions.props index 52c5516f95e1..c880a9e46736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,10 +57,10 @@ 35.0.105 $(MicrosoftNETSdkAndroidManifest90100PackageVersion) - 26.1.10507 - 26.1.10507 - 26.1.10507 - 26.1.10507 + 26.1.10508 + 26.1.10508 + 26.1.10508 + 26.1.10508 26.0.9766 26.0.9766 From c9650ca573f163b81cc263bf52ff466c0702508d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 5 Dec 2025 18:58:33 +0000 Subject: [PATCH 5/7] Add feed --- NuGet.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index 53dbf84c36b6..8f75bc3b3616 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,9 @@ + + + From 96e6ee2a755d628876a08ed526f92a75c8355537 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 9 Dec 2025 18:14:17 +0000 Subject: [PATCH 6/7] Aspnetcore 9.0.12 feed --- NuGet.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index 8f75bc3b3616..f7dbeda9db10 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,6 +37,9 @@ + + + From 7fac6cb7e3938e201fad3e90234e71b496b33afe Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 10 Dec 2025 14:40:46 +0000 Subject: [PATCH 7/7] [tests] Suppress Xcode version check --- .../src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs index c05131fd394a..564f0715d4df 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BaseBuildTest.cs @@ -83,6 +83,8 @@ public string TestName "TreatWarningsAsErrors=true", // Detailed trimmer warnings, if present "TrimmerSingleWarn=false", + // Suppress Xcode version check + "ValidateXcodeVersion=false" };