diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-12-14 10:32:06 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-12-14 11:55:15 -0800 |
| commit | f4b14a91e11b3e83f265c24435fdf705b616b15a (patch) | |
| tree | d394745135aa075aa745665b3c8f734300cbdf65 | |
| parent | 72b024f33d9630432e8aad2bf8261051a0df1e41 (diff) | |
| download | wix-f4b14a91e11b3e83f265c24435fdf705b616b15a.tar.gz wix-f4b14a91e11b3e83f265c24435fdf705b616b15a.tar.bz2 wix-f4b14a91e11b3e83f265c24435fdf705b616b15a.zip | |
Configure VS with required components before building
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | src/vs_config.cmd | 11 | ||||
| -rw-r--r-- | src/wix.vsconfig | 6 |
3 files changed, 21 insertions, 0 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ac1bd9..93eef43b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -24,6 +24,10 @@ jobs: | |||
| 24 | - name: Checkout code | 24 | - name: Checkout code |
| 25 | uses: actions/checkout@v2 | 25 | uses: actions/checkout@v2 |
| 26 | 26 | ||
| 27 | - name: Confgure Visual Studio | ||
| 28 | shell: cmd | ||
| 29 | run: ./src/vs_config.cmd | ||
| 30 | |||
| 27 | - name: Build wix4 | 31 | - name: Build wix4 |
| 28 | shell: cmd | 32 | shell: cmd |
| 29 | run: ./src/build_official.cmd | 33 | run: ./src/build_official.cmd |
diff --git a/src/vs_config.cmd b/src/vs_config.cmd new file mode 100644 index 00000000..110426a9 --- /dev/null +++ b/src/vs_config.cmd | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | @echo off | ||
| 2 | setlocal enabledelayedexpansion | ||
| 3 | |||
| 4 | echo Configuring Visual Studio to build WiX Toolset... | ||
| 5 | |||
| 6 | for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do ( | ||
| 7 | echo Visual Studio installed at: "%%i" | ||
| 8 | "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify --config "%~dp0wix.vsconfig" --installPath "%%i" --quiet --norestart --force | ||
| 9 | echo Configuration complete, exit code: !errorlevel! | ||
| 10 | exit /b !errorlevel! | ||
| 11 | ) | ||
diff --git a/src/wix.vsconfig b/src/wix.vsconfig new file mode 100644 index 00000000..594d0243 --- /dev/null +++ b/src/wix.vsconfig | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | { | ||
| 2 | "version": "1.0", | ||
| 3 | "components": [ | ||
| 4 | "Microsoft.Net.Component.4.7.2.TargetingPack" | ||
| 5 | ] | ||
| 6 | } | ||
