Include SharedFx bundle in Hosting Bundle, instead of SharedFx .msi #36858
Conversation
ghost
added
the
area-infrastructure
src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
Outdated
Show resolved
Hide resolved
|
It works! Test build confirms that after installing Hosting bundle 5.0.n, shared framework bundle 5.0.n+1 will uninstall the older runtime that came with the hosting bundle. |
|
/backport to release/5.0 |
|
/backport to release/6.0 |
|
Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/1263979400 |
|
/backport to release/3.1 |
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1263980012 |
|
Started backporting to release/3.1: https://github.com/dotnet/aspnetcore/actions/runs/1263980353 |
|
@wtgodbe backporting to release/3.1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Chain SharedFx Bundle into Hosting Bundle instead of .msi
Applying: Fixup
Applying: Move stuff around
Using index info to reconstruct a base tree...
M src/Installers/Windows/WindowsHostingBundle/Product.targets
M src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
Falling back to patching base and 3-way merge...
Auto-merging src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
CONFLICT (content): Merge conflict in src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
Auto-merging src/Installers/Windows/WindowsHostingBundle/Product.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Move stuff around
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! |
Hurray! |
|
/backport to release/2.1 |
|
Started backporting to release/2.1: https://github.com/dotnet/aspnetcore/actions/runs/1263991368 |
|
@wtgodbe backporting to release/2.1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Chain SharedFx Bundle into Hosting Bundle instead of .msi
Using index info to reconstruct a base tree...
M src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
M src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
M src/Installers/Windows/WindowsHostingBundle/Product.targets
M src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
Falling back to patching base and 3-way merge...
Auto-merging src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
CONFLICT (content): Merge conflict in src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
Auto-merging src/Installers/Windows/WindowsHostingBundle/Product.targets
Auto-merging src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
Auto-merging src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
CONFLICT (content): Merge conflict in src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Chain SharedFx Bundle into Hosting Bundle instead of .msi
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! |
Short-term fix for #36382. Add a wix project for the SharedFx bundles and reference that from the Hosting bundle, instead of the SharedFx .msi's. Also change the Hosting Bundle to ProjectReference SharedFrameworkBundle instead of having 2 ProjectReferences to SharedFrameworkLib - this ensures that by the time
ResolveProjectReferencesis done, the SharedFx .msi's are available so we can extract the Product Code from them & pass it along to the new wix project. Will need to backport this to servicing after I confirm it works with test builds.I also removed
BundleProviderKeyfrom the SharedFx bundle after conversation with @joeloff to confirm it wasn't necessary.CC @jamshedd