diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index d958514aba..47e291d5b8 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -12,7 +12,9 @@ net461 $(BaseIntermediateOutputPath) $(MSBuildProjectDir)\obj\ - $(MSBuildExtensionsPath)\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets + + $(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets + $(MSBuildToolsPath)\NuGet.targets diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 4b07606e19..3cdb0c3b86 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -17,11 +17,6 @@ - - - - - yes $(OutputName.Replace('-', '_')).cab diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj index 8aac844ad9..a713211f99 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj @@ -4,42 +4,15 @@ AspNetCoreModuleIISExpress + true 2A6A4709-30D2-4716-A597-55DF0FB74D37 Package + ancm_iis_express_$(Platform)_en ICE03 true + 2.0 - - ancm_iis_express_x86_en - - - ancm_iis_express_x64_en - - - True - - - - - iisca.wxs - - - - - - - - - - This project is trying to import a missing file: {0}. - - - - - - - $(WixExtDir)\WixUtilExtension.dll @@ -56,17 +29,28 @@ + + iisca.wxs + + setupstrings.wxl - - include.wxi - - - - \ No newline at end of file + + + aspnetcoreCA + {7c27e72f-54d0-4820-8cfa-5e4be640974b} + True + True + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs index 00a8af36cf..4ffaaa5e94 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs @@ -667,7 +667,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index d66768321d..73052d4ae5 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -4,46 +4,15 @@ AspNetCoreModuleV2IISExpress + true 17c76489-4c09-4e14-b81c-7a86cd937144 Package + ancm_iis_express_$(Platform)_en_v2 ICE03 true + 2.0 - - ancm_iis_express_x86_en_v2 - - - ancm_iis_express_x64_en_v2 - - - - True - - - - - - iisca.wxs - - - - - - - - - - - This project is trying to import a missing file: {0}. - - - - - - - - $(WixExtDir)\WixUtilExtension.dll @@ -60,17 +29,28 @@ + + + iisca.wxs + setupstrings.wxl - - include.wxi - - - - \ No newline at end of file + + + aspnetcoreCA + {7c27e72f-54d0-4820-8cfa-5e4be640974b} + True + True + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 12a2c887b8..62c90523f3 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -697,7 +697,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj index c1f389495c..e9b0e79a40 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/AncmV1.wixproj @@ -4,44 +4,14 @@ AspNetCoreModule + true D36FDC38-FE53-48CC-BC82-A17C28F1CEE1 true Package + aspnetcoremodule_$(Platform)_en true - - aspnetcoremodule_x86_en - - - aspnetcoremodule_x64_en - - - - True - - - - - iisca.wxs - - - - - - - - - - - This project is trying to import a missing file: {0}. - - - - - - - $(WixExtDir)\WixUtilExtension.dll @@ -58,17 +28,28 @@ + + iisca.wxs + + setupstrings.wxl - - include.wxi - - - - \ No newline at end of file + + + aspnetcoreCA + {7c27e72f-54d0-4820-8cfa-5e4be640974b} + True + True + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs index 709870385e..e589ae342c 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs @@ -273,7 +273,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 1969ce723c..567462fb6e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -4,44 +4,15 @@ AspNetCoreModuleV2 + true f9bacb48-3bd7-4ec2-ae31-664e8703ec12 Package + aspnetcoremodule_$(Platform)_en_v2 true + 2.0 true - - aspnetcoremodule_x86_en_v2 - - - aspnetcoremodule_x64_en_v2 - - - - True - - - - - iisca.wxs - - - - - - - - - - - This project is trying to import a missing file: {0}. - - - - - - - $(WixExtDir)\WixUtilExtension.dll @@ -58,17 +29,28 @@ + + + iisca.wxs + setupstrings.wxl - - include.wxi - - - - \ No newline at end of file + + + aspnetcoreCA + {7c27e72f-54d0-4820-8cfa-5e4be640974b} + True + True + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 271652c2e6..de647f5237 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -307,7 +307,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index d4b2493fb9..61a0f41275 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -55,6 +55,7 @@ true $(AdditionalIncludeDirectories) + true httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;Version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -82,10 +83,9 @@ {b54a8f61-60de-4ad9-87ca-d102f230678e} - + - This project is trying to import a missing file: {0}. @@ -95,4 +95,4 @@ - \ No newline at end of file + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props index 4892060bb8..4b9d69aa1d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props @@ -21,14 +21,13 @@ The actual handler folder version is dependent on the ANCMMsiVersion --> 2.0.0 - + $(RepositoryRoot)src\Installers\Windows\AspNetCoreModule-Setup\ $(AspNetCoreSetupRoot)IIS-Setup\ $(IIS-Setup)IIS-Common\ $(AspNetCoreSetupRoot)build\ - CustomAction=$(AspNetCoreSetupRoot)CustomAction\bin\$(Configuration)\$(Platform)\aspnetcoreca.dll $(RepositoryRoot).deps\ANCM\Microsoft.AspNetCore.AspNetCoreModule\$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)\ $(RepositoryRoot).deps\ANCM\Microsoft.AspNetCore.AspNetCoreModuleV2\$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)\ $(PreBuiltANCMSchema)contentFiles\any\any\ @@ -37,7 +36,7 @@ BLDVERMAJOR=$(BLDVERMAJOR);BLDVERMINOR=$(BLDVERMINOR);BLDNUMMAJOR=$(BLDNUMMAJOR);BLDNUMMINOR=$(BLDNUMMINOR);$(DefineConstants) ANCMMsiVersion=$(ANCMMsiVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants) PreBuiltANCMRoot=$(PreBuiltANCMRoot);PreBuiltANCMV2Root=$(PreBuiltANCMV2Root);$(DefineConstants) - $(CustomActionVariable);PreBuiltANCMSchema=$(PreBuiltANCMSchema);PreBuiltANCMV2Schema=$(PreBuiltANCMV2Schema);$(DefineConstants) + PreBuiltANCMSchema=$(PreBuiltANCMSchema);PreBuiltANCMV2Schema=$(PreBuiltANCMV2Schema);$(DefineConstants) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj index 908ef42d1a..3eaa339620 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj @@ -46,6 +46,7 @@ true precomp.h _LIB;%(PreprocessorDefinitions) + true Windows @@ -76,4 +77,4 @@ - \ No newline at end of file + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/packages.config b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/packages.config deleted file mode 100644 index 21d9344493..0000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index aced7ff216..b1b76b9b08 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -87,6 +87,7 @@ $(WIX)sdk\$(WixPlatformToolset)\inc;$(AdditionalIncludeDirectories) Level4 + true nothrownew.obj;httpapi.lib;shlwapi.lib;ahadmin.lib;xmllite.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;%(AdditionalDependencies) @@ -128,4 +129,4 @@ - \ No newline at end of file + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/packages.config b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/packages.config deleted file mode 100644 index 21d9344493..0000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/Installers/Windows/Directory.Build.props b/src/Installers/Windows/Directory.Build.props index af15a651bd..6a33e27c7d 100644 --- a/src/Installers/Windows/Directory.Build.props +++ b/src/Installers/Windows/Directory.Build.props @@ -2,12 +2,12 @@ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)..\..\..\')) - $(RepositoryRoot)artifacts/ - $(RootOutputPath)bin/$(Configuration)/$(MSBuildProjectName)/ + $(RepositoryRoot)artifacts\$(Configuration)\installers\ + $(RepositoryRoot)bin\$(Configuration)\$(MSBuildProjectName)\ $(BaseOutputPath) - $(RootOutputPath)obj/$(MSBuildProjectName)/ - $(BaseIntermediateOutputPath)$(Configuration)/ - $(IntermediateOutputPath)$(Platform)/ + $(RepositoryRoot)obj\$(MSBuildProjectName)\ + $(BaseIntermediateOutputPath)$(Configuration)\ + $(IntermediateOutputPath)$(Platform)\ diff --git a/src/Installers/Windows/tasks/GenerateGuid.cs b/src/Installers/Windows/InstallerTasks/GenerateGuid.cs similarity index 100% rename from src/Installers/Windows/tasks/GenerateGuid.cs rename to src/Installers/Windows/InstallerTasks/GenerateGuid.cs diff --git a/src/Installers/Windows/tasks/GetMsiProperty.cs b/src/Installers/Windows/InstallerTasks/GetMsiProperty.cs similarity index 100% rename from src/Installers/Windows/tasks/GetMsiProperty.cs rename to src/Installers/Windows/InstallerTasks/GetMsiProperty.cs diff --git a/src/Installers/Windows/tasks/InstallerTasks.csproj b/src/Installers/Windows/InstallerTasks/InstallerTasks.csproj similarity index 100% rename from src/Installers/Windows/tasks/InstallerTasks.csproj rename to src/Installers/Windows/InstallerTasks/InstallerTasks.csproj diff --git a/src/Installers/Windows/tasks/Uuid.cs b/src/Installers/Windows/InstallerTasks/Uuid.cs similarity index 100% rename from src/Installers/Windows/tasks/Uuid.cs rename to src/Installers/Windows/InstallerTasks/Uuid.cs diff --git a/src/Installers/Windows/Installers.sln b/src/Installers/Windows/Installers.sln new file mode 100644 index 0000000000..0572e5d0ee --- /dev/null +++ b/src/Installers/Windows/Installers.sln @@ -0,0 +1,153 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iisca", "AspNetCoreModule-Setup\IIS-Setup\iisca\lib\iisca.vcxproj", "{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "AspNetCoreModule-Setup\IIS-Setup\IIS-Common\lib\CommonLib.vcxproj", "{B54A8F61-60DE-4AD9-87CA-D102F230678E}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AncmIISExpressV1", "AspNetCoreModule-Setup\ANCMIISExpressV1\AncmIISExpressV1.wixproj", "{2A6A4709-30D2-4716-A597-55DF0FB74D37}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AncmIISExpressV2", "AspNetCoreModule-Setup\ANCMIISExpressV2\AncmIISExpressV2.wixproj", "{17C76489-4C09-4E14-B81C-7A86CD937144}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkLib", "SharedFrameworkLib\SharedFrameworkLib.wixproj", "{5244BC49-2568-4701-80A6-EAB8950AB5FA}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFrameworkBundle", "SharedFrameworkBundle\SharedFrameworkBundle.wixproj", "{D6C54D8B-043F-4877-B751-60E7390F9EC6}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AncmV1", "AspNetCoreModule-Setup\ANCMV1\AncmV1.wixproj", "{D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "AncmV2", "AspNetCoreModule-Setup\ANCMV2\AncmV2.wixproj", "{F9BACB48-3BD7-4EC2-AE31-664E8703EC12}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WindowsHostingBundle", "WindowsHostingBundle\WindowsHostingBundle.wixproj", "{6F1B115C-1903-40CB-837D-7961AB610F4E}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SharedFramework", "SharedFramework\SharedFramework.wixproj", "{C681D730-4505-42C6-9E6C-87F757C4FB32}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallerTasks", "InstallerTasks\InstallerTasks.csproj", "{D58277B2-4C1F-46D6-B9E1-845C711E3B55}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x64.ActiveCfg = Debug|x64 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x64.Build.0 = Debug|x64 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x86.ActiveCfg = Debug|Win32 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x86.Build.0 = Debug|Win32 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|Any CPU.ActiveCfg = Release|Win32 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x64.ActiveCfg = Release|x64 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x64.Build.0 = Release|x64 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x86.ActiveCfg = Release|Win32 + {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Release|x86.Build.0 = Release|Win32 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x64.ActiveCfg = Debug|x64 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x64.Build.0 = Debug|x64 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.ActiveCfg = Debug|Win32 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Debug|x86.Build.0 = Debug|Win32 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|Any CPU.ActiveCfg = Release|Win32 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x64.ActiveCfg = Release|x64 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x64.Build.0 = Release|x64 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x86.ActiveCfg = Release|Win32 + {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E}.Release|x86.Build.0 = Release|Win32 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x64.ActiveCfg = Debug|x64 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x64.Build.0 = Debug|x64 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.ActiveCfg = Debug|Win32 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Debug|x86.Build.0 = Debug|Win32 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|Any CPU.ActiveCfg = Release|Win32 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x64.ActiveCfg = Release|x64 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x64.Build.0 = Release|x64 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.ActiveCfg = Release|Win32 + {B54A8F61-60DE-4AD9-87CA-D102F230678E}.Release|x86.Build.0 = Release|Win32 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Debug|Any CPU.ActiveCfg = Debug|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Debug|x64.ActiveCfg = Debug|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Debug|x64.Build.0 = Debug|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Debug|x86.ActiveCfg = Debug|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Release|Any CPU.ActiveCfg = Release|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Release|x64.ActiveCfg = Release|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Release|x64.Build.0 = Release|x64 + {2A6A4709-30D2-4716-A597-55DF0FB74D37}.Release|x86.ActiveCfg = Release|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Debug|Any CPU.ActiveCfg = Debug|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Debug|x64.ActiveCfg = Debug|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Debug|x64.Build.0 = Debug|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Debug|x86.ActiveCfg = Debug|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Release|Any CPU.ActiveCfg = Release|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Release|x64.ActiveCfg = Release|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Release|x64.Build.0 = Release|x64 + {17C76489-4C09-4E14-B81C-7A86CD937144}.Release|x86.ActiveCfg = Release|x64 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|Any CPU.ActiveCfg = Debug|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x64.ActiveCfg = Debug|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x86.ActiveCfg = Debug|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Debug|x86.Build.0 = Debug|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|Any CPU.ActiveCfg = Release|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x64.ActiveCfg = Release|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x86.ActiveCfg = Release|x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA}.Release|x86.Build.0 = Release|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|Any CPU.ActiveCfg = Debug|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x64.ActiveCfg = Debug|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x86.ActiveCfg = Debug|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Debug|x86.Build.0 = Debug|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|Any CPU.ActiveCfg = Release|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x64.ActiveCfg = Release|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.ActiveCfg = Release|x86 + {D6C54D8B-043F-4877-B751-60E7390F9EC6}.Release|x86.Build.0 = Release|x86 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Debug|x64.ActiveCfg = Debug|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Debug|x64.Build.0 = Debug|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Debug|x86.ActiveCfg = Debug|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Release|Any CPU.ActiveCfg = Release|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Release|x64.ActiveCfg = Release|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Release|x64.Build.0 = Release|x64 + {D36FDC38-FE53-48CC-BC82-A17C28F1CEE1}.Release|x86.ActiveCfg = Release|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Debug|Any CPU.ActiveCfg = Debug|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Debug|x64.ActiveCfg = Debug|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Debug|x64.Build.0 = Debug|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Debug|x86.ActiveCfg = Debug|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Release|Any CPU.ActiveCfg = Release|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Release|x64.ActiveCfg = Release|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Release|x64.Build.0 = Release|x64 + {F9BACB48-3BD7-4EC2-AE31-664E8703EC12}.Release|x86.ActiveCfg = Release|x64 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|x64.ActiveCfg = Debug|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|x86.ActiveCfg = Debug|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Debug|x86.Build.0 = Debug|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|Any CPU.ActiveCfg = Release|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|x64.ActiveCfg = Release|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|x86.ActiveCfg = Release|x86 + {6F1B115C-1903-40CB-837D-7961AB610F4E}.Release|x86.Build.0 = Release|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|Any CPU.ActiveCfg = Debug|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x64.ActiveCfg = Debug|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x86.ActiveCfg = Debug|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Debug|x86.Build.0 = Debug|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|Any CPU.ActiveCfg = Release|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x64.ActiveCfg = Release|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.ActiveCfg = Release|x86 + {C681D730-4505-42C6-9E6C-87F757C4FB32}.Release|x86.Build.0 = Release|x86 + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x64.ActiveCfg = Debug|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x64.Build.0 = Debug|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x86.ActiveCfg = Debug|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Debug|x86.Build.0 = Debug|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|Any CPU.Build.0 = Release|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x64.ActiveCfg = Release|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x64.Build.0 = Release|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x86.ActiveCfg = Release|Any CPU + {D58277B2-4C1F-46D6-B9E1-845C711E3B55}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {920E3EE3-D833-457D-A5E3-05BE349FC3DF} + EndGlobalSection +EndGlobal diff --git a/src/Installers/Windows/README.md b/src/Installers/Windows/README.md new file mode 100644 index 0000000000..aaa290afd3 --- /dev/null +++ b/src/Installers/Windows/README.md @@ -0,0 +1,6 @@ +Windows Installers +================== + +Windows Installers are built using the WiX toolset. See http://wixtoolset.org/ for documentation. + +To open .wixproj files in Visual Studio, download and install the WiX Toolset extension from http://wixtoolset.org/releases/. diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index e2689d09d5..0d351e6702 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -17,6 +17,7 @@ $(SharedFrameworkHarvestRootPath)\$(Platform)\ $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) $(SharedFrameworkNamespaceGuid) + 2.0 @@ -39,6 +40,12 @@ + + + + + + true CG_AspNetCoreSharedFramework diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj index e4d3697989..22cd8287bc 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj @@ -6,10 +6,12 @@ AspNetCoreSharedFrameworkBundle + true Bundle $(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform) $(SharedFrameworkNamespaceGuid) - D6C54D8B-043F-4877-B751-60E7390F9EC6 + {D6C54D8B-043F-4877-B751-60E7390F9EC6} + 2.0 @@ -24,12 +26,24 @@ + + - - + + SharedFrameworkLib + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + True + + + SharedFrameworkLib + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + True + diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs index 707e6238ad..b2b7cadcf1 100644 --- a/src/Installers/Windows/SharedFrameworkLib/Library.wxs +++ b/src/Installers/Windows/SharedFrameworkLib/Library.wxs @@ -18,16 +18,14 @@ - - - + diff --git a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj index 40fd51c943..e08fb8c29d 100644 --- a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj +++ b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj @@ -6,23 +6,34 @@ AspNetCoreSharedFrameworkLib$(Platform) $(InternalInstallerBaseName)-$(PackageVersion)-win-$(Platform) + + true Library true $(SharedFrameworkNamespaceGuid) - 5244BC49-2568-4701-80A6-EAB8950AB5FA - - - - $(DefineConstants);Debug + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + 2.0 - $(WixExtDir)\WixBalExtension.dll WixBalExtension + + + + + + + {C681D730-4505-42C6-9E6C-87F757C4FB32} + SharedFramework + True + true + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs index dd47afe26c..ce100ee0c0 100644 --- a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs @@ -4,29 +4,29 @@ - - - - - - - - + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 70d2362433..1d926453e6 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -8,17 +8,17 @@ WindowsServerHostingBundle dotnet-hosting-$(PackageVersion)-win + true 6F1B115C-1903-40CB-837D-7961AB610F4E Bundle x86 + 2.0 $(HostingBundleNamespaceGuid) - - $(WixExtDir)\WixUtilExtension.dll WixUtilExtension @@ -35,6 +35,55 @@ + + + + + + + + + Platform=x86 + AspNetCoreModule_x86 + D36FDC38-FE53-48CC-BC82-A17C28F1CEE1 + True + true + + + Platform=x64 + AspNetCoreModule_x64 + D36FDC38-FE53-48CC-BC82-A17C28F1CEE1 + True + true + + + Platform=x86 + AspNetCoreModuleV2_x86 + f9bacb48-3bd7-4ec2-ae31-664e8703ec12 + True + true + + + Platform=x64 + AspNetCoreModuleV2_x64 + f9bacb48-3bd7-4ec2-ae31-664e8703ec12 + True + true + + + Platform=x86 + SharedFrameworkLib_x86 + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + true + + + Platform=x64 + SharedFrameworkLib_x64 + {5244BC49-2568-4701-80A6-EAB8950AB5FA} + True + true + diff --git a/src/Installers/Windows/WindowsInstallers.proj b/src/Installers/Windows/WindowsInstallers.proj index f8b8135b27..5337f23dba 100644 --- a/src/Installers/Windows/WindowsInstallers.proj +++ b/src/Installers/Windows/WindowsInstallers.proj @@ -15,15 +15,22 @@ - + - + + + + + + - + @@ -32,7 +39,7 @@ - + diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index f2737edad2..a88784006a 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -6,8 +6,6 @@ x64 ENU en-US - $(RootOutputPath)bin/$(Configuration)/installers/ - $(BaseOutputPath) diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 8abf268608..d4504f10c3 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -40,4 +40,10 @@ + + + + diff --git a/src/Installers/Windows/build.ps1 b/src/Installers/Windows/build.ps1 index c1fbff4043..5b64363f40 100644 --- a/src/Installers/Windows/build.ps1 +++ b/src/Installers/Windows/build.ps1 @@ -41,7 +41,7 @@ if (-not (Test-Path "$harvestRoot/x64/shared/")) { Push-Location $PSScriptRoot try { Invoke-Block { & $msbuild ` - tasks/InstallerTasks.csproj ` + InstallerTasks/InstallerTasks.csproj ` -nologo ` -m ` -v:m `