Set assets manifest metadata for assets that get shipped with .NET release#98824
Merged
ViktorHofer merged 4 commits intodotnet:mainfrom Feb 23, 2024
Merged
Set assets manifest metadata for assets that get shipped with .NET release#98824ViktorHofer merged 4 commits intodotnet:mainfrom
ViktorHofer merged 4 commits intodotnet:mainfrom
Conversation
ghost
assigned
ViktorHofer
reviewed
Feb 22, 2024
src/installer/prepare-artifacts.proj
Outdated
| <ItemsToPush Include="@(WorkloadsVSInsertionFile)"> | ||
| <RelativeBlobPath>$(InstallersRelativePath)workloads/%(Filename)%(Extension)</RelativeBlobPath> | ||
| <PublishFlatContainer>true</PublishFlatContainer> | ||
| <ManifestArtifactData Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">DotNetReleaseShipping=true</ManifestArtifactData> |
Member
There was a problem hiding this comment.
Consider using an ItemDefinitionGroup instead of all these manual metadata updates.
Contributor
Author
There was a problem hiding this comment.
thanks, I didn't know about this. How about now?
ViktorHofer
approved these changes
Feb 23, 2024
Member
|
I assume the same change needs to be done in windowsdesktop and deployment-tools? |
Contributor
Author
yes, for windowsdesktop: dotnet/windowsdesktop#4173 |
MilenaHristova
added a commit
that referenced
this pull request
Feb 27, 2024
…lease (#98824) * add metadata to manifest * set in ItemDefinitionGroup * remove from items * comment
4 tasks
Contributor
Author
|
/backport to release/7.0-staging |
Contributor
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/8066287605 |
4 tasks
Contributor
Author
|
/backport to release/6.0-staging |
Contributor
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/8066367789 |
Contributor
|
@MilenaHristova backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: add metadata to manifest
Using index info to reconstruct a base tree...
M src/installer/prepare-artifacts.proj
Falling back to patching base and 3-way merge...
Auto-merging src/installer/prepare-artifacts.proj
CONFLICT (content): Merge conflict in src/installer/prepare-artifacts.proj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add metadata to manifest
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 128Please backport manually! |
Contributor
|
@MilenaHristova an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
MilenaHristova
added a commit
to MilenaHristova/runtime
that referenced
this pull request
Feb 27, 2024
…lease (dotnet#98824) * add metadata to manifest * set in ItemDefinitionGroup * remove from items * comment
ViktorHofer
added a commit
that referenced
this pull request
Mar 6, 2024
…t shipped with .NET release (#98991) * Set assets manifest metadata for assets that get shipped with .NET release (#98824) * add metadata to manifest * set in ItemDefinitionGroup * remove from items * comment * Add ProducesNetCoreAssets property to Publishing.props (#98665) * add property to publishing.props * rename to ProducesDotNetReleaseShippingAssets * Update Publishing.props --------- Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> --------- Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
ViktorHofer
added a commit
that referenced
this pull request
Mar 7, 2024
…g.props (#98988) * add property to publishing.props * rename to ProducesDotNetReleaseShippingAssets * Update Publishing.props * Set assets manifest metadata for assets that get shipped with .NET release (#98824) * add metadata to manifest * set in ItemDefinitionGroup * remove from items * comment --------- Co-authored-by: MilenaHristova <mhristova@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tracking issue: https://github.com/dotnet/release/issues/822
Setting metadata for assets that will get shipped as part of .NET release in the assets manifest file.
I added the
ProducesDotNetReleaseShippingAssetsproperty in #98665Since runtime doesn't use arcade's default publishing, this is editing
prepare-artifacts.projwhere the metadata is getting added to the manifest