Set assets manifest metadata for assets that get shipped with .NET release #98824
Conversation
ghost
assigned 
src/installer/prepare-artifacts.proj
Outdated
| </ItemsToPush> | ||
|
|
||
| <ItemsToPush Include="@(WorkloadsVSInsertionFile)"> | ||
| <RelativeBlobPath>$(InstallersRelativePath)workloads/%(Filename)%(Extension)</RelativeBlobPath> | ||
| <PublishFlatContainer>true</PublishFlatContainer> | ||
| <ManifestArtifactData Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">DotNetReleaseShipping=true</ManifestArtifactData> |
There was a problem hiding this comment.
Consider using an ItemDefinitionGroup instead of all these manual metadata updates.
There was a problem hiding this comment.
thanks, I didn't know about this. How about now?
|
I assume the same change needs to be done in windowsdesktop and deployment-tools? |
yes, for windowsdesktop: dotnet/windowsdesktop#4173 |
…lease (#98824) * add metadata to manifest * set in ItemDefinitionGroup * remove from items * comment
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/8066287605 |
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/8066367789 |
|
@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! |
|
@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. |
…lease (dotnet#98824) * add metadata to manifest * set in ItemDefinitionGroup * remove from items * comment
…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 <[email protected]> --------- Co-authored-by: Viktor Hofer <[email protected]>
…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 <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
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