Skip to content

[xcode26.2] Merge main into xcode26.2 #24357

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

Merged
dalexsoto merged 13 commits into from
Dec 4, 2025
Merged

[xcode26.2] Merge main into xcode26.2 #24357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8fa5fe8
[xharness] Fix filter support for test tasks. (#24283)
rolfbjarne Nov 21, 2025
82710ce
[Foundation] Fix nullability in NSUrlSession.
rolfbjarne Nov 21, 2025
fa0bc12
[main] Update dependencies from dotnet/macios (#24319)
dotnet-maestro[bot] Nov 21, 2025
559bb41
[tests] We must set 'UseFloatingTargetPlatformVersion=true' for our t…
rolfbjarne Nov 27, 2025
b76ad9e
[main] Update dependencies from dotnet/xharness (#24326)
dotnet-maestro[bot] Nov 27, 2025
38ae08d
Bump actions/checkout from 5 to 6 (#24322)
dependabot[bot] Nov 27, 2025
5601438
[main] Update dependencies from dotnet/dotnet (#24313)
dotnet-maestro[bot] Nov 27, 2025
612bc9d
[msbuild] Fix XcodeProject output path when using artifacts folder (#…
Copilot Dec 2, 2025
42d1606
[xharness] Don't list failures more than once. (#24317)
rolfbjarne Dec 2, 2025
b6939d0
[tools] Mark the Invoke methods for the type to create block proxies …
rolfbjarne Dec 2, 2025
34fa784
Localized file check-in by OneLocBuild Task: Build definition ID 1441…
vs-mobiletools-engineering-service2 Dec 3, 2025
f820115
[Foundation] Fix nullability in NSStream. (#https://github.com/dotnet…
rolfbjarne Dec 3, 2025
fae68b7
Merge remote-tracking branch main into xcode26.2
dalexsoto Dec 3, 2025
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 .github/workflows/autoformat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: 'Checkout'
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-global-json.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/') && github.actor == 'dotnet-maestro[bot]'
steps:
- name: 'Checkout repo'
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/localization-update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: '[Localization PR to main]'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
name: checkout

- uses: repo-sync/pull-request@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pwsh-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test-pwsh:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Run Pester tests
run: |
Set-PSRepository psgallery -InstallationPolicy trusted
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-single-platform-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: 'Checkout'
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0
Expand Down
6 changes: 4 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-4090eb3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-4090eb30/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-20abd87" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-20abd876/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<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" />
<add key="darc-pub-dotnet-macios-ab5c9f5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-ab5c9f5f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-macios -->
<!-- Begin: Package sources from xamarin-xamarin-macios -->
<!-- End: Package sources from xamarin-xamarin-macios -->
Expand All @@ -36,6 +36,8 @@
<add key="local-tests-feed" value="tests/.nuget/packages" />
<!-- Add a 8.0.22 feed -->
<add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
<!-- Add a 8.0.23 feed -->
<add key="darc-pub-dotnet-runtime-891f8976" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-891f8976/nuget/v3/index.json" />
<!-- Add a 9.0.11 feed -->
<add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
<!-- Add a 9.0.12 feed -->
Expand Down
130 changes: 0 additions & 130 deletions docs/api/Foundation.NSStream/Item(Foundation.xml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions docs/api/Foundation/NSUrlSessionDownloadTaskRequest.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dotnet/targets/Microsoft.MaciOS.Sdk.Xcode.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This file contains MSBuild targets that support building Xcode framework project
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateXcFramework" AssemblyFile="$(_XamarinTaskAssembly)"/>

<PropertyGroup>
<_XcodeProjectDefaultOutputPathRoot>$(MSBuildProjectDirectory)/$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
<_XcodeProjectDefaultOutputPathRoot>$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
<_BuildXcodeProjectsStamp>$(_MaciOSStampDirectory)_BuildXcodeProjects.stamp</_BuildXcodeProjectsStamp>
</PropertyGroup>

Expand Down
30 changes: 15 additions & 15 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,36 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25569.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.1-servicing.25569.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.1</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25569.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25576.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25576.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25576.107</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25576.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.2-servicing.25576.107</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.2</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25576.107</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9754</MicrosoftiOSSdknet90_260PackageVersion>
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9777</MicrosoftiOSSdknet90_260PackageVersion>
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9754</MicrosoftMacCatalystSdknet90_260PackageVersion>
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9777</MicrosoftMacCatalystSdknet90_260PackageVersion>
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9754</MicrosoftmacOSSdknet90_260PackageVersion>
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9777</MicrosoftmacOSSdknet90_260PackageVersion>
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9754</MicrosofttvOSSdknet90_260PackageVersion>
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9777</MicrosofttvOSSdknet90_260PackageVersion>
<!-- xamarin/xamarin-macios dependencies -->
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
<MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
<!-- dotnet/xharness dependencies -->
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.25569.2</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.25575.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
Loading