Skip to content

[main] Source code updates from dotnet/dotnet #116145

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.

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
merged 9 commits into from
Jun 4, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 30, 2025

Note

This is a codeflow update. It may contain both source code changes from the VMR as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

@akoeplinger
Copy link
Member

akoeplinger commented Jun 2, 2025

@agocke @sbomer from what I can see the linker test failures are due to the new annotations from #114346. I assume the test needs to be updated? I filed #116218 and disabled the test for now to unblock the codeflow.

Updated Dependencies:
System.CommandLine (Version 2.0.0-beta5.25279.110 -> 2.0.0-beta5.25279.2)
Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25279.110 -> 0.11.5-alpha.25260.104)
Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.6.25279.110 -> 10.0.100-preview.5.25260.104)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.XUnitExtensions, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.PackageTesting (Version 10.0.0-beta.25279.110 -> 10.0.0-beta.25260.104)
Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25279.110 -> 2.9.2-beta.25260.104)
Microsoft.NETCore.App.Runtime.win-x64, runtime.native.System.IO.Ports, Microsoft.NETCore.ILAsm, Microsoft.NET.Sdk.IL, System.Text.Json, System.Reflection.Metadata, System.Reflection.MetadataLoadContext (Version 10.0.0-preview.6.25279.110 -> 10.0.0-preview.5.25260.104)
Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25279.110 -> 5.0.0-1.25260.104)
Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25279.110 -> 10.0.0-preview.25260.104)
Copy link
Contributor Author

dotnet-maestro bot commented Jun 4, 2025

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="ac2aaf24d127067df385f2aa5ab35bb9b96d5f74" BarId="270450" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

Copy link
Member

@agocke agocke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@agocke agocke merged commit ab70886 into main Jun 4, 2025
165 of 167 checks passed
@agocke agocke deleted the darc-main-e61656da-e564-44d5-a254-d44b47455041 branch June 4, 2025 17:12
@@ -153,9 +153,9 @@ showSubsetHelp()
"$scriptroot/common/build.sh" "-restore" "-build" "/p:Subset=help" "/clp:nosummary /tl:false"
}

arguments=''
arguments=()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jkoritzinsky this is breaking ./build.sh (without any argument) on macOS.

$ ./build.sh
/Users/am11/projects/runtime/eng/build.sh: line 552: arguments[@]: unbound variable

One way to fix is:

- arguments=()
+ arguments=("")

@@ -1,18 +1,18 @@
{
"sdk": {
"version": "10.0.100-preview.3.25201.16",
"version": "10.0.100-preview.6.25272.112",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we need to update this to an unreleased preview, or could we wait until the preview is released? MacOS has limitations on test signed sdks and the C# Dev Kit compatibility workaround is broken, so the VSCode experience on Macs is not great with this version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at the moment yes but we're talking about only bumping to signed builds (even from nightly builds) to alleviate this.

Copy link
Member

@akoeplinger akoeplinger Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have an issue for the VSCode workaround being broken? I assume you're talking about

image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's the workaround I was talking about. I filed microsoft/vscode-dotnettools#2082 on dev kit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Apple mobile] NativeAOT smoke tests fail on all Apple mobile jobs: "You must install or update .NET to run this application."
6 participants