[xcode26.2] Merge main into xcode26.2 #24357
Merged
+490
−412
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is file 12 of 47 files with nullability disabled in Foundation. Changes: - Enabled nullable reference types - Made tmpfile nullable and added null check in Initialize method to handle the case where Location.Path could be null - Replaced xml include directive with inline documentation for Dispose(bool) method - Removed NSUrlSessionDownloadTaskRequest.xml file as it only contained the now-inlined documentation - Added XML documentation for the finalizer - Improved XML documentation for Dispose() and Dispose(bool) methods with see cref attributes - Fixed class summary to be more concise and removed redundant repetition in remarks - Removed unnecessary whitespace in comments Contributes towards #17285.
This pull request updates the following dependencies [marker]: <> (Begin:c0371266-dd6f-4959-822b-decc72d2d668) ## From https://github.com/dotnet/macios - **Subscription**: [c0371266-dd6f-4959-822b-decc72d2d668](https://maestro.dot.net/subscriptions?search=c0371266-dd6f-4959-822b-decc72d2d668) - **Build**: [20251119.3](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=12809163) ([291467](https://maestro.dot.net/channel/3884/github:dotnet:macios/build/291467)) - **Date Produced**: November 19, 2025 3:21:21 PM UTC - **Commit**: [ab5c9f5](ab5c9f5) - **Branch**: [release/9.0.1xx](https://github.com/dotnet/macios/tree/release/9.0.1xx) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [26.0.9754 to 26.0.9777][1] - Microsoft.iOS.Sdk.net9.0_26.0 - Microsoft.MacCatalyst.Sdk.net9.0_26.0 - Microsoft.macOS.Sdk.net9.0_26.0 - Microsoft.tvOS.Sdk.net9.0_26.0 [1]: 4177c9d...ab5c9f5 [DependencyUpdate]: <> (End) [marker]: <> (End:c0371266-dd6f-4959-822b-decc72d2d668) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…est projects, to avoid building them with other workloads than the current workload. (#24281) Also the ComputeRemoteGeneratorProperties task needs to know the value of UseFloatingTargetPlatformVersion, so that it can be passed on when executing `dotnet` to compute binding variables, because otherwise we might end up with variables from the wrong workload. --------- Co-authored-by: Copilot <[email protected]>
This pull request updates the following dependencies ## From https://github.com/dotnet/xharness - **Subscription**: [02e03784-16b3-4ced-b02a-3715797fc7da](https://maestro.dot.net/subscriptions?search=02e03784-16b3-4ced-b02a-3715797fc7da) - **Build**: [20251125.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2847502) ([292314](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/292314)) - **Date Produced**: November 25, 2025 7:11:13 PM UTC - **Commit**: [06be2b96a9dd0ce238be2d50dd150fb283398e0c](dotnet/xharness@06be2b9) - **Branch**: [main](https://github.com/dotnet/xharness/tree/main) - **Dependency Updates**: - From [11.0.0-prerelease.25569.2 to 11.0.0-prerelease.25575.1][1] - Microsoft.DotNet.XHarness.iOS.Shared [1]: dotnet/xharness@f023631...06be2b9
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
This pull request updates the following dependencies ## From https://github.com/dotnet/dotnet - **Subscription**: [7bea2f72-36de-4307-8c02-e200db7ccd92](https://maestro.dot.net/subscriptions?search=7bea2f72-36de-4307-8c02-e200db7ccd92) - **Build**: [20251120.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2843544) ([291651](https://maestro.dot.net/channel/5173/github:dotnet:dotnet/build/291651)) - **Date Produced**: November 20, 2025 5:37:12 PM UTC - **Commit**: [18f6e60aa4755c2be56b2d45165a135d64d4f710](dotnet/dotnet@18f6e60) - **Branch**: [release/10.0.1xx](https://github.com/dotnet/dotnet/tree/release/10.0.1xx) - **Dependency Updates**: - From [10.0.1 to 10.0.2][1] - Microsoft.NET.Runtime.MonoTargets.Sdk - Microsoft.NET.ILLink.Tasks - Microsoft.NETCore.App.Ref - From [10.0.0-beta.25569.104 to 10.0.0-beta.25570.103][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.SharedFramework.Sdk - From [0.11.5-alpha.25569.104 to 0.11.5-alpha.25570.103][1] - Microsoft.DotNet.Cecil - From [10.0.1-servicing.25569.104 to 10.0.2-servicing.25570.103][1] - Microsoft.NET.ILLink - From [10.0.101-servicing.25569.104 to 10.0.102-servicing.25570.103][1] - Microsoft.NET.Sdk - From [10.0.101 to 10.0.102][1] - Microsoft.TemplateEngine.Authoring.Tasks [1]: dotnet/dotnet@4090eb3...18f6e60
…24224) When `UseArtifactsOutput` is enabled, `$(IntermediateOutputPath)` is absolute. Prepending `$(MSBuildProjectDirectory)` creates invalid nested paths like: ``` /project/src/MyApp/home/user/artifacts/obj/MyApp/Debug/net10.0-ios/xcode/ ``` ## Changes - Removed `$(MSBuildProjectDirectory)/` prefix from `_XcodeProjectDefaultOutputPathRoot` in `Microsoft.MaciOS.Sdk.Xcode.targets` to prevent path concatenation issues when `IntermediateOutputPath` is absolute - Modified `CreateXcArchive.cs` to call `Path.GetFullPath()` on `OutputPath`, `DerivedDataPath`, and `PackageCachePath` before using them in xcodebuild commands - Modified `CreateXcFramework.cs` to call `Path.GetFullPath()` on `XcArchivePath` and `OutputPath` before using them in xcodebuild commands This dual approach ensures that: - The root cause in the MSBuild targets file is fixed by removing the problematic prefix - The C# task implementations provide defensive path handling by normalizing paths to absolute before use - When paths are relative (traditional builds), `Path.GetFullPath()` resolves them correctly relative to the current directory - When paths are already absolute (artifacts mode), `Path.GetFullPath()` returns them unchanged Fixes #24222 --------- Co-authored-by: mattleibow <[email protected]> Co-authored-by: rolfbjarne <[email protected]>
…when using the static registrar. (##24344) Add a custom linker step to mark the Invoke method for the type pointed to by the DelegateProxy attribute, because this method may only be referenced from the native code the static registrar generates. Fixes the following test failure for the "Release (all optimizations)" test variation: MonoTouchFixtures.ObjCRuntime.RegistrarTest [FAIL] BlockReturnTest : ObjCRuntime.RuntimeException : Invalid DelegateProxyAttribute for the return value for the method MonoTouchFixtures.ObjCRuntime.RegistrarTest+BlockReturnTestClass.MethodReturningBlock: DelegateType (ObjCRuntime.Trampolines+SDRegistrarTestBlock) specifies a type without a 'Handler' field. Please file a bug report at https://github.com/dotnet/macios/issues/new. at ObjCRuntime.BlockLiteral.GetBlockForDelegate(MethodInfo , Object , UInt32 , String ) at ObjCRuntime.Runtime.CreateDelegateProxy(IntPtr , IntPtr , IntPtr , UInt32 ) at ObjCRuntime.Runtime.create_delegate_proxy(IntPtr method, IntPtr block, IntPtr signature, UInt32 token_ref, IntPtr* exception_gchandle) --- End of stack trace from previous location --- at ObjCRuntime.Runtime.RethrowManagedException(IntPtr ) at ObjCRuntime.Runtime.rethrow_managed_exception(IntPtr original_exception_gchandle, IntPtr* exception_gchandle) at Bindings.Test.ObjCRegistrarTest.TestBlocks() at MonoTouchFixtures.ObjCRuntime.RegistrarTest.BlockReturnTest() at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args) at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object , BindingFlags )
…1: Build ID 12878425 (#24352) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc. ---------
This is file 18 of 47 files with nullability disabled in Foundation. Changes: - Enabled nullable reference types - Removed four [SupportedOSPlatform] attributes without version numbers from NSStreamSocksOptions class - Made fields in NSStreamSocksOptions nullable where appropriate (HostName, Username, Password) - Made return types nullable: indexer, SocksOptions, DataWrittenToMemoryStream, FileCurrentOffset, and out parameters in CreatePair methods - Replaced xml include directive with inline documentation from Item(Foundation.xml file - Removed Item(Foundation.xml file as it only contained the now-inlined documentation - Replaced "To be added." XML documentation with proper documentation for all methods and properties - Added see cref attributes throughout for better cross-referencing - Removed unnecessary whitespace in XML comments - Replaced manual null checks with ArgumentNullException.ThrowIfNull - Fixed typo in example code (Passowrd -> Password) - Improved formatting and consistency in XML documentation Contributes towards #17285.
Collaborator
✅ [PR Build #fae68b7] Build passed (Detect API changes) ✅Pipeline on Agent |
Collaborator
✅ [CI Build #fae68b7] Build passed (Build packages) ✅Pipeline on Agent |
Collaborator
✅ API diff for current PR / commitNET (empty diffs)✅ API diff vs stableNET (empty diffs)ℹ️ Generator diffGenerator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes) Pipeline on Agent |
Collaborator
✅ [CI Build #fae68b7] Build passed (Build macOS tests) ✅Pipeline on Agent |
Collaborator
💻 [CI Build #fae68b7] Tests on macOS X64 - Mac Sonoma (14) passed 💻✅ All tests on macOS X64 - Mac Sonoma (14) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #fae68b7] Tests on macOS arm64 - Mac Tahoe (26) passed 💻✅ All tests on macOS arm64 - Mac Tahoe (26) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #fae68b7] Tests on macOS M1 - Mac Ventura (13) passed 💻✅ All tests on macOS M1 - Mac Ventura (13) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #fae68b7] Tests on macOS M1 - Mac Monterey (12) passed 💻✅ All tests on macOS M1 - Mac Monterey (12) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #fae68b7] Tests on macOS arm64 - Mac Sequoia (15) passed 💻✅ All tests on macOS arm64 - Mac Sequoia (15) passed. Pipeline on Agent |
Collaborator
🚀 [CI Build #fae68b7] Test results 🚀Test results✅ All tests passed on VSTS: test results. 🎉 All 119 tests passed 🎉 Tests counts✅ cecil: All 1 tests passed. Html Report (VSDrops) Download Pipeline on Agent |
rolfbjarne
approved these changes
Dec 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.