diff --git a/README.md b/README.md index b150e5d73..f0edd6ac3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ ![latest version](https://img.shields.io/nuget/vpre/wix) ![download count](https://img.shields.io/nuget/dt/wix) -![build status](https://img.shields.io/appveyor/build/wixtoolset/wix4) # WiX Toolset v4 diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 3d70c04c7..ab19de2c7 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -111,13 +111,15 @@ - + + + @@ -128,6 +130,8 @@ + + diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index 8d5739413..f3028d58d 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd @@ -22,7 +22,7 @@ msbuild -p:Configuration=%_C% -bl:%_L%\bal_build.binlog || exit /b dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b -msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl || exit /b +msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog || exit /b :: Test dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj index a63fd6713..2ae49e199 100644 --- a/src/internal/SetBuildNumber/SetBuildNumber.proj +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj @@ -14,10 +14,11 @@ - __SetPropertiesFromGit; + __SetPropertiesFromGit; SetAppVeyorBuildNumber; SetGlobalJson; SetDirectoryPackagesProps; + InstallSigningClient $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json)) @@ -88,6 +89,12 @@ + + + + diff --git a/src/version.txt b/src/version.txt index 140eb6755..7a6de69fc 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -4.0-preview.1-build.{height} +4.0-preview.1