Repository navigation
[main] Source code updates from dotnet/sdk - #10563
dotnet-maestro[bot] wants to merge 10 commits into
Conversation
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Azure Pipelines: 2 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Diff: https://github.com/dotnet/sdk/compare/4c425ca623e42d6ea86d2ec8e1b8b3834cc72e30..4c425ca623e42d6ea86d2ec8e1b8b3834cc72e30 From: dotnet/sdk@4c425ca To: dotnet/sdk@4c425ca The following files had conflicts that were resolved by a user: - src/sdk/eng/Versions.props
Diff: https://github.com/dotnet/sdk/compare/4c425ca623e42d6ea86d2ec8e1b8b3834cc72e30..7fcbcb9ad2d7004f04f330f2c586f38e411eb35b From: dotnet/sdk@4c425ca To: dotnet/sdk@7fcbcb9 [[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/sdk/compare/7fcbcb9ad2d7004f04f330f2c586f38e411eb35b..30d68985cf75b5b00d1ec4a385d65effd32d8478 From: dotnet/sdk@7fcbcb9 To: dotnet/sdk@30d6898 [[ commit created by automation ]]
[[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Regenerate XLF with UpdateXlf to remove the repeated package source mapping resource key that fails CI localization validation. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
|
@dotnet/source-build It looks like this needs a re-bootstrap to bring in an MSBuild fix that should fix a packaging failure. Can we re-bootstrap as needed or is there anything we need to wait for? AI AnalysisWindows x86 packaging is failing due to a mismatch between the package cache used during restore and the one used during the subsequent build. In [build 1661044](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1661044), Roslyn’s The binlog shows that restore generated package imports pointing to I reproduced this failure pattern with CI’s exact bootstrap SDK, The preferred resolution is to re-bootstrap onto an SDK containing that fix. Explicitly passing the intended cache as global |
Looks like we have one pending: #10625 |
|
Yes, @akoeplinger is driving that. I'm just a reviewer :) |
|
lol and I just noticed the rebootstrap is broken in part because it's missing some sdk change :) I think I can workaround that though. |
Diff: https://github.com/dotnet/sdk/compare/30d68985cf75b5b00d1ec4a385d65effd32d8478..14d3d468e4f2c4b631b593528a278cf9bacb7f17 From: dotnet/sdk@30d6898 To: dotnet/sdk@14d3d46 [[ commit created by automation ]]
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
ProjectData's publish output ships NuGet.Versioning in the SDK layout. Keep transitive pinning disabled for regular builds, but enable it in source-only builds so the dependency resolves to the source-built version and has a matching symbol file. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> (cherry picked from commit b1872a2) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 94493bfb-271a-49e3-b741-92f0337d8f59
|
The previous commit hit a test failure: The missing symbol failure comes from Transitive pinning was disabled in dotnet/sdk#56753 to avoid NU1109 errors caused by NuGet’s build-number wraparound, described in #9985. Main’s package versions no longer require that workaround, but the standalone SDK’s I cherry-picked b1872a2 from #10468 to keep main and 11.0.2xx aligned: re-enable transitive pinning in source-only builds so ProjectData ships the current source-built dependency, while preserving regular-build behavior. @dsplaisted @nagilson @ViktorHofer @mthalman I wonder if we need the NuGet.Versionining.dll in the ProjectData folder. I assume it could just use the one in the SDK root folder instead? looks like this is what e.g. Microsoft.NET.Build.Tasks already does: |
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
Diff the source with this PR branch