Skip to content

[release/10.0] Fix iossimulator build with XCode 26.4 #128952

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

Open
github-actions wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
+17 −17
Open

[release/10.0] Fix iossimulator build with XCode 26.4 #128952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/native/libs/System.Globalization.Native/pal_calendarData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ int32_t GlobalizationNative_GetJapaneseEraStartDateNative(int32_t era, int32_t*
startDateComponents.day = startDateComponents.day + 1;
date = [japaneseCalendar dateFromComponents:startDateComponents];
NSCalendar *gregorianCalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
NSDateComponents *components = [gregorianCalendar components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:date];
NSDateComponents *components = [gregorianCalendar components:(NSCalendarUnit)(NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear) fromDate:date];
*startYear = (int32_t)[components year];
*startMonth = (int32_t)[components month];
*startDay = (int32_t)[components day];
Expand Down
28 changes: 14 additions & 14 deletions src/native/libs/System.Globalization.Native/pal_collation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ static NSStringCompareOptions ConvertFromCompareOptionsToNSStringCompareOptions(
{
// To achieve an equivalent search behavior to the default in ICU,
// NSLiteralSearch is employed as the default search option.
NSStringCompareOptions options = isLiteralSearchSupported ? NSLiteralSearch : 0;
NSStringCompareOptions options = isLiteralSearchSupported ? NSLiteralSearch : (NSStringCompareOptions)0;

if (comparisonOptions & IgnoreCase)
options |= NSCaseInsensitiveSearch;
Expand Down Expand Up @@ -87,7 +87,7 @@ int32_t GlobalizationNative_CompareStringNative(const uint16_t* localeName, int3
{
@autoreleasepool
{
if (!IsComparisonOptionSupported(comparisonOptions))
if (!IsComparisonOptionSupported((CompareOptions)comparisonOptions))
return ERROR_COMPARISON_OPTIONS_NOT_FOUND;
NSLocale *currentLocale = GetCurrentLocale(localeName, lNameLength);
NSString *sourceString = [NSString stringWithCharacters: lpSource length: (NSUInteger)cwSourceLength];
Expand All @@ -103,12 +103,12 @@ int32_t GlobalizationNative_CompareStringNative(const uint16_t* localeName, int3

if (comparisonOptions != 0 && comparisonOptions != StringSort)
{
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions(comparisonOptions, false);
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions((CompareOptions)comparisonOptions, false);
sourceStrPrecomposed = [sourceStrPrecomposed stringByFoldingWithOptions:options locale:currentLocale];
targetStrPrecomposed = [targetStrPrecomposed stringByFoldingWithOptions:options locale:currentLocale];
}

NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions(comparisonOptions, true);
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions((CompareOptions)comparisonOptions, true);
NSRange comparisonRange = NSMakeRange(0, sourceStrPrecomposed.length);
return (int32_t)[sourceStrPrecomposed compare:targetStrPrecomposed
options:options
Expand All @@ -130,7 +130,7 @@ int32_t GlobalizationNative_CompareStringNative(const uint16_t* localeName, int3
if (error != nil)
return source;

NSString *modifiedString = [regex stringByReplacingMatchesInString:source options:0 range:NSMakeRange(0, [source length]) withTemplate:@""];
NSString *modifiedString = [regex stringByReplacingMatchesInString:source options:(NSMatchingOptions)0 range:NSMakeRange(0, [source length]) withTemplate:@""];

return modifiedString;
}
Expand All @@ -156,12 +156,12 @@ Range GlobalizationNative_IndexOfNative(const uint16_t* localeName, int32_t lNam
{
assert(cwTargetLength >= 0);
Range result = {ERROR_INDEX_NOT_FOUND, 0};
if (!IsComparisonOptionSupported(comparisonOptions))
if (!IsComparisonOptionSupported((CompareOptions)comparisonOptions))
{
result.location = ERROR_COMPARISON_OPTIONS_NOT_FOUND;
return result;
}
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions(comparisonOptions, true);
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions((CompareOptions)comparisonOptions, true);
if (!fromBeginning) // LastIndexOf
options |= NSBackwardsSearch;

Expand Down Expand Up @@ -270,9 +270,9 @@ int32_t GlobalizationNative_StartsWithNative(const uint16_t* localeName, int32_t
{
@autoreleasepool
{
if (!IsComparisonOptionSupported(comparisonOptions))
if (!IsComparisonOptionSupported((CompareOptions)comparisonOptions))
return ERROR_COMPARISON_OPTIONS_NOT_FOUND;
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions(comparisonOptions, true);
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions((CompareOptions)comparisonOptions, true);
NSLocale *currentLocale = GetCurrentLocale(localeName, lNameLength);
NSString *prefixString = [NSString stringWithCharacters: lpPrefix length: (NSUInteger)cwPrefixLength];
NSString *prefixStrComposed = RemoveWeightlessCharacters(prefixString.precomposedStringWithCanonicalMapping);
Expand Down Expand Up @@ -302,9 +302,9 @@ int32_t GlobalizationNative_EndsWithNative(const uint16_t* localeName, int32_t l
{
@autoreleasepool
{
if (!IsComparisonOptionSupported(comparisonOptions))
if (!IsComparisonOptionSupported((CompareOptions)comparisonOptions))
return ERROR_COMPARISON_OPTIONS_NOT_FOUND;
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions(comparisonOptions, true);
NSStringCompareOptions options = ConvertFromCompareOptionsToNSStringCompareOptions((CompareOptions)comparisonOptions, true);
NSLocale *currentLocale = GetCurrentLocale(localeName, lNameLength);
NSString *suffixString = [NSString stringWithCharacters: lpSuffix length: (NSUInteger)cwSuffixLength];
NSString *suffixStrComposed = RemoveWeightlessCharacters(suffixString.precomposedStringWithCanonicalMapping);
Expand Down Expand Up @@ -336,7 +336,7 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
sortKey[0] = '\0';
return 1;
}
if (!IsComparisonOptionSupported(options))
if (!IsComparisonOptionSupported((CompareOptions)options))
return 0;
NSString *sourceString = [NSString stringWithCharacters: lpStr length: (NSUInteger)cwStrLength];
if (options & IgnoreKanaType)
Expand All @@ -353,7 +353,7 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
}

NSLocale *locale = GetCurrentLocale(localeName, lNameLength);
NSStringCompareOptions comparisonOptions = options == 0 ? 0 : ConvertFromCompareOptionsToNSStringCompareOptions(options, false);
NSStringCompareOptions comparisonOptions = options == 0 ? (NSStringCompareOptions)0 : ConvertFromCompareOptionsToNSStringCompareOptions((CompareOptions)options, false);

// Generate a sort key for the original string based on the locale
NSString *transformedString = [sourceStringCleaned stringByFoldingWithOptions:comparisonOptions locale:locale];
Expand All @@ -368,7 +368,7 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
return (int32_t)transformedStringBytes;
NSRange range = NSMakeRange(0, [transformedString length]);
NSUInteger usedLength = 0;
BOOL result = [transformedString getBytes:sortKey maxLength:transformedStringBytes usedLength:&usedLength encoding:NSUTF16StringEncoding options:0 range:range remainingRange:NULL];
BOOL result = [transformedString getBytes:sortKey maxLength:transformedStringBytes usedLength:&usedLength encoding:NSUTF16StringEncoding options:(NSStringEncodingConversionOptions)0 range:range remainingRange:NULL];
if (result)
return (int32_t)usedLength;
return 0;
Expand Down
4 changes: 2 additions & 2 deletions src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509_ios.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int32_t AppleCryptoNative_X509ImportCertificate(uint8_t* pbData,
{
if (CFArrayGetCount(p12Items) > 0)
{
CFDictionaryRef item_dict = CFArrayGetValueAtIndex(p12Items, 0);
CFDictionaryRef item_dict = (CFDictionaryRef)CFArrayGetValueAtIndex(p12Items, 0);
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-qual"
*pIdentityOut = (SecIdentityRef)CFRetain(CFDictionaryGetValue(item_dict, kSecImportItemIdentity));
Expand Down Expand Up @@ -169,7 +169,7 @@ int32_t AppleCryptoNative_X509ImportCollection(uint8_t* pbData,

for (int i = 0; i < CFArrayGetCount(p12Items); i++)
{
CFDictionaryRef item_dict = CFArrayGetValueAtIndex(p12Items, i);
CFDictionaryRef item_dict = (CFDictionaryRef)CFArrayGetValueAtIndex(p12Items, i);
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-qual"
SecIdentityRef identity =
Expand Down
Loading