Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[main] Source code updates from dotnet/sdk #1268

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

Jump to bottom
Merged
merged 12 commits into from
Jul 1, 2025
Merged

[main] Source code updates from dotnet/sdk #1268

merged 12 commits into from
Jul 1, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 20, 2025 •
edited
Loading

Note

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

This pull request brings the following source code changes

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

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@jkoritzinsky
Copy link
Member

I'll take a look at these failures.

@jkoritzinsky jkoritzinsky self-assigned this Jun 20, 2025
@jkoritzinsky
Copy link
Member

@dotnet/distro-maintainers @tmds we're in the process of shifting how we publish the runtime libraries for NativeAOT. We're moving them out of the runtime.<rid>.Microsoft.DotNet.ILCompiler package and moving them into the Microsoft.NETCore.App.Runtime.NativeAOT.<rid> package.

Giving you a heads up as this will likely require a reaction on your package authoring if you provide a separate download for the NativeAOT assets.

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

1 similar comment
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@jkoritzinsky jkoritzinsky force-pushed the darc-main-cc7ff9e0-4eb0-48ad-b1cb-5022b8345f7a branch from cef1028 to ab47759 Compare June 21, 2025 04:13
@tmds
Copy link
Member

tmds commented Jun 21, 2025

we're in the process of shifting how we publish the runtime libraries for NativeAOT. We're moving them out of the runtime..Microsoft.DotNet.ILCompiler package and moving them into the Microsoft.NETCore.App.Runtime.NativeAOT. package.

Thanks for the heads-up.

We need to update https://github.com/dotnet/docs/blob/main/docs/core/distribution-packaging.md. (19) is about this package, which gets extracted into the $DOTNET_ROOT/packs directory.

jkoritzinsky added a commit to dotnet/docs that referenced this pull request Jun 21, 2025
@jkoritzinsky
Update distribution-packaging.md
d766aeb 
React to changes in dotnet/dotnet#1268

cc @tmds
@jkoritzinsky jkoritzinsky mentioned this pull request Jun 21, 2025
Merged
@jkoritzinsky jkoritzinsky requested review from a team as code owners June 21, 2025 18:30
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@premun premun mentioned this pull request Jun 24, 2025
Closed
@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@premun
Copy link
Member

premun commented Jun 30, 2025

Please ignore the Maestro comments in this PR about the conflicts - it's tied to the nuget-client subscription that is batched with this one.

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jul 1, 2025

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@ViktorHofer
Copy link
Member 

    Generating native code
  EXEC : error : System module System.Private.CoreLib does not exists. Make sure that you specify --systemmodule [/__w/1/s/src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj]
##[error]EXEC(0,0): error : (NETCORE_ENGINEERING_TELEMETRY=Build) System module System.Private.CoreLib does not exists. Make sure that you specify --systemmodule
    System.CommandLine.CommandLineException: System module System.Private.CoreLib does not exists. Make sure that you specify --systemmodule
       at ILCompiler.Program.Run() in /_/src/runtime/src/coreclr/tools/aot/ILCompiler/Program.cs:line 158
       at ILCompiler.ILCompilerRootCommand.<>c__DisplayClass255_0.<.ctor>b__0(ParseResult result) in /_/src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompilerRootCommand.cs:line 308
  /__w/1/s/src/runtime/artifacts/bin/coreclr/linux.x64.Release/build/Microsoft.NETCore.Native.targets(332,5): error MSB3073: The command ""/__w/1/s/src/runtime/artifacts/bin/coreclr/linux.x64.Release/x64/ilc/ilc" @"/__w/1/s/src/runtime/artifacts/obj/coreclr/ILCompiler_publish/linux.x64.Release/native/ilc.ilc.rsp"" exited with code 1. [/__w/1/s/src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj]
##[error]src/runtime/artifacts/bin/coreclr/linux.x64.Release/build/Microsoft.NETCore.Native.targets(332,5): error MSB3073: (NETCORE_ENGINEERING_TELEMETRY=Build) The command ""/__w/1/s/src/runtime/artifacts/bin/coreclr/linux.x64.Release/x64/ilc/ilc" @"/__w/1/s/src/runtime/artifacts/obj/coreclr/ILCompiler_publish/linux.x64.Release/native/ilc.ilc.rsp"" exited with code 1.

@dotnet-maestro DotNet Maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jul 1, 2025

There was a conflict in the PR branch when flowing source from https://github.com/nuget/nuget.client/tree/eb38c4a6cccfce5ee9415da1a930fc6534194b2b
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

@jkoritzinsky
Include the private SDK assemblies when we are overriding them even w…
90404c8 
…hen the resolved package is the framework layout package
@jkoritzinsky jkoritzinsky mentioned this pull request Jul 1, 2025
Merged
@jkoritzinsky jkoritzinsky enabled auto-merge (squash) July 1, 2025 22:28
@jkoritzinsky jkoritzinsky merged commit 281a7d3 into main Jul 1, 2025
14 of 15 checks passed
@jkoritzinsky jkoritzinsky deleted the darc-main-cc7ff9e0-4eb0-48ad-b1cb-5022b8345f7a branch July 1, 2025 22:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ViktorHofer ViktorHofer ViktorHofer approved these changes

Assignees

@jkoritzinsky jkoritzinsky

Labels
None yet
Projects
.NET Unified Build
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jkoritzinsky @tmds @premun @ViktorHofer