From 67274acee7b9b4d989cf354f7cc3f1665d12b80c Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 7 Mar 2022 17:36:17 -0600
Subject: Configure crash dumps and get them and pdbs in the logs artifact

---
 .github/workflows/build.yml | 12 ++++++++++++
 appveyor.yml                |  7 ++++++-
 src/Directory.Build.props   |  2 +-
 src/build_init.cmd          |  1 +
 src/test/burn/test_burn.cmd |  3 ---
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index de2d426f..f7385584 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,18 @@ jobs:
       #   shell: cmd
       #   run: ./src/vs_config.cmd
 
+      - name: Configure automated logging and crash dumps
+        shell: cmd
+        run: |
+          reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
+          reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
+          reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_EXPAND_SZ /v DumpFolder /d "%CD%\build\logs\crashdumps" /f
+          reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
+          reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1 /f
+          reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_EXPAND_SZ /v DumpFolder /d "%CD%\build\logs\crashdumps" /f
+          reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
+          reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1
+
       - name: Build wix4
         shell: cmd
         run: ./src/build_official.cmd
diff --git a/appveyor.yml b/appveyor.yml
index c8446afd..9ff158b4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,6 @@
 
 branches:
   only:
-    - master
     - develop
 
 image: Visual Studio 2022
@@ -23,6 +22,12 @@ environment:
 install:
   - reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
   - reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
+  - reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_EXPAND_SZ /v DumpFolder /d "%CD%\build\logs\crashdumps" /f
+  - reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
+  - reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1 /f
+  - reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_EXPAND_SZ /v DumpFolder /d "%CD%\build\logs\crashdumps" /f
+  - reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
+  - reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1
 
 build_script:
   - src\build_official.cmd
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 36a8c7bd..90de177c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -11,7 +11,7 @@
     <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder>
     <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder>
-    <PdbsFolder>$(RootBuildFolder)pdbs\$(Configuration)\</PdbsFolder>
+    <PdbsFolder>$(RootBuildFolder)logs\pdbs\$(Configuration)\</PdbsFolder>
     <ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder>
     <ToolsFolder>$(RootBuildFolder).tools</ToolsFolder>
     <PackageOutputPath>$(ArtifactsFolder)</PackageOutputPath>
diff --git a/src/build_init.cmd b/src/build_init.cmd
index 980dc327..c9c27c57 100644
--- a/src/build_init.cmd
+++ b/src/build_init.cmd
@@ -2,6 +2,7 @@
 @pushd %~dp0
 
 md ..\build\artifacts
+md ..\build\logs\crashdumps
 md ..\build\logs\TestResults
 
 msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index f8153a2e..83401614 100644
--- a/src/test/burn/test_burn.cmd
+++ b/src/test/burn/test_burn.cmd
@@ -16,9 +16,6 @@ msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_
 
 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
 
-reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
-reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
-
 dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.BurnE2E.trx" || exit /b
 
 :LExit
-- 
cgit v1.2.3-55-g6feb