diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-11-11 07:40:01 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-11-11 08:48:30 -0800 |
| commit | 7a4632adc0c7b1a363259abb4ed08b11ee3b2d87 (patch) | |
| tree | 0165b9480786af776469b693da395a691bf4ca8e /src | |
| parent | 209c92111928a98972d7f0f9d6d620ab566564d9 (diff) | |
| download | wix-7a4632adc0c7b1a363259abb4ed08b11ee3b2d87.tar.gz wix-7a4632adc0c7b1a363259abb4ed08b11ee3b2d87.tar.bz2 wix-7a4632adc0c7b1a363259abb4ed08b11ee3b2d87.zip | |
WiX Toolset v4-preview.1v4.0.0-preview.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Directory.Build.targets | 6 | ||||
| -rw-r--r-- | src/ext/Bal/bal.cmd | 2 | ||||
| -rw-r--r-- | src/internal/SetBuildNumber/SetBuildNumber.proj | 9 | ||||
| -rw-r--r-- | src/version.txt | 2 |
4 files changed, 15 insertions, 4 deletions
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 @@ | |||
| 111 | 111 | ||
| 112 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> | 112 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> |
| 113 | 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> | 115 | </Target> |
| 116 | 116 | ||
| 117 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" | 117 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" |
| 118 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and | 118 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and |
| 119 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> | 119 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> |
| 120 | 120 | ||
| 121 | <Message Importance="high" Text="Signing file: $(TargetPath) using configuration from: $(SigningConfiguration)" /> | ||
| 122 | |||
| 121 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | 123 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' |
| 122 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 124 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 123 | </Target> | 125 | </Target> |
| @@ -128,6 +130,8 @@ | |||
| 128 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> | 130 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> |
| 129 | </ItemGroup> | 131 | </ItemGroup> |
| 130 | 132 | ||
| 133 | <Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->'%(Identity)') using configuration from: $(SigningConfiguration)" /> | ||
| 134 | |||
| 131 | <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)"' | 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)"' |
| 132 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 136 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 133 | </Target> | 137 | </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 | |||
| 22 | 22 | ||
| 23 | dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b | 23 | dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b |
| 24 | 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 | 26 | ||
| 27 | :: Test | 27 | :: Test |
| 28 | dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b | 28 | 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 @@ | |||
| 14 | 14 | ||
| 15 | <PropertyGroup> | 15 | <PropertyGroup> |
| 16 | <SetBuildNumbersDependsOn> | 16 | <SetBuildNumbersDependsOn> |
| 17 | __SetPropertiesFromGit; | 17 | __SetPropertiesFromGit; |
| 18 | SetAppVeyorBuildNumber; | 18 | SetAppVeyorBuildNumber; |
| 19 | SetGlobalJson; | 19 | SetGlobalJson; |
| 20 | SetDirectoryPackagesProps; | 20 | SetDirectoryPackagesProps; |
| 21 | InstallSigningClient | ||
| 21 | </SetBuildNumbersDependsOn> | 22 | </SetBuildNumbersDependsOn> |
| 22 | 23 | ||
| 23 | <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath> | 24 | <GlobalJsonPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json))</GlobalJsonPath> |
| @@ -88,6 +89,12 @@ | |||
| 88 | </Target> | 89 | </Target> |
| 89 | 90 | ||
| 90 | 91 | ||
| 92 | <Target Name="InstallSigningClient" | ||
| 93 | DependsOnTargets="_GetSignClient" | ||
| 94 | Condition=" '$(SigningUser)'!='' "> | ||
| 95 | </Target> | ||
| 96 | |||
| 97 | |||
| 91 | <Target Name="SetBuildNumbers" | 98 | <Target Name="SetBuildNumbers" |
| 92 | DependsOnTargets="$(SetBuildNumbersDependsOn)" | 99 | DependsOnTargets="$(SetBuildNumbersDependsOn)" |
| 93 | BeforeTargets="AfterBuild" /> | 100 | 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 | ||