diff --git a/AspNetCore.sln b/AspNetCore.sln index 15f59b598abc..1805c5617512 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -1588,12 +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}") = "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}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerComparison.TestSites", "src\Servers\testassets\ServerComparison.TestSites\ServerComparison.TestSites.csproj", "{56DFE643-7F0F-40C8-9F7F-8EA5357781EF}" @@ -9727,26 +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 - {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 - {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 @@ -11771,9 +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} - {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} {56DFE643-7F0F-40C8-9F7F-8EA5357781EF} = {3CBC4802-E9B8-48B7-BC8C-B0AFB9EEC643} 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) - - - - - - - - - - - - - @@ -268,11 +253,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..9ef72c5f84e5 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) @@ -32,15 +34,17 @@ true - + + true true true true + true - + 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..b1011b202c90 --- /dev/null +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -0,0 +1,48 @@ + + + + + $(DefaultNetCoreTargetFramework) + + false + false + 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/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index ce65e1b25c2a..aa693d790dea 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -24,11 +24,13 @@ $(RuntimeInstallerBaseName) true Microsoft ASP.NET Core + AspNetCore.SharedFramework $(SharedFxDescription) $(SharedFxDescription) $(RepoRoot)LICENSE.txt $(AspNetCoreMajorVersion) $(AspNetCoreMinorVersion) + $(AspNetCorePatchVersion) $(MicrosoftNETCoreAppRefVersion) @@ -42,10 +44,12 @@ true - + + true true true true + true @@ -54,7 +58,7 @@ - + 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 diff --git a/src/Installers/Windows/Installers.slnf b/src/Installers/Windows/Installers.slnf index 55f11fa4d9cc..db9ba3ac8eba 100644 --- a/src/Installers/Windows/Installers.slnf +++ b/src/Installers/Windows/Installers.slnf @@ -5,10 +5,7 @@ "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" ] } } 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/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 6299d4e8cd36..000000000000 Binary files a/src/Installers/Windows/SharedFrameworkBundle/DotNetLogo.bmp and /dev/null differ diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj deleted file mode 100644 index d363eea36be0..000000000000 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ /dev/null @@ -1,76 +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 - - - - - - - - - - - - SharedFramework - {5244BC49-2568-4701-80A6-EAB8950AB5FA} - 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=$(InstallersOutputPath) - $(DefineConstants);SharedFxRedistInstaller=$(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform).msi - - - 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) - - - - - diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs index 9523cd755f45..d17bf0d524be 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 9c22d171a3d8..3389f389a75f 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 @@ -131,6 +127,7 @@ $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) $(DefineConstants);BundleRegFamily=$(BundleRegFamily) $(DefineConstants);BundleRegName=$(BundleRegName) + $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePath)