WiX Toolset v4-preview.1
Rob Mensching committed
Nov 11, 2022 at 07:40 UTC
7a4632adc0c7b1a363259abb4ed08b11ee3b2d87
5 files changed
+15
-5
README.md
-1
@@ -2,7 +2,6 @@
2
3
4
5
-
5
6
# WiX Toolset v4
7
src/Directory.Build.targets
+5
-1
@@ -111,13 +111,15 @@
111
112
<WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' />
113
114
- <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' />
114
+ <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' IgnoreExitCode='true' />
115
</Target>
116
117
<Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild"
118
Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and
119
('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))">
120
121
+ <Message Importance="high" Text="Signing file: $(TargetPath) using configuration from: $(SigningConfiguration)" />
122
+
123
<Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
124
WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
125
</Target>
@@ -128,6 +130,8 @@
130
<SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " />
131
</ItemGroup>
132
133
+ <Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->'%(Identity)') using configuration from: $(SigningConfiguration)" />
134
+
135
<Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
136
WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
137
</Target>
src/ext/Bal/bal.cmd
+1
-1
@@ -22,7 +22,7 @@ msbuild -p:Configuration=%_C% -bl:%_L%\bal_build.binlog || exit /b
22
23
dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b
24
25
-msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl || exit /b
25
+msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog || exit /b
26
27
:: Test
28
dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b
src/internal/SetBuildNumber/SetBuildNumber.proj
+8
-1
@@ -14,10 +14,11 @@
14
15
<PropertyGroup>
16
<SetBuildNumbersDependsOn>
17
- __SetPropertiesFromGit;
17
+ __SetPropertiesFromGit;
18
SetAppVeyorBuildNumber;
19
SetGlobalJson;
20
SetDirectoryPackagesProps;
21
+ InstallSigningClient
22
</SetBuildNumbersDependsOn>
23
24
<GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath>
@@ -88,6 +89,12 @@
89
</Target>
90
91
92
+ <Target Name="InstallSigningClient"
93
+ DependsOnTargets="_GetSignClient"
94
+ Condition=" '$(SigningUser)'!='' ">
95
+ </Target>
96
+
97
+
98
<Target Name="SetBuildNumbers"
99
DependsOnTargets="$(SetBuildNumbersDependsOn)"
100
BeforeTargets="AfterBuild" />
src/version.txt
+1
-1
@@ -1 +1 @@
1
-4.0-preview.1-build.{height}
1
+4.0-preview.1