diff --git a/NuGet.config b/NuGet.config index 7deb290cd203..f7dbeda9db10 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,16 @@ + - + + + + @@ -20,6 +24,8 @@ + + @@ -31,18 +37,13 @@ + + + - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f52b70e154d4..4b6c00f283c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,46 +8,46 @@ 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 - + 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 6d7911c6d584..c880a9e46736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,14 +53,14 @@ 10.0.2 10.0.2 - 36.1.2 + 36.1.6 35.0.105 $(MicrosoftNETSdkAndroidManifest90100PackageVersion) - 26.0.11020 - 26.0.11020 - 26.0.11020 - 26.0.11020 + 26.1.10508 + 26.1.10508 + 26.1.10508 + 26.1.10508 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 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" };