-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Update NugetProjectModelVersion and NugetPackagingVersion from 6.2.2 to 6.2.4 #88107
Conversation
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsUpdate NugetProjectModelVersion and NugetPackagingVersion from 6.2.2 to 6.2.4
|
Test build in the performance repo: https://dev.azure.com/dnceng/internal/_build/results?buildId=2210578&view=results |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Assuming there are no CI issues, LGTM.
Curious, why? |
@MichaelSimons @mthalman I might be wrong, but shouldn't this result in a new prebuild in the source build leg as that package version isn't available in SBRP? |
I don't see a source-build leg even running in the pipeline. |
At least this one runs:
|
Ah, this needs to be updated: runtime/eng/Version.Details.xml Lines 382 to 384 in c06d77a
This isn't showing up in prebuilt reporting because all NuGet packages are excluded from that: runtime/eng/SourceBuildPrebuiltBaseline.xml Lines 13 to 14 in c06d77a
|
I updated the spot linked. Do you know if there is anywhere else that needs to be updated with these values? |
df89142
to
1f8d748
Compare
It looks like the "Build windows-x86 release MSBuild_CMake" job is failing for multiple PR's based on looking at the pipeline, due to "Failed to generate native component build project!". I am not finding an already opened tracking issue for this, is there a way to create a tracking issue or is opening a bug report the best way? Also, is this PR good to merge? Thanks! |
Got it, thanks. But do we still need an SBRP package for it? |
No, it wouldn't rely on SBRP in full source-build. Because it's listed as a dependency in Version.Details.xml, it will make use of the package from previously source-built artifacts. |
Cool, thanks. @LoopedBard3 can you please explain why this change is necessary? |
/backport to release/7.0 |
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/6828957092 |
@agocke backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Nuget Package Versions.
Using index info to reconstruct a base tree...
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Nuget Package Versions.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@agocke an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Update NugetProjectModelVersion and NugetPackagingVersion from 6.2.2 to 6.2.4