aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Directory.Build.props2
-rw-r--r--src/build_init.cmd1
-rw-r--r--src/test/burn/test_burn.cmd3
3 files changed, 2 insertions, 4 deletions
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 @@
11 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> 11 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
12 <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder> 12 <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder>
13 <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder> 13 <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder>
14 <PdbsFolder>$(RootBuildFolder)pdbs\$(Configuration)\</PdbsFolder> 14 <PdbsFolder>$(RootBuildFolder)logs\pdbs\$(Configuration)\</PdbsFolder>
15 <ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder> 15 <ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder>
16 <ToolsFolder>$(RootBuildFolder).tools</ToolsFolder> 16 <ToolsFolder>$(RootBuildFolder).tools</ToolsFolder>
17 <PackageOutputPath>$(ArtifactsFolder)</PackageOutputPath> 17 <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 @@
2@pushd %~dp0 2@pushd %~dp0
3 3
4md ..\build\artifacts 4md ..\build\artifacts
5md ..\build\logs\crashdumps
5md ..\build\logs\TestResults 6md ..\build\logs\TestResults
6 7
7msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo 8msbuild -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:%_
16 16
17@if not "%RuntimeTestsEnabled%"=="true" goto :LExit 17@if not "%RuntimeTestsEnabled%"=="true" goto :LExit
18 18
19reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
20reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f
21
22dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.BurnE2E.trx" || exit /b 19dotnet test -c %_C% --no-build WixToolsetTest.BurnE2E -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.BurnE2E.trx" || exit /b
23 20
24:LExit 21:LExit