From 4ca1a77e321c48078a0060ac116db4e755dff417 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 19 Oct 2021 19:30:02 -0700
Subject: Import vsdevcmd environment variables if missing during build

---
 .github/workflows/build.yml | 14 +++++---------
 src/build_all.cmd           | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8246f03..e1ac1bd9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,17 +24,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
-
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.3
-
       - name: Build wix4
         shell: cmd
-        run: ./build.cmd
+        run: ./src/build_official.cmd
+        env:
+          RuntimeTestsEnabled: ${{ github.ref == 'refs/heads/master' }}
+          SigningUser:  ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_USER || '' }}
+          SigningSecret:  ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }}
 
       - name: Save build
         uses: actions/upload-artifact@v2
diff --git a/src/build_all.cmd b/src/build_all.cmd
index 7c62be74..8f7e7514 100644
--- a/src/build_all.cmd
+++ b/src/build_all.cmd
@@ -6,6 +6,8 @@
 @if /i "%1"=="release" set _C=Release
 @if not "%1"=="" shift & goto parse_args
 
+@if "%VCToolsVersion%"=="" call :StartDeveloperCommandPrompt
+
 @echo build %_C%
 
 :: Initialize required files/folders
@@ -56,5 +58,19 @@ call ext\ext.cmd %_C% || exit /b
 
 call test\test.cmd %_C% || exit /b
 
+goto LExit
+
+:StartDeveloperCommandPrompt
+echo Initializing developer command prompt
+for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do (
+  if exist "%%i\Common7\Tools\vsdevcmd.bat" (
+    call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo
+    exit /b
+  )
+)
+
+exit /b 2
+
+:LExit
 @popd
 @endlocal
-- 
cgit v1.2.3-55-g6feb