Skip to content
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

Merged
merged 2 commits into from
Jun 29, 2023

Conversation

LoopedBard3
Copy link
Member

Update NugetProjectModelVersion and NugetPackagingVersion from 6.2.2 to 6.2.4

@ghost
Copy link

ghost commented Jun 27, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

Update NugetProjectModelVersion and NugetPackagingVersion from 6.2.2 to 6.2.4

Author: LoopedBard3
Assignees: LoopedBard3
Labels:

area-Infrastructure-libraries

Milestone: -

@LoopedBard3
Copy link
Member Author

Copy link
Member

@carlossanlop carlossanlop left a 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.

@ViktorHofer
Copy link
Member

Curious, why?

@ViktorHofer
Copy link
Member

@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?

@mthalman
Copy link
Member

@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.

@ViktorHofer
Copy link
Member

At least this one runs:

runtime-dev-innerloop (Build linux-x64 Release PortableSourceBuild)

@mthalman
Copy link
Member

Ah, this needs to be updated:

<Dependency Name="Nuget.ProjectModel" Version="6.2.2">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d</Sha>

This isn't showing up in prebuilt reporting because all NuGet packages are excluded from that:

<!-- Will be removed once https://github.com/NuGet/Home/issues/11059 is resolved -->
<UsagePattern IdentityGlob="Nuget.*/*" />

@LoopedBard3
Copy link
Member Author

Ah, this needs to be updated:

<Dependency Name="Nuget.ProjectModel" Version="6.2.2">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d</Sha>

This isn't showing up in prebuilt reporting because all NuGet packages are excluded from that:

<!-- Will be removed once https://github.com/NuGet/Home/issues/11059 is resolved -->
<UsagePattern IdentityGlob="Nuget.*/*" />

I updated the spot linked. Do you know if there is anywhere else that needs to be updated with these values?

@LoopedBard3
Copy link
Member Author

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!

@ViktorHofer
Copy link
Member

This isn't showing up in prebuilt reporting because all NuGet packages are excluded from that:

Got it, thanks. But do we still need an SBRP package for it?

@mthalman
Copy link
Member

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.

@ViktorHofer
Copy link
Member

Cool, thanks. @LoopedBard3 can you please explain why this change is necessary?

@ViktorHofer ViktorHofer merged commit 97c96d4 into dotnet:main Jun 29, 2023
167 of 172 checks passed
@LoopedBard3 LoopedBard3 deleted the UpdateNugetVersion branch June 29, 2023 17:17
@ghost ghost locked as resolved and limited conversation to collaborators Jul 29, 2023
@agocke
Copy link
Member

agocke commented Nov 10, 2023

/backport to release/7.0

@github-actions github-actions bot unlocked this conversation Nov 10, 2023
Copy link
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/6828957092

Copy link
Contributor

@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!

Copy link
Contributor

@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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants