From 7a4632adc0c7b1a363259abb4ed08b11ee3b2d87 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 11 Nov 2022 07:40:01 -0800
Subject: WiX Toolset v4-preview.1

---
 src/Directory.Build.targets                     | 6 +++++-
 src/ext/Bal/bal.cmd                             | 2 +-
 src/internal/SetBuildNumber/SetBuildNumber.proj | 9 ++++++++-
 src/version.txt                                 | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 3d70c04c..ab19de2c 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -111,13 +111,15 @@
 
     <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' />
 
-    <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' />
+    <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' IgnoreExitCode='true' />
   </Target>
 
   <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild"
           Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and 
                       ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))">
 
+    <Message Importance="high" Text="Signing file: $(TargetPath) using configuration from: $(SigningConfiguration)" />
+
     <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
           WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
   </Target>
@@ -128,6 +130,8 @@
       <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " />
     </ItemGroup>
 
+    <Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->&apos;%(Identity)&apos;) using configuration from: $(SigningConfiguration)" />
+
     <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
           WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
   </Target>
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index 8d573941..f3028d58 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 a63fd671..2ae49e19 100644
--- a/src/internal/SetBuildNumber/SetBuildNumber.proj
+++ b/src/internal/SetBuildNumber/SetBuildNumber.proj
@@ -14,10 +14,11 @@
 
   <PropertyGroup>
     <SetBuildNumbersDependsOn>
-    __SetPropertiesFromGit;
+      __SetPropertiesFromGit;
       SetAppVeyorBuildNumber;
       SetGlobalJson;
       SetDirectoryPackagesProps;
+      InstallSigningClient
     </SetBuildNumbersDependsOn>
 
     <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath>
@@ -88,6 +89,12 @@
   </Target>
 
 
+  <Target Name="InstallSigningClient"
+          DependsOnTargets="_GetSignClient"
+          Condition=" '$(SigningUser)'!='' ">
+  </Target>
+
+
   <Target Name="SetBuildNumbers"
           DependsOnTargets="$(SetBuildNumbersDependsOn)"
           BeforeTargets="AfterBuild" />
diff --git a/src/version.txt b/src/version.txt
index 140eb675..7a6de69f 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1 +1 @@
-4.0-preview.1-build.{height}
+4.0-preview.1
-- 
cgit v1.2.3-55-g6feb