From 3b870b5493458ec6b2febc7dd7a154688a36152f Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 6 Aug 2022 15:38:36 -0700 Subject: Create setup segment and WixAdditionalTools bundle The setup segment is scheduled after building the shipping WiX files to use and include the current build's tooling. The WixAdditionalTools bundle currently only contains the ThmViewer package but may include additional tools in the future. At this time, the primary purpose is to produce a shipping MSI and bundle from the WiX v4 build process and dogfood the rest of the tooling. Closes 4919 --- src/setup/Directory.Build.props | 14 +++++++ .../ThmViewerPackage/ThmViewerPackage.wixproj | 11 ++++++ src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 31 ++++++++++++++++ .../WixAdditionalTools/WixAdditionalTools.wixproj | 17 +++++++++ .../WixAdditionalTools/WixAdditionalTools.wxl | 12 ++++++ .../WixAdditionalTools/WixAdditionalTools.wxs | 27 ++++++++++++++ src/setup/WixAdditionalTools/wix-logo-sq.png | Bin 0 -> 1810 bytes src/setup/setup.cmd | 41 +++++++++++++++++++++ src/setup/setup.sln | 28 ++++++++++++++ 9 files changed, 181 insertions(+) create mode 100644 src/setup/Directory.Build.props create mode 100644 src/setup/ThmViewerPackage/ThmViewerPackage.wixproj create mode 100644 src/setup/ThmViewerPackage/ThmViewerPackage.wxs create mode 100644 src/setup/WixAdditionalTools/WixAdditionalTools.wixproj create mode 100644 src/setup/WixAdditionalTools/WixAdditionalTools.wxl create mode 100644 src/setup/WixAdditionalTools/WixAdditionalTools.wxs create mode 100644 src/setup/WixAdditionalTools/wix-logo-sq.png create mode 100644 src/setup/setup.cmd create mode 100644 src/setup/setup.sln (limited to 'src/setup') diff --git a/src/setup/Directory.Build.props b/src/setup/Directory.Build.props new file mode 100644 index 00000000..cbf8ecc9 --- /dev/null +++ b/src/setup/Directory.Build.props @@ -0,0 +1,14 @@ + + + + + + setup + + + + + + $(OutputPath)publish\ + + diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj b/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj new file mode 100644 index 00000000..57aeac95 --- /dev/null +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs new file mode 100644 index 00000000..ff33ae7e --- /dev/null +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj new file mode 100644 index 00000000..2d2347b3 --- /dev/null +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj @@ -0,0 +1,17 @@ + + + + Bundle + $(PackageOutputPath) + + + + + + + + + + + + diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl new file mode 100644 index 00000000..ca3183ab --- /dev/null +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl @@ -0,0 +1,12 @@ + + + + .NET Foundation + Copyright (c) .NET Foundation and contributors. All rights reserved. + WiX Toolset Additional Tools + wixtoolset.org + https://wixtoolset.org/ + https://wixtoolset.org/about/license/ + https://wixtoolset.org/documentation/ + https://wixtoolset.org/releases/feed/v$(SetupMajorMinorVersion) + diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs new file mode 100644 index 00000000..a53db9d3 --- /dev/null +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/setup/WixAdditionalTools/wix-logo-sq.png b/src/setup/WixAdditionalTools/wix-logo-sq.png new file mode 100644 index 00000000..373fc718 Binary files /dev/null and b/src/setup/WixAdditionalTools/wix-logo-sq.png differ diff --git a/src/setup/setup.cmd b/src/setup/setup.cmd new file mode 100644 index 00000000..8096792b --- /dev/null +++ b/src/setup/setup.cmd @@ -0,0 +1,41 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +@set _L=%~dp0..\..\build\logs + +:parse_args +@if /i "%1"=="release" set _C=Release +@if /i "%1"=="inc" set _INCREMENTAL=1 +@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 +@if not "%1"=="" shift & goto parse_args + +:: Clean +@if NOT "%_INCREMENTAL%"=="" call :clean +@if NOT "%_CLEAN%"=="" goto :end + +@echo Building setup %_C% + +:: Build +msbuild -Restore setup.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\setup_build.binlog || exit /b + +:: Publish + + +:: Test + + +:: Pack + + +@goto :end + +:clean +@rd /s/q "..\..\build\setup" 2> nul +@del "..\..\build\artifacts\WixAdditionalTools.*" 2> nul +@del "..\..\build\logs\pdbs\%_C%\WixAdditionalTools.*" 2> nul +@exit /b + +:end +@popd +@endlocal diff --git a/src/setup/setup.sln b/src/setup/setup.sln new file mode 100644 index 00000000..3998623e --- /dev/null +++ b/src/setup/setup.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "ThmViewerPackage", "ThmViewerPackage\ThmViewerPackage.wixproj", "{F8C12838-DEC5-4CA5-97A8-DFE2247564C5}" +EndProject +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WixAdditionalTools", "WixAdditionalTools\WixAdditionalTools.wixproj", "{59FF3AD3-339A-4048-9F0B-504EE74BC4AF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Release|Any CPU.Build.0 = Release|Any CPU + {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal -- cgit v1.2.3-55-g6feb