Skip to content

Commit 86e12fa

Browse files
dalexsotodalexsoto
authored
[release/9.0.1xx] Update build to use Xcode 26.4 no new API bindings (#25010)
2 parents e8fdb2b + d222f94 commit 86e12fa

95 files changed

Lines changed: 3489 additions & 29 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Make.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL
201201
MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
202202

203203
# Xcode version should have both a major and a minor version (even if the minor version is 0)
204-
XCODE_VERSION=26.3
205-
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.3.xip
206-
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.3.0.app/Contents/Developer
204+
XCODE_VERSION=26.4
205+
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.4.xip
206+
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.4.0.app/Contents/Developer
207207
XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo " $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2)
208208

209209
# We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"

‎Make.versions‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# IMPORTANT: There must be *no* managed API differences unless the two first
2222
# numbers (major.minor) changes.
2323

24-
IOS_NUGET_OS_VERSION=26.2
25-
TVOS_NUGET_OS_VERSION=26.2
26-
MACOS_NUGET_OS_VERSION=26.2
27-
MACCATALYST_NUGET_OS_VERSION=26.2
24+
IOS_NUGET_OS_VERSION=26.4
25+
TVOS_NUGET_OS_VERSION=26.4
26+
MACOS_NUGET_OS_VERSION=26.4
27+
MACCATALYST_NUGET_OS_VERSION=26.4
2828

2929
# The following are the OS versions we first supported with the current .NET version.
3030
# These versions must *not* change with minor .NET updates, only major .NET releases.

‎builds/Versions-MacCatalyst.plist.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<string>26.0</string>
2828
<string>26.1</string>
2929
<string>26.2</string>
30+
<string>26.4</string>
3031
</array>
3132
</dict>
3233
<key>SupportedTargetPlatformVersions</key>
@@ -64,6 +65,7 @@
6465
<string>26.0</string>
6566
<string>26.1</string>
6667
<string>26.2</string>
68+
<string>26.4</string>
6769
</array>
6870
</dict>
6971
<key>MacCatalystVersionMap</key>
@@ -124,6 +126,8 @@
124126
<string>26.1</string>
125127
<key>26.2</key>
126128
<string>26.2</string>
129+
<key>26.4</key>
130+
<string>26.4</string>
127131
</dict>
128132
<key>RecommendedXcodeVersion</key>
129133
<string>@XCODE_VERSION@</string>

‎builds/Versions-iOS.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<string>26.0</string>
4545
<string>26.1</string>
4646
<string>26.2</string>
47+
<string>26.4</string>
4748
</array>
4849
</dict>
4950
<key>SupportedTargetPlatformVersions</key>
@@ -100,6 +101,7 @@
100101
<string>26.0</string>
101102
<string>26.1</string>
102103
<string>26.2</string>
104+
<string>26.4</string>
103105
</array>
104106
</dict>
105107
<key>RecommendedXcodeVersion</key>

‎builds/Versions-macOS.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<string>26.0</string>
2828
<string>26.1</string>
2929
<string>26.2</string>
30+
<string>26.4</string>
3031
</array>
3132
</dict>
3233
<key>SupportedTargetPlatformVersions</key>
@@ -62,6 +63,7 @@
6263
<string>26.0</string>
6364
<string>26.1</string>
6465
<string>26.2</string>
66+
<string>26.4</string>
6567
</array>
6668
</dict>
6769
<key>RecommendedXcodeVersion</key>

‎builds/Versions-tvOS.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<string>26.0</string>
4040
<string>26.1</string>
4141
<string>26.2</string>
42+
<string>26.4</string>
4243
</array>
4344
</dict>
4445
<key>SupportedTargetPlatformVersions</key>
@@ -90,6 +91,7 @@
9091
<string>26.0</string>
9192
<string>26.1</string>
9293
<string>26.2</string>
94+
<string>26.4</string>
9395
</array>
9496
</dict>
9597
<key>RecommendedXcodeVersion</key>

‎tests/cecil-tests/Documentation.KnownFailures.txt‎

Lines changed: 2840 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/common/TestRuntime.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,16 @@ public static bool CheckXcodeVersion (int major, int minor, int build = 0)
497497
return CheckMacSystemVersion (26, 3);
498498
#else
499499
throw new NotImplementedException ($"Missing platform case for Xcode {major}.{minor}");
500+
#endif
501+
case 4:
502+
#if __TVOS__
503+
return ChecktvOSSystemVersion (26, 4);
504+
#elif __IOS__
505+
return CheckiOSSystemVersion (26, 4);
506+
#elif MONOMAC
507+
return CheckMacSystemVersion (26, 4);
508+
#else
509+
throw new NotImplementedException ($"Missing platform case for Xcode {major}.{minor}");
500510
#endif
501511
default:
502512
throw new NotImplementedException ($"Missing version logic for checking for Xcode {major}.{minor}");

‎tests/dotnet/UnitTests/ProjectTest.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3097,6 +3097,8 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
30973097
"/usr/lib/swift/libswiftos.dylib",
30983098
"/usr/lib/swift/libswiftOSLog.dylib",
30993099
"/usr/lib/swift/libswiftQuartzCore.dylib",
3100+
"/usr/lib/swift/libswiftsimd.dylib",
3101+
"/usr/lib/swift/libswiftSpatial.dylib",
31003102
"/usr/lib/swift/libswiftUIKit.dylib",
31013103
"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
31023104
"/usr/lib/swift/libswiftXPC.dylib",
@@ -3223,8 +3225,11 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
32233225
"/usr/lib/swift/libswiftos.dylib",
32243226
"/usr/lib/swift/libswiftOSLog.dylib",
32253227
"/usr/lib/swift/libswiftQuartzCore.dylib",
3228+
"/usr/lib/swift/libswiftsimd.dylib",
3229+
"/usr/lib/swift/libswiftSpatial.dylib",
32263230
"/usr/lib/swift/libswiftUIKit.dylib",
32273231
"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
3232+
"/usr/lib/swift/libswiftXPC.dylib",
32283233
];
32293234

