Skip to content

Commit 6fd8259

Browse files
dalexsotorolfbjarne
dalexsoto
and
rolfbjarne
authored
[main] Merge xcode26.1 into main (#24175)
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
2 parents f8bb39a + 32bd092 commit 6fd8259

38 files changed

+483
-46
lines changed

‎Make.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ NUGET_RELEASE_BRANCH=release/10.0.1xx
140140
##
141141
## Note that the prerelease identifier should be as short as possible, because otherwise
142142
## the resulting package name can become too long for MSIs.
143-
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net10-ga
144-
NUGET_HARDCODED_PRERELEASE_BRANCH=net10.0
143+
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=xcode26.1
144+
NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.1
145145

146146
# compute the alphanumeric version of branch names
147147
NUGET_RELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_RELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-')
@@ -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.0
205-
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.0.1.xip
206-
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.0.1.app/Contents/Developer
204+
XCODE_VERSION=26.1
205+
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.1.xip
206+
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.1.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: 9 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.0
25-
TVOS_NUGET_OS_VERSION=26.0
26-
MACOS_NUGET_OS_VERSION=26.0
27-
MACCATALYST_NUGET_OS_VERSION=26.0
24+
IOS_NUGET_OS_VERSION=26.1
25+
TVOS_NUGET_OS_VERSION=26.1
26+
MACOS_NUGET_OS_VERSION=26.1
27+
MACCATALYST_NUGET_OS_VERSION=26.1
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.
@@ -120,6 +120,11 @@ SUPPORTED_API_VERSIONS_TVOS+=net9.0-26.0
120120
SUPPORTED_API_VERSIONS_MACOS+=net9.0-26.0
121121
SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-26.0
122122

123+
SUPPORTED_API_VERSIONS_IOS+=net10.0-26.0
124+
SUPPORTED_API_VERSIONS_TVOS+=net10.0-26.0
125+
SUPPORTED_API_VERSIONS_MACOS+=net10.0-26.0
126+
SUPPORTED_API_VERSIONS_MACCATALYST+=net10.0-26.0
127+
123128
# Add beta versions here!
124129

125130
# Don't change these (even if there aren't any beta versions)!

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<!-- End: Package sources from dotnet-dotnet -->
1515
<!-- Begin: Package sources from dotnet-macios -->
1616
<add key="darc-pub-dotnet-macios-4177c9d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4177c9d9/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-macios-23eb1c2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-23eb1c2c/nuget/v3/index.json" />
1718
<!-- End: Package sources from dotnet-macios -->
1819
<!-- Begin: Package sources from xamarin-xamarin-macios -->
1920
<!-- End: Package sources from xamarin-xamarin-macios -->

‎builds/Versions-MacCatalyst.plist.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<string>18.4</string>
2626
<string>18.5</string>
2727
<string>26.0</string>
28+
<string>26.1</string>
2829
</array>
2930
</dict>
3031
<key>SupportedTargetPlatformVersions</key>
@@ -60,6 +61,7 @@
6061
<string>18.4</string>
6162
<string>18.5</string>
6263
<string>26.0</string>
64+
<string>26.1</string>
6365
</array>
6466
</dict>
6567
<key>MacCatalystVersionMap</key>
@@ -116,6 +118,8 @@
116118
<string>15.5</string>
117119
<key>26.0</key>
118120
<string>26.0</string>
121+
<key>26.1</key>
122+
<string>26.1</string>
119123
</dict>
120124
<key>RecommendedXcodeVersion</key>
121125
<string>@XCODE_VERSION@</string>

‎builds/Versions-iOS.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<string>18.4</string>
4343
<string>18.5</string>
4444
<string>26.0</string>
45+
<string>26.1</string>
4546
</array>
4647
</dict>
4748
<key>SupportedTargetPlatformVersions</key>
@@ -96,6 +97,7 @@
9697
<string>18.4</string>
9798
<string>18.5</string>
9899
<string>26.0</string>
100+
<string>26.1</string>
99101
</array>
100102
</dict>
101103
<key>RecommendedXcodeVersion</key>

‎builds/Versions-macOS.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<string>15.4</string>
2626
<string>15.5</string>
2727
<string>26.0</string>
28+
<string>26.1</string>
2829
</array>
2930
</dict>
3031
<key>SupportedTargetPlatformVersions</key>
@@ -58,6 +59,7 @@
5859
<string>15.4</string>
5960
<string>15.5</string>
6061
<string>26.0</string>
62+
<string>26.1</string>
6163
</array>
6264
</dict>
6365
<key>RecommendedXcodeVersion</key>

‎builds/Versions-tvOS.plist.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<string>18.4</string>
3838
<string>18.5</string>
3939
<string>26.0</string>
40+
<string>26.1</string>
4041
</array>
4142
</dict>
4243
<key>SupportedTargetPlatformVersions</key>
@@ -86,6 +87,7 @@
8687
<string>18.4</string>
8788
<string>18.5</string>
8889
<string>26.0</string>
90+
<string>26.1</string>
8991
</array>
9092
</dict>
9193
<key>RecommendedXcodeVersion</key>

‎eng/Version.Details.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@ This file should be imported by eng/Versions.props
1717
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
1818
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet/macios dependencies -->
20+
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2021
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
2122
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9754</MicrosoftiOSSdknet90_260PackageVersion>
23+
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
2224
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
2325
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9754</MicrosoftMacCatalystSdknet90_260PackageVersion>
26+
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
2427
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
2528
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9754</MicrosoftmacOSSdknet90_260PackageVersion>
29+
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
2630
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
2731
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9754</MicrosofttvOSSdknet90_260PackageVersion>
2832
<!-- xamarin/xamarin-macios dependencies -->
@@ -47,12 +51,16 @@ This file should be imported by eng/Versions.props
4751
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
4852
<MicrosoftTemplateEngineAuthoringTasksVersion>$(MicrosoftTemplateEngineAuthoringTasksPackageVersion)</MicrosoftTemplateEngineAuthoringTasksVersion>
4953
<!-- dotnet/macios dependencies -->
54+
<MicrosoftiOSSdknet100_260Version>$(MicrosoftiOSSdknet100_260PackageVersion)</MicrosoftiOSSdknet100_260Version>
5055
<MicrosoftiOSSdknet90_185Version>$(MicrosoftiOSSdknet90_185PackageVersion)</MicrosoftiOSSdknet90_185Version>
5156
<MicrosoftiOSSdknet90_260Version>$(MicrosoftiOSSdknet90_260PackageVersion)</MicrosoftiOSSdknet90_260Version>
57+
<MicrosoftMacCatalystSdknet100_260Version>$(MicrosoftMacCatalystSdknet100_260PackageVersion)</MicrosoftMacCatalystSdknet100_260Version>
5258
<MicrosoftMacCatalystSdknet90_185Version>$(MicrosoftMacCatalystSdknet90_185PackageVersion)</MicrosoftMacCatalystSdknet90_185Version>
5359
<MicrosoftMacCatalystSdknet90_260Version>$(MicrosoftMacCatalystSdknet90_260PackageVersion)</MicrosoftMacCatalystSdknet90_260Version>
60+
<MicrosoftmacOSSdknet100_260Version>$(MicrosoftmacOSSdknet100_260PackageVersion)</MicrosoftmacOSSdknet100_260Version>
5461
<MicrosoftmacOSSdknet90_155Version>$(MicrosoftmacOSSdknet90_155PackageVersion)</MicrosoftmacOSSdknet90_155Version>
5562
<MicrosoftmacOSSdknet90_260Version>$(MicrosoftmacOSSdknet90_260PackageVersion)</MicrosoftmacOSSdknet90_260Version>
63+
<MicrosofttvOSSdknet100_260Version>$(MicrosofttvOSSdknet100_260PackageVersion)</MicrosofttvOSSdknet100_260Version>
5664
<MicrosofttvOSSdknet90_185Version>$(MicrosofttvOSSdknet90_185PackageVersion)</MicrosofttvOSSdknet90_185Version>
5765
<MicrosofttvOSSdknet90_260Version>$(MicrosofttvOSSdknet90_260PackageVersion)</MicrosofttvOSSdknet90_260Version>
5866
<!-- xamarin/xamarin-macios dependencies -->

‎eng/Version.Details.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,23 @@
7676
<Uri>https://github.com/dotnet/macios</Uri>
7777
<Sha>4177c9d9590857cfb2617fd7a7ef3d5e1de48ed3</Sha>
7878
</Dependency>
79+
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
80+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
81+
<Uri>https://github.com/dotnet/macios</Uri>
82+
<Sha>23eb1c2c9465fe76c810c8a69982c1254161f4b0</Sha>
83+
</Dependency>
84+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.0" Version="26.0.11017">
85+
<Uri>https://github.com/dotnet/macios</Uri>
86+
<Sha>23eb1c2c9465fe76c810c8a69982c1254161f4b0</Sha>
87+
</Dependency>
88+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.0" Version="26.0.11017">
89+
<Uri>https://github.com/dotnet/macios</Uri>
90+
<Sha>23eb1c2c9465fe76c810c8a69982c1254161f4b0</Sha>
91+
</Dependency>
92+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.0" Version="26.0.11017">
93+
<Uri>https://github.com/dotnet/macios</Uri>
94+
<Sha>23eb1c2c9465fe76c810c8a69982c1254161f4b0</Sha>
95+
</Dependency>
7996
</ProductDependencies>
8097
<ToolsetDependencies>
8198
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25531.102">

‎src/Accessibility/AXPrefers.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,21 @@ public static bool NonBlinkingTextInsertionIndicator ()
3131
{
3232
return AXPrefersNonBlinkingTextInsertionIndicator () != 0;
3333
}
34+
35+
[SupportedOSPlatform ("ios26.1")]
36+
[SupportedOSPlatform ("maccatalyst26.1")]
37+
[SupportedOSPlatform ("macos26.1")]
38+
[SupportedOSPlatform ("tvos26.1")]
39+
[DllImport (Constants.AccessibilityLibrary)]
40+
static extern byte AXPrefersActionSliderAlternative ();
41+
42+
[SupportedOSPlatform ("ios26.1")]
43+
[SupportedOSPlatform ("maccatalyst26.1")]
44+
[SupportedOSPlatform ("macos26.1")]
45+
[SupportedOSPlatform ("tvos26.1")]
46+
public static bool ActionSliderAlternative ()
47+
{
48+
return AXPrefersActionSliderAlternative () != 0;
49+
}
3450
}
3551
}

0 commit comments

Comments
 (0)