[net11.0] Merge main into net11.0.#25502
Open
rolfbjarne wants to merge 12 commits into
Open
Conversation
…25456) Convert classic NUnit assertions to NUnit v4's constraint-based Assert.That syntax across the monotouch-test project. Also improve test failure diagnostics by: - Swapping literal/actual argument order in Assert.That calls so that on failure NUnit reports 'Expected: <literal> But was: <actual>' instead of the confusing reverse - Splitting compound boolean assertions (e.g. nalCount == 4 && paramCount == 2) into individual constraint-based assertions that report each value independently on failure - Converting Assert.That(x == y, Is.True) non-operator value checks to proper Assert.That(x, Is.EqualTo(y)) form --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
*.lscache files are produced by VSCode now: microsoft/vscode-dotnettools#2961 Also clean up a few old entries.
The mtouch tool is only ever invoked with `--runregistrar`, so a lot of code in the shared `tools/common/` files is never executed by mtouch. This PR removes ~520 lines of dead code. ## Changes ### Fully deleted (dead code with no callers anywhere): - **Target.cs**: `GatherFrameworks` (91 lines), `ValidateAssembliesBeforeLink` - **Application.cs**: `GetArchitectures` - **Assembly.cs**: `ReadManifest`, `ParseAttributeWithDefault` - **cache.cs**: `CompareDirectories`, `CompareAssemblies`, `AssemblyReader` class (~230 lines) - **MachO.cs**: `GetNativeDependencies` + `native_dependencies` field, `SelectArchitectures` (was behind `#if MTOUCH` which is never defined) ### Guarded with `#if !LEGACY_TOOLS` (used by dotnet-linker but not mtouch): - **Target.cs**: `AddAssembly`, `ExtractNativeLinkInfo`, `ComputeLinkerFlags` - **Application.cs**: 19 methods/properties including `CreateCache`, `ParseCustomLinkFlags`, `ParseInterpreter`, `ValidateAbi`, `MonoGCParams`, `LibMonoLinkMode`, etc. - **Driver.cs**: 16 methods including `ValidateXcode`, `FindTool`, `XcrunFind`, `RunClang`, `RunLipo`, `CreateDsym`, `RunStrip`, etc. ### Build infrastructure: - Made mtouch build work without Xcode (it only runs the static registrar, which doesn't need Xcode) - Added `--ignore-xcode` configure option ## Verification - `make all install -C tools` ✅ - `make all install -C msbuild` ✅ 🤖 Pull request created by Copilot --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The linker tests are now our longest-running tests (a bit over an hour), so fan them out to run on separate bots on a per-platform basis to speed them up.
) Use the new PDictionary.OpenFile (throws on failure) and PDictionary.TryOpenFile (returns false on failure) APIs instead of the older PDictionary.FromFile which could return null. - FromFile(...)! → OpenFile(...) for code expecting success - try/catch { FromFile } with fallback → TryOpenFile where appropriate - Removed dead null checks after OpenFile (it never returns null) --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rolf Bjarne Kvinge <rokvin@microsoft.com>
This pull request updates the following dependencies ## From https://github.com/dotnet/dotnet - **Subscription**: [30303172-6f12-44a9-887a-ea8520fce068](https://maestro.dot.net/subscriptions?search=30303172-6f12-44a9-887a-ea8520fce068) - **Build**: [20260427.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2961598) ([312133](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/312133)) - **Date Produced**: April 27, 2026 11:33:19 PM UTC - **Commit**: [7cd99d4e04536addfd185d632b239da7fbf352fb](dotnet/dotnet@7cd99d4) - **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx) - **Dependency Updates**: - From [10.0.0-beta.26216.121 to 10.0.0-beta.26227.113][5] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.SharedFramework.Sdk - From [10.0.300-preview.0.26216.121 to 10.0.300-preview.0.26227.113][5] - Microsoft.NET.Sdk - From [10.0.300-preview.26216.121 to 10.0.300][5] - Microsoft.TemplateEngine.Authoring.Tasks [5]: dotnet/dotnet@e43cbe0...7cd99d4
Convert classic NUnit assertions (Assert.AreEqual, Assert.IsNotNull, Assert.IsTrue, etc.) to NUnit v4 constraint-based Assert.That syntax across all linker test files. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rolf Bjarne Kvinge <rokvin@microsoft.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…rameworks. (#25490) This simplifies some code, and also makes it easier to determine what to do with some bindings we still have for some of these frameworks. --------- Co-authored-by: Rolf Bjarne Kvinge <rokvin@microsoft.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
When users try to install sharpie on x64 Macs, they previously got a confusing 'DotnetToolSettings.xml was not found' error because the nupkg only contained an arm64 binary. Fix this by including a small x64 native binary in the nupkg that prints a clear error message explaining that sharpie requires Apple Silicon and suggests using an arm64 Mac. Fixes #25339 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Migrate all classic assertions (AreEqual, IsTrue, IsNull, etc.) to Assert.That constraint syntax in tests/dotnet/UnitTests. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Collaborator
✅ [PR Build #d9703ff] Build passed (Detect API changes) ✅Pipeline on Agent |
dalexsoto
approved these changes
May 22, 2026
Contributor
|
Warning The ✅ Automated merge update Merged Resolved Conflicts
All conflicts resolved automatically following the code-radiator merge policy.
|
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
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.