32303235
static string [] expectedFrameworks_tvOS_Full = [
@@ -3408,6 +3413,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
34083413
"/usr/lib/swift/libswiftOSLog.dylib",
34093414
"/usr/lib/swift/libswiftQuartzCore.dylib",
34103415
"/usr/lib/swift/libswiftsimd.dylib",
3416+
"/usr/lib/swift/libswiftSpatial.dylib",
34113417
"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
34123418
"/usr/lib/swift/libswiftXPC.dylib",
34133419
];
@@ -3600,6 +3606,8 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
36003606
"/usr/lib/swift/libswiftos.dylib",
36013607
"/usr/lib/swift/libswiftOSLog.dylib",
36023608
"/usr/lib/swift/libswiftQuartzCore.dylib",
3609+
"/usr/lib/swift/libswiftsimd.dylib",
3610+
"/usr/lib/swift/libswiftSpatial.dylib",
36033611
"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
36043612
"/usr/lib/swift/libswiftXPC.dylib",
36053613
];

‎tests/monotouch-test/Security/TrustTest.cs‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,13 @@ void Trust_FullChain (SecTrust trust, SecPolicy policy, X509CertificateCollectio
334334
trust.SetVerifyDate (new DateTime (2025, 10, 1, 0, 0, 0, DateTimeKind.Utc));
335335

336336
SecTrustResult trust_result = SecTrustResult.Unspecified;
337+
var allow_recoverable_trust_failure = TestRuntime.CheckSystemVersion (TestRuntime.CurrentPlatform, 26, 4);
337338
var result = Evaluate (trust, out var trustError, true);
338-
Assert.That (result, Is.EqualTo (trust_result), $"Evaluate: {trustError}");
339+
if (allow_recoverable_trust_failure) {
340+
Assert.That (result, Is.EqualTo (SecTrustResult.Unspecified).Or.EqualTo (SecTrustResult.RecoverableTrustFailure), $"Evaluate: {trustError}");
341+
} else {
342+
Assert.That (result, Is.EqualTo (trust_result), $"Evaluate: {trustError}");
343+
}
339344

340345
// Evalute must be called prior to Count (Apple documentation)
341346
Assert.That (trust.Count, Is.EqualTo (3), "Count");
@@ -354,16 +359,25 @@ void Trust_FullChain (SecTrust trust, SecPolicy policy, X509CertificateCollectio
354359
Assert.That (sc3.SubjectSummary, Is.EqualTo ("GTS Root R1"), "SubjectSummary(sc3)");
355360
}
356361

357-
Assert.That (trust.GetTrustResult (), Is.EqualTo (trust_result), "GetTrustResult");
362+
Assert.That (trust.GetTrustResult (), Is.EqualTo (result), "GetTrustResult");
358363

359364
trust.SetAnchorCertificates (certs);
360365
Assert.That (trust.GetCustomAnchorCertificates ().Length, Is.EqualTo (certs.Count), "GetCustomAnchorCertificates");
361366

362367
// since we modified the `trust` instance it's result was invalidated (marked as unspecified on iOS 11)
363368
Assert.That (trust.GetTrustResult (), Is.EqualTo (SecTrustResult.Unspecified), "GetTrustResult-2");
364369

365-
Assert.True (trust.Evaluate (out var error), $"Evaluate: {error}");
366-
Assert.Null (error, "error");
370+
if (result == SecTrustResult.Unspecified) {
371+
Assert.True (trust.Evaluate (out var error), $"Evaluate: {error}");
372+
Assert.Null (error, "error");
373+
} else if (result == SecTrustResult.RecoverableTrustFailure) {
374+
if (trust.Evaluate (out var error))
375+
Assert.Null (error, "error");
376+
else
377+
Assert.NotNull (error, "error");
378+
} else {
379+
Assert.Fail ($"Unexpected trust result: {result}");
380+
}
367381
}
368382

369383
[Test]

0 commit comments

Comments
 (0)