-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[dotnet-format] Include the .NET Framework buildhost executable in the SDK. #45290
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 8000 to your account
Conversation
This is necessary for dotnet-format to loading .NET Framework projects.
Could you please ensure that the fix will be included also in next hotfix for .NET9 release? |
/azp run |
Azure Pipelines successfully started running 4 pipeline(s). |
/backport to release/9.0.2xx |
Started backporting to release/9.0.2xx: https://github.com/dotnet/sdk/actions/runs/12175899687 |
Hi
|
/backport to release/8.0.4xx |
Started backporting to release/8.0.4xx: https://github.com/dotnet/sdk/actions/runs/15032948879 |
@JoeRobich backporting to "release/8.0.4xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Include the .NET Framework buildhost executable in the SDK.
Using index info to reconstruct a base tree...
M src/Layout/redist/targets/GenerateLayout.targets
Falling back to patching base and 3-way merge...
Auto-merging src/Layout/redist/targets/GenerateLayout.targets
CONFLICT (conten
8000
t): Merge conflict in src/Layout/redist/targets/GenerateLayout.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Include the .NET Framework buildhost executable in the SDK.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@marcpopMSFT fyi. We would like to bring this for approval in next tactics. |
@arunchndr please fill out the template in 48969 and send mail to the tactics alias tomorrow. They want to start building for June before the next tactics meeting. There might be rebuilds next week but they start early to get testing going early. BTW, we support the /backport command in this repo so ya'll can use that next time you backport if you like. |
This is necessary for dotnet-format to load .NET Framework projects.
Fixes #43017