From 00a947323b663d99bfc03b2b95c1445a147430b5 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 11:14:52 -0800 Subject: [PATCH 01/11] Use the Installers Arcade package to build the ref pack MSI --- eng/Build.props | 10 -- .../src/Microsoft.AspNetCore.App.Ref.sfxproj | 5 +- .../TargetingPack/DependencyProvider.wxs | 14 --- .../Windows/TargetingPack/Product.wxs | 113 ------------------ .../Windows/TargetingPack/Strings.wxl | 5 - .../TargetingPack/TargetingPack.nuspec | 21 ---- .../TargetingPack/TargetingPack.wixproj | 103 ---------------- 7 files changed, 4 insertions(+), 267 deletions(-) delete mode 100644 src/Installers/Windows/TargetingPack/DependencyProvider.wxs delete mode 100644 src/Installers/Windows/TargetingPack/Product.wxs delete mode 100644 src/Installers/Windows/TargetingPack/Strings.wxl delete mode 100644 src/Installers/Windows/TargetingPack/TargetingPack.nuspec delete mode 100644 src/Installers/Windows/TargetingPack/TargetingPack.wixproj diff --git a/eng/Build.props b/eng/Build.props index 103f38b78712..7f6cf2b3aabd 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -241,14 +241,6 @@ - - - - - - @@ -268,8 +260,6 @@ - - diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj index ef6d7d5cfcbf..d7c28e6e4b55 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj @@ -13,6 +13,7 @@ $(TargetingPackInstallerBaseName) true Microsoft ASP.NET Core + AspNetCore.TargetingPack false @@ -22,6 +23,7 @@ $(RepoRoot)LICENSE.txt $(AspNetCoreMajorVersion) $(AspNetCoreMinorVersion) + $(AspNetCorePatchVersion) $(MicrosoftNETCoreAppRefVersion) @@ -36,11 +38,12 @@ true true true + true - + diff --git a/src/Installers/Windows/TargetingPack/DependencyProvider.wxs b/src/Installers/Windows/TargetingPack/DependencyProvider.wxs deleted file mode 100644 index d62c3dfe7ddb..000000000000 --- a/src/Installers/Windows/TargetingPack/DependencyProvider.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Installers/Windows/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs deleted file mode 100644 index 5b28e5e417fc..000000000000 --- a/src/Installers/Windows/TargetingPack/Product.wxs +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT NON_NATIVE_ARCHITECTURE - - - - - - - - - - NOT NON_NATIVE_ARCHITECTURE - - - - - - - - - - - NON_NATIVE_ARCHITECTURE - - - - - - NON_NATIVE_ARCHITECTURE - - - - - - - - diff --git a/src/Installers/Windows/TargetingPack/Strings.wxl b/src/Installers/Windows/TargetingPack/Strings.wxl deleted file mode 100644 index 8b327078538b..000000000000 --- a/src/Installers/Windows/TargetingPack/Strings.wxl +++ /dev/null @@ -1,5 +0,0 @@ - - - ASP.NET Core Targeting Pack - ASP.NET Core Targeting Pack - diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.nuspec b/src/Installers/Windows/TargetingPack/TargetingPack.nuspec deleted file mode 100644 index 5427cd8c93d4..000000000000 --- a/src/Installers/Windows/TargetingPack/TargetingPack.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$ - 1.0.0 - VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$ - Microsoft - Microsoft - $PackageLicenseExpression$ - https://github.com/dotnet/aspnetcore - $PackageIcon$ - true - $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption - © Microsoft Corporation. All rights reserved. - true - - - - - - diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj deleted file mode 100644 index 1c41fba0361d..000000000000 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - $(TargetingPackInstallerBaseName)- - -win-$(Platform) - Microsoft ASP.NET Core Targeting Pack - AspNetCore.TargetingPack - Package - targeting_pack_$(Platform).cab - true - 0AC34F1B-8056-4FFB-A398-E6BB7D67B48D - true - 5150;5151 - true - $(IntermediateOutputPath)dn\ - $(DefineConstants);ProductNameShort=$(ProductNameShort) - $(DefineConstants);ProductNameFolder=$(ProductNameFolder) - $(DefineConstants);AspNetCoreTargetingPackSource=$(HarvestSource) - DDBB771F-963F-47D3-8510-9ABD04DBE1D1 - 2.0 - $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec - $(TargetingPackVersionPrefix) - $(TargetingPackVersionPrefix) - - - - - $(WixExtDir)\WixDependencyExtension.dll - WixDependencyExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - - - - - - - - - - - true - CG_AspNetCoreTargetingPack - DOTNETHOME - var.AspNetCoreTargetingPackSource - - - - - - - $(ArtifactsShippingPackagesDir) - $(TargetingPackVersionPrefix) - $(TargetingPackZipVersion)-$(VersionSuffix) - $(TargetingPackHarvestRoot)aspnetcore-targeting-pack-$(TargetingPackZipVersion)-$(TargetRuntimeIdentifier).zip - - - - - - - - - Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform)) - $(OutputName)$(TargetExt) - $(DefineConstants);ProductName=$(ProductName) - - - - - $(InstallersOutputPath)$(PackageFileName) - - - - - From 109e8660bc801b0ff6616104e02901317301cc5a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 16:16:25 -0800 Subject: [PATCH 02/11] Convert Shared Framework msi to use the Installer shared tooling. --- Directory.Build.props | 2 +- .../Microsoft.AspNetCore.App.Runtime.sfxproj | 5 +- .../SharedFramework/DependencyProvider.wxs | 14 -- .../Windows/SharedFramework/Product.wxs | 127 ------------------ .../SharedFramework/SharedFramework.nuspec | 22 --- .../SharedFramework/SharedFramework.wixproj | 117 ---------------- .../Windows/SharedFramework/Strings.wxl | 5 - .../SharedFrameworkBundle.wixproj | 6 +- 8 files changed, 7 insertions(+), 291 deletions(-) delete mode 100644 src/Installers/Windows/SharedFramework/DependencyProvider.wxs delete mode 100644 src/Installers/Windows/SharedFramework/Product.wxs delete mode 100644 src/Installers/Windows/SharedFramework/SharedFramework.nuspec delete mode 100644 src/Installers/Windows/SharedFramework/SharedFramework.wixproj delete mode 100644 src/Installers/Windows/SharedFramework/Strings.wxl diff --git a/Directory.Build.props b/Directory.Build.props index 3c1eb3f60b3e..72d99feb7d60 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -239,7 +239,7 @@ https://dotnetbuilds.azureedge.net/public/ https://dotnetbuilds.azureedge.net/internal/ - $(InstallersOutputPath) + $(ArtifactsShippingPackagesDir) $(MicrosoftNETCoreAppRefVersion) @@ -46,6 +48,7 @@ true true true + true @@ -54,7 +57,7 @@ - + diff --git a/src/Installers/Windows/SharedFramework/DependencyProvider.wxs b/src/Installers/Windows/SharedFramework/DependencyProvider.wxs deleted file mode 100644 index d62c3dfe7ddb..000000000000 --- a/src/Installers/Windows/SharedFramework/DependencyProvider.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs deleted file mode 100644 index 30d8d6025817..000000000000 --- a/src/Installers/Windows/SharedFramework/Product.wxs +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT NON_NATIVE_ARCHITECTURE - - - - - - - - - - NOT NON_NATIVE_ARCHITECTURE - - - - - - - - - - NON_NATIVE_ARCHITECTURE - - - - - - - NON_NATIVE_ARCHITECTURE - - - - - - - - - - - - - - diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.nuspec b/src/Installers/Windows/SharedFramework/SharedFramework.nuspec deleted file mode 100644 index 99a350d5462c..000000000000 --- a/src/Installers/Windows/SharedFramework/SharedFramework.nuspec +++ /dev/null @@ -1,22 +0,0 @@ - - - - VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ - 1.0.0 - VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ - Microsoft - Microsoft - $PackageLicenseExpression$ - https://github.com/dotnet/aspnetcore - $PackageIcon$ - true - $MAJOR$.$MINOR$ ASP.NET Core Shared Framework ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption - © Microsoft Corporation. All rights reserved. - true - - - - - - - diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj deleted file mode 100644 index 0235a8c37dd1..000000000000 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - $(RuntimeInstallerBaseName)- - -win-$(Platform) - Microsoft ASP.NET Core Shared Framework - AspNetCore.SharedFramework - Package - yes - sfx_$(Platform).cab - C681D730-4505-42C6-9E6C-87F757C4FB32 - true - 5150;5151 - true - $(IntermediateOutputPath)fx\ - $(IntermediateOutputPath)fxExtractPath\ - true - $(DefineConstants);ProductNameFolder=$(ProductNameFolder) - $(DefineConstants);ProductNameShort=$(ProductNameShort) - $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) - $(SharedFrameworkNamespaceGuid) - 2.0 - $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec - - - - - $(WixExtDir)\WixDependencyExtension.dll - WixDependencyExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - - - - - - - - - - - true - CG_AspNetCoreSharedFramework - DOTNETHOME - var.AspNetCoreSharedFrameworkSource - - - - - - - $(ArtifactsShippingPackagesDir) - $(ArtifactsShippingPackagesDir) - $(ArtifactsShippingPackagesDir) - $(SharedFrameworkArm64HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-arm64.zip - $(SharedFrameworkX64HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-x64.zip - $(SharedFrameworkX86HarvestRootPath)aspnetcore-runtime-$(PackageVersion)-win-x86.zip - - - - - - - - - - - - - - - - - $(OutputName)$(TargetExt) - Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform)) - $(DefineConstants);ProductName=$(ProductName) - - - - - $(InstallersOutputPath)$(PackageFileName) - - - - - diff --git a/src/Installers/Windows/SharedFramework/Strings.wxl b/src/Installers/Windows/SharedFramework/Strings.wxl deleted file mode 100644 index ffac28752f89..000000000000 --- a/src/Installers/Windows/SharedFramework/Strings.wxl +++ /dev/null @@ -1,5 +0,0 @@ - - - ASP.NET Core Shared Framework - ASP.NET Core Shared Framework - \ No newline at end of file diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj index d363eea36be0..3a1ce17e7570 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj @@ -34,9 +34,7 @@ - - SharedFramework - {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True True @@ -69,7 +67,7 @@ $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) $(DefineConstants);BundleRegFamily=$(BundleRegFamily) $(DefineConstants);BundleRegName=$(BundleRegName) - $(DefineConstants);InstallersOutputPath=$(InstallersOutputPath) + $(DefineConstants);InstallersOutputPath=$(ArtifactsShippingPackagesDir) $(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi From c080f41e6aa45e43bba0449477e097ad184e9f91 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 16:17:54 -0800 Subject: [PATCH 03/11] Remove now-unused file --- .../Windows/Common/dotnethome_x64.wxs | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 src/Installers/Windows/Common/dotnethome_x64.wxs diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs deleted file mode 100644 index 74bd4cf5e7e3..000000000000 --- a/src/Installers/Windows/Common/dotnethome_x64.wxs +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - VersionNT64 OR - - WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)" - - - - - - - - NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME - - - - \ No newline at end of file From 0dd7ec14cf4dedee0f123f983df149dfa9924392 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 16:23:39 -0800 Subject: [PATCH 04/11] Adjust the conditions for adding the installer targets to work better with how the build is structured in CI. --- .../App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj | 5 +++-- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj index d7c28e6e4b55..9ef72c5f84e5 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj @@ -34,7 +34,8 @@ true - + + true true true true @@ -43,7 +44,7 @@ - + diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index cba7f2c89f07..aa693d790dea 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -44,7 +44,8 @@ true - + + true true true true @@ -57,7 +58,7 @@ - + From f963fc6a2aa91092e0ac6446a920d6b35cb3349b Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 16:26:42 -0800 Subject: [PATCH 05/11] Remove deleted wixprojs from Build.props and Installers.slnf. --- AspNetCore.sln | 13 ------------- eng/Build.props | 4 ---- src/Installers/Windows/Installers.slnf | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/AspNetCore.sln b/AspNetCore.sln index 15f59b598abc..aa07f583b0a5 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -1590,8 +1590,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModule-Setup", "A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFramework", "SharedFramework", "{31854B06-DC6B-4416-97C3-559CC390B8B4}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "src\Installers\Windows\SharedFramework\SharedFramework.wixproj", "{C681D730-4505-42C6-9E6C-87F757C4FB32}" -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}" @@ -9727,16 +9725,6 @@ Global {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.ActiveCfg = Release|Win32 {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Build.0 = Release|Win32 {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Deploy.0 = Release|Win32 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|Any CPU.ActiveCfg = Debug|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|arm64.ActiveCfg = Debug|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|arm64.Build.0 = Debug|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x64.ActiveCfg = Debug|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x86.ActiveCfg = Debug|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|Any CPU.ActiveCfg = Release|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|arm64.ActiveCfg = Release|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|arm64.Build.0 = Release|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x64.ActiveCfg = Release|arm64 - {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.ActiveCfg = Release|arm64 {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|Any CPU.ActiveCfg = Debug|arm64 {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.ActiveCfg = Debug|arm64 {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.Build.0 = Debug|arm64 @@ -11772,7 +11760,6 @@ Global {B54A8F61-60DE-4AD9-87CA-D102F230678E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} = {5E46DC83-C39C-4E3A-B242-C064607F4367} {31854B06-DC6B-4416-97C3-559CC390B8B4} = {5E46DC83-C39C-4E3A-B242-C064607F4367} - {C681D730-4505-42C6-9E6C-87F757C4FB32} = {31854B06-DC6B-4416-97C3-559CC390B8B4} {D6C54D8B-043F-4877-B751-60E7390F9EC6} = {31854B06-DC6B-4416-97C3-559CC390B8B4} {5244BC49-2568-4701-80A6-EAB8950AB5FA} = {31854B06-DC6B-4416-97C3-559CC390B8B4} {6F1B115C-1903-40CB-837D-7961AB610F4E} = {5E46DC83-C39C-4E3A-B242-C064607F4367} diff --git a/eng/Build.props b/eng/Build.props index 7f6cf2b3aabd..36a05e03e36f 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -245,9 +245,6 @@ - - - @@ -262,7 +259,6 @@ - diff --git a/src/Installers/Windows/Installers.slnf b/src/Installers/Windows/Installers.slnf index 55f11fa4d9cc..29423c038920 100644 --- a/src/Installers/Windows/Installers.slnf +++ b/src/Installers/Windows/Installers.slnf @@ -5,10 +5,8 @@ "src\\Installers\\Windows\\AspNetCoreModule-Setup\\CustomAction\\aspnetcoreCA.vcxproj", "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj", "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj", - "src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj", "src\\Installers\\Windows\\SharedFrameworkBundle\\SharedFrameworkBundle.wixproj", - "src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj", - "src\\Installers\\Windows\\SharedFramework\\SharedFramework.wixproj" + "src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj" ] } } From e93b53a40154dd44fc458bf10bc7491d19d87c7c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 18:24:40 -0800 Subject: [PATCH 06/11] Migrate the Shared Framework bundle to use the installer SDK (with arcade changes) --- AspNetCore.sln | 16 --- eng/Build.props | 8 +- .../aspnetcore-runtime-bundle.bundleproj | 46 ++++++++ .../App.Runtime/bundle/bundle.thm} | 0 .../App.Runtime/bundle/theme/1028/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1029/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1031/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1033/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1036/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1040/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1041/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1042/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1045/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1046/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1049/bundle.wxl} | 0 .../App.Runtime/bundle/theme/1055/bundle.wxl} | 0 .../App.Runtime/bundle/theme/2052/bundle.wxl} | 0 .../App.Runtime/bundle/theme/3082/bundle.wxl} | 0 src/Installers/Windows/Installers.slnf | 1 - .../Windows/SharedFrameworkBundle/Bundle.wxs | 104 ------------------ .../SharedFrameworkBundle/DotNetLogo.bmp | Bin 12342 -> 0 bytes .../SharedFrameworkBundle.wixproj | 74 ------------- 22 files changed, 47 insertions(+), 202 deletions(-) create mode 100644 src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj rename src/{Installers/Windows/SharedFrameworkBundle/thm.xml => Framework/App.Runtime/bundle/bundle.thm} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1028/thm.wxl => Framework/App.Runtime/bundle/theme/1028/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1029/thm.wxl => Framework/App.Runtime/bundle/theme/1029/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1031/thm.wxl => Framework/App.Runtime/bundle/theme/1031/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1033/thm.wxl => Framework/App.Runtime/bundle/theme/1033/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1036/thm.wxl => Framework/App.Runtime/bundle/theme/1036/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1040/thm.wxl => Framework/App.Runtime/bundle/theme/1040/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1041/thm.wxl => Framework/App.Runtime/bundle/theme/1041/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1042/thm.wxl => Framework/App.Runtime/bundle/theme/1042/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1045/thm.wxl => Framework/App.Runtime/bundle/theme/1045/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1046/thm.wxl => Framework/App.Runtime/bundle/theme/1046/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1049/thm.wxl => Framework/App.Runtime/bundle/theme/1049/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/1055/thm.wxl => Framework/App.Runtime/bundle/theme/1055/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/2052/thm.wxl => Framework/App.Runtime/bundle/theme/2052/bundle.wxl} (100%) rename src/{Installers/Windows/SharedFrameworkBundle/3082/thm.wxl => Framework/App.Runtime/bundle/theme/3082/bundle.wxl} (100%) delete mode 100644 src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs delete mode 100644 src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp delete mode 100644 src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj diff --git a/AspNetCore.sln b/AspNetCore.sln index aa07f583b0a5..1805c5617512 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -1588,10 +1588,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\Installers EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCoreModule-Setup", "AspNetCoreModule-Setup", "{D30A658D-61F6-444B-9AC7-F66A1A1B86B6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFramework", "SharedFramework", "{31854B06-DC6B-4416-97C3-559CC390B8B4}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "src\Installers\Windows\SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}" -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "src\Installers\Windows\WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "src\Servers\testassets\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}" @@ -9725,16 +9721,6 @@ Global {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.ActiveCfg = Release|Win32 {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Build.0 = Release|Win32 {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Deploy.0 = Release|Win32 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|Any CPU.ActiveCfg = Debug|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.ActiveCfg = Debug|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|arm64.Build.0 = Debug|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x64.ActiveCfg = Debug|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x86.ActiveCfg = Debug|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|Any CPU.ActiveCfg = Release|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.ActiveCfg = Release|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|arm64.Build.0 = Release|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x64.ActiveCfg = Release|arm64 - {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.ActiveCfg = Release|arm64 {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|Any CPU.ActiveCfg = Debug|arm64 {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.ActiveCfg = Debug|arm64 {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|arm64.Build.0 = Debug|arm64 @@ -11759,8 +11745,6 @@ Global {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} {B54A8F61-60DE-4AD9-87CA-D102F230678E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} = {5E46DC83-C39C-4E3A-B242-C064607F4367} - {31854B06-DC6B-4416-97C3-559CC390B8B4} = {5E46DC83-C39C-4E3A-B242-C064607F4367} - {D6C54D8B-043F-4877-B751-60E7390F9EC6} = {31854B06-DC6B-4416-97C3-559CC390B8B4} {5244BC49-2568-4701-80A6-EAB8950AB5FA} = {31854B06-DC6B-4416-97C3-559CC390B8B4} {6F1B115C-1903-40CB-837D-7961AB610F4E} = {5E46DC83-C39C-4E3A-B242-C064607F4367} {56DFE643-7F0F-40C8-9F7F-8EA5357781EF} = {3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643} diff --git a/eng/Build.props b/eng/Build.props index 36a05e03e36f..4723140a460d 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -120,6 +120,7 @@ $(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime.proj; $(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-runtime-composite.proj; $(RepoRoot)src\Framework\App.Runtime\src\aspnetcore-base-runtime.proj; + $(RepoRoot)src\Framework\App.Runtime\bundle\aspnetcore-runtime-bundle.bundleproj; $(RepoRoot)src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj; $(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj; $(RepoRoot)src\Assets\**\*.*proj; @@ -241,11 +242,6 @@ - - - - - @@ -257,8 +253,6 @@ - - diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj new file mode 100644 index 000000000000..e99dc0558d82 --- /dev/null +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -0,0 +1,46 @@ + + + + + $(DefaultNetCoreTargetFramework) + ASP.NET Core Shared Framework Bundle Installer + $(MSBuildProjectDirectory) + + aspnetcore-runtime + win-x86;win-x64;win-arm64 + $(TargetRuntimeIdentifier) + Microsoft ASP.NET Core + Runtime + + $(AspNetCoreMajorVersion) + $(AspNetCoreMinorVersion) + $(AspNetCorePatchVersion) + + true + HyperlinkLicense + + + + + + + + + + + + + + Microsoft ASP.NET Core $(PackageBrandingVersion) + Shared Framework + $(BundleNameShort) - $(BundleNameSub) ($(TargetArchitecture)) + $(BundleName) + + + + + + + + + diff --git a/src/Installers/Windows/SharedFrameworkBundle/thm.xml b/src/Framework/App.Runtime/bundle/bundle.thm similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/thm.xml rename to src/Framework/App.Runtime/bundle/bundle.thm diff --git a/src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1028/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1029/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1031/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1033/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1036/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1040/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1040/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1041/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1041/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1042/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1042/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1045/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1045/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1046/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1046/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1049/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1049/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/1055/thm.wxl b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/1055/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/2052/thm.wxl b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/2052/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl diff --git a/src/Installers/Windows/SharedFrameworkBundle/3082/thm.wxl b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl similarity index 100% rename from src/Installers/Windows/SharedFrameworkBundle/3082/thm.wxl rename to src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl diff --git a/src/Installers/Windows/Installers.slnf b/src/Installers/Windows/Installers.slnf index 29423c038920..db9ba3ac8eba 100644 --- a/src/Installers/Windows/Installers.slnf +++ b/src/Installers/Windows/Installers.slnf @@ -5,7 +5,6 @@ "src\\Installers\\Windows\\AspNetCoreModule-Setup\\CustomAction\\aspnetcoreCA.vcxproj", "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\iisca\\lib\\iisca.vcxproj", "src\\Installers\\Windows\\AspNetCoreModule-Setup\\IIS-Setup\\IIS-Common\\lib\\IISSetup.CommonLib.vcxproj", - "src\\Installers\\Windows\\SharedFrameworkBundle\\SharedFrameworkBundle.wixproj", "src\\Installers\\Windows\\WindowsHostingBundle\\WindowsHostingBundle.wixproj" ] } diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs deleted file mode 100644 index a685b4d50787..000000000000 --- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp b/src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp deleted file mode 100644 index 6299d4e8cd3632811705969c0253f7f6f0388c23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12342 zcmeI0e@qi+7{}S4W{a8GoPY>apkSHFmKa=&qF`GJ9HkJ`E%8U33(*ny*f2*D^SQE|e=chB8h&bzlz2_e-b@8!A6 z-SfWh^M3C8{jEz0^JMn1COngQpU(D_D8EZo5X<=5uo6FXvJgv=6ZQ~|00Re&l$ z6`%@G1*ig40jdC1fGR*0pbAh0UYP<0n}ALEk0RWo6yclj3W_KEhG+|qxK6l#1|A5N z#;}QIZjo6ED+l){TYL#dUSAaQ5MlLzg*BWWEW|L?JG8S-5Bb=dCz0p zBfSDNNht`F)pqvY?c{HE34Mxn2W|z#e&R}TUE&MK(z1R>x1r2;WD(__{k8EjmVrKjeMSWwQ(VgmobA0CN+-98P! z!RAje2CL6N(ZdlyL(b1?75=`8Z^3hA+i~vAEO!2C#kd7)BzQbCWjx@2GB*AQ_%mmN zA7TQS&Vu2w{*&^wle^-=Y~`ZSYscFD>d_(hRxd65MmL?wz~*KjP;ztiD7uthnb0wPuvS zlpdOb-?8JQIDeIpWL8YQ^Wbrb{`}$IUeVVc1i{5Gf8Z00+(P42{OoT{ZHF7$zy1ZA z_q+3+4?iJZA=>;&d2O3(0DhqNc1LUuEXD}@P>nbmZIyvE%_ba8enDqxPhrNMqkj={ zFW)4{BoX*qf4t-HvH}RGVj%*ROx>N4<^BAZf7f0w0%yCvXIQ$L_j7 zT#lGhpcnxkO@5Bq0jUMRkKDO0&76sEeFT1a|9@Tf&$hhsN5hYS-&?wem-B>|>i=5t zyBl2q-*@p(-vVjbVtBYl(BHB1d-1(&AvsSm5ob`42TnM-ImHGV;8_3~+M5`&*NNj)+_`T<@w0u$Ltf~*$fwRu_2gM|_*SfpqPy=>0 zZ9g$OHa><>%l@C7m8T`=fwQhnhlN>s1>nE!PKk%q~c zS~v+j4hZvkalSgM7t*a#lQ0wIoLopR3NO-laJ8Ay(pFRfssL4hDnJ#W3Qz^80#pI2 S09Al0Koy`0Pz7c~f&TzpGBKV2 diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj deleted file mode 100644 index 3a1ce17e7570..000000000000 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - AspNetCoreSharedFrameworkBundle - $(Name)-$(Platform) - true - Bundle - $(SharedFrameworkNamespaceGuid) - {D6C54D8B-043F-4877-B751-60E7390F9EC6} - 2.0 - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixDependencyExtension.dll - WixDependencyExtension - - - $(WixExtDir)\WixBalExtension.dll - WixBalExtension - - - - - - - - - - - - True - True - - - - - - - $(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt) - - Microsoft ASP.NET Core $(PackageBrandingVersion) - Shared Framework - $(BundleNameShort) - $(BundleNameSub) ($(Platform)) - $(BundleName) - $(BundleNameFull) - - Microsoft Corporation - dd_AspNetCoreSharedFramework_ - - - Microsoft - .NET - - $(DefineConstants);BundleNameShort=$(BundleNameShort) - $(DefineConstants);BundleName=$(BundleName) - $(DefineConstants);BundleNameFull=$(BundleNameFull) - $(DefineConstants);BundleNameSub=$(BundleNameSub) - $(DefineConstants);BundleManufacturer=$(BundleManufacturer) - $(DefineConstants);BundleLogPrefix=$(BundleLogPrefix) - $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) - $(DefineConstants);BundleRegFamily=$(BundleRegFamily) - $(DefineConstants);BundleRegName=$(BundleRegName) - $(DefineConstants);InstallersOutputPath=$(ArtifactsShippingPackagesDir) - $(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi - - - From f7d878b05bd31486a9611bcc3884a6c83f93ed97 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Dec 2024 20:15:29 -0800 Subject: [PATCH 07/11] Disable package validation --- .../App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index e99dc0558d82..65127ac0ad8e 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -3,9 +3,10 @@ $(DefaultNetCoreTargetFramework) + + false ASP.NET Core Shared Framework Bundle Installer $(MSBuildProjectDirectory) - aspnetcore-runtime win-x86;win-x64;win-arm64 $(TargetRuntimeIdentifier) From 673dffcf187e08afa3a4d992eca82ee8f8b78622 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 11 Dec 2024 14:20:48 -0800 Subject: [PATCH 08/11] The bundleproj isn't packable --- .../App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index 65127ac0ad8e..b1011b202c90 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -5,6 +5,7 @@ $(DefaultNetCoreTargetFramework) false + false ASP.NET Core Shared Framework Bundle Installer $(MSBuildProjectDirectory) aspnetcore-runtime From 728358da05a1ab13d85a0070bb266e204425d4a9 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 11 Dec 2024 15:21:04 -0800 Subject: [PATCH 09/11] Remove dead reference --- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 9c22d171a3d8..681fce50c54b 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -61,10 +61,6 @@ True true - HostOptions 20248cd1-c5aa-4f42-ad88-bc260d64deea From a3f460b74a30b610c2d98954152c5ae91fb71c9f Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 11 Dec 2024 16:58:21 -0800 Subject: [PATCH 10/11] Pass the full path to the sharedfx installers instead of just the file name --- .../Windows/WindowsHostingBundle/SharedFramework.wxs | 12 ++++++------ .../WindowsHostingBundle.wixproj | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs index 9523cd755f45..20c69668dccb 100644 --- a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -1,20 +1,20 @@ - + - - + - - - + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 681fce50c54b..01cf5bfa93cc 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -130,9 +130,9 @@ - - + From b2782b3f894430ff602fc92e0e2f35a130f87118 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 11 Dec 2024 20:59:38 -0800 Subject: [PATCH 11/11] We need to pass the name due to other reasons, pass what we need to construct the paths --- .../Windows/WindowsHostingBundle/SharedFramework.wxs | 6 +++--- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs index 20c69668dccb..d17bf0d524be 100644 --- a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -6,7 +6,7 @@ - - - $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) $(DefineConstants);BundleRegFamily=$(BundleRegFamily) $(DefineConstants);BundleRegName=$(BundleRegName) + $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePath) - - +