WiX Toolset v4-preview.1

wixtoolset · Nov 11, 2022 · 7a4632a · 7a4632a
1 parent 209c921
commit 7a4632a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-4.0-preview.1-build.{height}
+4.0-preview.1