Skip to content

Conversation

@NikolaMilosavljevic
Copy link
Member

dotner-runtime RPM package does not define any directories it owns. This causes versioned directory to be left on the machine after uninstall or package upgrade.

Support for installer-owned directories already exists in shared infra and is currently used by dotnet-hostfxr package:

<RpmJsonProperty Include="directories" Object="[ &quot;/usr/share/dotnet&quot;, &quot;/usr/share/doc/$(VersionedInstallerName)&quot; ]" />

Similarly, aspnetcore-runtime package has this correct: https://github.com/dotnet/aspnetcore/blob/29a9c90edf6dbd773296723e8f82605d0364d9f2/src/Installers/Rpm/Rpm.Runtime.Common.targets#L28

@NikolaMilosavljevic NikolaMilosavljevic merged commit 8442ff6 into dotnet:main Jan 22, 2024
tmds pushed a commit to tmds/runtime that referenced this pull request Jan 23, 2024
@NikolaMilosavljevic
Copy link
Member Author

/backport to release/8.0-staging

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7849085534

@NikolaMilosavljevic
Copy link
Member Author

/backport to release/7.0-staging

@NikolaMilosavljevic
Copy link
Member Author

/backport to release/6.0-staging

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/7849091600

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/7849092896

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

@NikolaMilosavljevic 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: Define installer-owned directories
Using index info to reconstruct a base tree...
M	src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
Falling back to patching base and 3-way merge...
Auto-merging src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
CONFLICT (content): Merge conflict in src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.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 Define installer-owned directories
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!

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

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

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

@NikolaMilosavljevic backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Define installer-owned directories
Using index info to reconstruct a base tree...
M	src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
Falling back to patching base and 3-way merge...
Auto-merging src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
CONFLICT (content): Merge conflict in src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.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 Define installer-owned directories
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!

@github-actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

@NikolaMilosavljevic an error occurred while backporting to release/7.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

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.

2 participants