From 98f41e2f245b9a36ec619ed2c59e2d6fe17b3efe Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 21 Sep 2021 16:06:01 -0700 Subject: [PATCH 1/9] Chain SharedFx Bundle into Hosting Bundle instead of .msi --- .../Windows/SharedFrameworkBundle/Bundle.wxs | 3 +- .../Windows/WindowsHostingBundle/Bundle.wxs | 3 +- .../WindowsHostingBundle/Product.targets | 51 +++++++++++++++++++ .../WindowsHostingBundle/SharedFramework.wxs | 44 ++++++++++++++++ .../WindowsHostingBundle.wixproj | 1 + 5 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs index 6f5d2de16573..453548c27511 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs +++ b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs @@ -1,7 +1,6 @@ - + - - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 070507053fbc..e58daadd62f3 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -3,6 +3,10 @@ $(IntermediateOutputPath)d\ $(BaseIntermediateOutputPath) $(DefineConstants);DepsPath=$(DepsPath) + $(DefineConstants);InstallersOutputPath=$(InstallersOutputPath) + $(PackageVersion) + $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) @@ -17,6 +21,17 @@ DotNetRedistLtsInstallerx86 $(MicrosoftNETCoreAppRuntimeVersion) + + + x64 + SharedFxRedistInstallerx64 + $(SharedFxPackageVersion) + + + x86 + SharedFxRedistInstallerx86 + $(SharedFxPackageVersion) + @@ -87,4 +102,40 @@ $(DefineConstants);DotNetRedistLtsInstallerUpgradeCodex86=$(DotNetRedistLtsInstallerUpgradeCodex86) + + + + + + + + + + SharedFxInstallerProductVersionx64 + SharedFxInstallerProductCodex64 + + + SharedFxInstallerProductVersionx86 + SharedFxInstallerProductCodex86 + + + + + + + + + + + + + $(DefineConstants);SharedFxRedistInstallerx64=$(SharedFxRedistInstallerx64) + $(DefineConstants);SharedFxInstallerProductVersionx64=$(SharedFxInstallerProductVersionx64) + $(DefineConstants);SharedFxInstallerProductCodex64=$(SharedFxInstallerProductCodex64) + $(DefineConstants);SharedFxRedistInstallerx86=$(SharedFxRedistInstallerx86) + $(DefineConstants);SharedFxInstallerProductVersionx86=$(SharedFxInstallerProductVersionx86) + $(DefineConstants);SharedFxInstallerProductCodex86=$(SharedFxInstallerProductCodex86) + + diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs new file mode 100644 index 000000000000..a3f554819c1f --- /dev/null +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 28e7ca2b523d..dff5f18428e7 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -35,6 +35,7 @@ + From e1a4b8e91041119a6a15374ae565bff6ea020d42 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 21 Sep 2021 16:12:19 -0700 Subject: [PATCH 2/9] Fixup --- src/Installers/Windows/WindowsHostingBundle/Product.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index e58daadd62f3..38bcea8dd933 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -122,10 +122,10 @@ - + - + From 8131f1269f6fb9fcdf5bdc65e8cb9f63855509dc Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Sep 2021 09:16:51 -0700 Subject: [PATCH 3/9] Move stuff around --- .../WindowsHostingBundle/Product.targets | 50 ------------------ .../WindowsHostingBundle.wixproj | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 38bcea8dd933..e446b9f5df2d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -4,9 +4,6 @@ $(BaseIntermediateOutputPath) $(DefineConstants);DepsPath=$(DepsPath) $(DefineConstants);InstallersOutputPath=$(InstallersOutputPath) - $(PackageVersion) - $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) @@ -21,17 +18,6 @@ DotNetRedistLtsInstallerx86 $(MicrosoftNETCoreAppRuntimeVersion) - - - x64 - SharedFxRedistInstallerx64 - $(SharedFxPackageVersion) - - - x86 - SharedFxRedistInstallerx86 - $(SharedFxPackageVersion) - @@ -102,40 +88,4 @@ $(DefineConstants);DotNetRedistLtsInstallerUpgradeCodex86=$(DotNetRedistLtsInstallerUpgradeCodex86) - - - - - - - - - - SharedFxInstallerProductVersionx64 - SharedFxInstallerProductCodex64 - - - SharedFxInstallerProductVersionx86 - SharedFxInstallerProductCodex86 - - - - - - - - - - - - - $(DefineConstants);SharedFxRedistInstallerx64=$(SharedFxRedistInstallerx64) - $(DefineConstants);SharedFxInstallerProductVersionx64=$(SharedFxInstallerProductVersionx64) - $(DefineConstants);SharedFxInstallerProductCodex64=$(SharedFxInstallerProductCodex64) - $(DefineConstants);SharedFxRedistInstallerx86=$(SharedFxRedistInstallerx86) - $(DefineConstants);SharedFxInstallerProductVersionx86=$(SharedFxInstallerProductVersionx86) - $(DefineConstants);SharedFxInstallerProductCodex86=$(SharedFxInstallerProductCodex86) - - diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index dff5f18428e7..e20f68d98fc7 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -78,6 +78,9 @@ dotnet-hosting-$(PackageVersion)-win$(TargetExt) Microsoft .NET $(PackageBrandingVersion) + $(PackageVersion) + $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) @@ -94,6 +97,19 @@ $(BundleNameFull) + + + x64 + SharedFxRedistInstallerx64 + $(SharedFxPackageVersion) + + + x86 + SharedFxRedistInstallerx86 + $(SharedFxPackageVersion) + + + $(DefineConstants);BundleName=$(BundleName) $(DefineConstants);BundleNameFull=$(BundleNameFull) @@ -105,4 +121,40 @@ $(DefineConstants);BundleRegFamily=$(BundleRegFamily) $(DefineConstants);BundleRegName=$(BundleRegName) + + + + + + + + + + SharedFxInstallerProductVersionx64 + SharedFxInstallerProductCodex64 + + + SharedFxInstallerProductVersionx86 + SharedFxInstallerProductCodex86 + + + + + + + + + + + + + $(DefineConstants);SharedFxRedistInstallerx64=$(SharedFxRedistInstallerx64) + $(DefineConstants);SharedFxInstallerProductVersionx64=$(SharedFxInstallerProductVersionx64) + $(DefineConstants);SharedFxInstallerProductCodex64=$(SharedFxInstallerProductCodex64) + $(DefineConstants);SharedFxRedistInstallerx86=$(SharedFxRedistInstallerx86) + $(DefineConstants);SharedFxInstallerProductVersionx86=$(SharedFxInstallerProductVersionx86) + $(DefineConstants);SharedFxInstallerProductCodex86=$(SharedFxInstallerProductCodex86) + + From be1538b4ca73c185b53bfc1dbeb8525f9643c999 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Sep 2021 11:52:00 -0700 Subject: [PATCH 4/9] Try something --- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index e20f68d98fc7..b3d94c39eba2 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -133,18 +133,22 @@ SharedFxInstallerProductVersionx64 SharedFxInstallerProductCodex64 + $(InstallersOutputPath)temp/$(RuntimeInstallerBaseName)-$(SharedFxPackageVersion)-win-x64.msi SharedFxInstallerProductVersionx86 SharedFxInstallerProductCodex86 + $(InstallersOutputPath)temp/$(RuntimeInstallerBaseName)-$(SharedFxPackageVersion)-win-x86.msi + + - + - + From 6be18c0e6d7870a08cabbaae1060c31cb1b0a30f Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Sep 2021 12:55:42 -0700 Subject: [PATCH 5/9] Try something else --- .../WindowsHostingBundle.wixproj | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b3d94c39eba2..19321ce7c184 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -54,20 +54,7 @@ True true - - Platform=x86 - SharedFrameworkLib_x86 - {5244BC49-2568-4701-80A6-EAB8950AB5FA} - True - true - - - Platform=x64 - SharedFrameworkLib_x64 - {5244BC49-2568-4701-80A6-EAB8950AB5FA} - True - true - + @@ -133,22 +120,18 @@ SharedFxInstallerProductVersionx64 SharedFxInstallerProductCodex64 - $(InstallersOutputPath)temp/$(RuntimeInstallerBaseName)-$(SharedFxPackageVersion)-win-x64.msi SharedFxInstallerProductVersionx86 SharedFxInstallerProductCodex86 - $(InstallersOutputPath)temp/$(RuntimeInstallerBaseName)-$(SharedFxPackageVersion)-win-x86.msi - - - + - + From acbc7aa59bdee0263d2e5a7aa3784a2f584ab792 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Sep 2021 14:04:23 -0700 Subject: [PATCH 6/9] AfterTargets --- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 19321ce7c184..ae7e2e85b5fb 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -109,7 +109,7 @@ $(DefineConstants);BundleRegName=$(BundleRegName) - + From a6b9da2db6f7eb62aca4adb8e3f935ecc740a01b Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Sep 2021 15:01:09 -0700 Subject: [PATCH 7/9] Fix version --- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index ae7e2e85b5fb..75531cdf3384 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -66,8 +66,9 @@ Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) - $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) + $(PackageVersion) + $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) @@ -117,11 +118,11 @@ - + SharedFxInstallerProductVersionx64 SharedFxInstallerProductCodex64 - + SharedFxInstallerProductVersionx86 SharedFxInstallerProductCodex86 From 1ff6d8845f72780c8eba52603810e10dc8fc2907 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Sep 2021 15:54:50 -0700 Subject: [PATCH 8/9] Fixup --- src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs index a3f554819c1f..833fcfcb8068 100644 --- a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -15,7 +15,7 @@ DetectCondition="SharedFxRedistProductVersion_x64 = v$(var.SharedFxInstallerProductVersionx64)"> - Date: Wed, 22 Sep 2021 17:19:22 -0700 Subject: [PATCH 9/9] Feedback --- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 75531cdf3384..a055ee3bf2a0 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -54,7 +54,10 @@ True true - + + True + false +