diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-01-26 00:57:45 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-03-06 18:03:38 -0800 |
| commit | 626f5c6b4b0395a831fda0f08893b88a745f6915 (patch) | |
| tree | c0f546663bf3b8fc9fbe7dc6b65898962fe43625 | |
| parent | bbc176de36987255f3e9ab10c002c22ffe8a9a7e (diff) | |
| download | wix-626f5c6b4b0395a831fda0f08893b88a745f6915.tar.gz wix-626f5c6b4b0395a831fda0f08893b88a745f6915.tar.bz2 wix-626f5c6b4b0395a831fda0f08893b88a745f6915.zip | |
Normalize signing command-line
| -rw-r--r-- | src/Directory.Build.targets | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 74a381ba..47c06a03 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets | |||
| @@ -3,10 +3,9 @@ | |||
| 3 | 3 | ||
| 4 | <Project> | 4 | <Project> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <SigningToolFolder>$(ToolsFolder)</SigningToolFolder> | 6 | <SigningToolExe>$(ToolsFolder)\sign.exe</SigningToolExe> |
| 7 | <SigningToolExe>$(SigningToolFolder)\sign.exe</SigningToolExe> | 7 | <SigningCommand>code azure-key-vault</SigningCommand> |
| 8 | <SigningFilelist>$(MSBuildThisFileDirectory)signing-empty-file-list.txt</SigningFilelist> | 8 | <SigningConfiguration>--description "WiX Toolset" --description-url "https://wixtoolset.org/" --timestamp-url "http://timestamp.digicert.com" --file-list "$(MSBuildThisFileDirectory)signing-empty-file-list.txt" --azure-key-vault-managed-identity true --azure-key-vault-url "$(SigningVaultUri)" --azure-key-vault-certificate "$(SigningCertName)"</SigningConfiguration> |
| 9 | <SigningConfiguration>--description "WiX Toolset" --description-url "https://wixtoolset.org/" --timestamp-url "http://timestamp.digicert.com" --file-list "$(SigningFilelist)" --azure-key-vault-managed-identity true --azure-key-vault-url "$(SigningVaultUri)" --azure-key-vault-certificate "$(SigningCertName)"</SigningConfiguration> | ||
| 10 | </PropertyGroup> | 9 | </PropertyGroup> |
| 11 | 10 | ||
| 12 | <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> | 11 | <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> |
| @@ -114,12 +113,12 @@ | |||
| 114 | </Target> | 113 | </Target> |
| 115 | 114 | ||
| 116 | <Target Name="SignOutput" AfterTargets="AfterBuild" | 115 | <Target Name="SignOutput" AfterTargets="AfterBuild" |
| 117 | Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' and | 116 | Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' and |
| 118 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> | 117 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> |
| 119 | 118 | ||
| 120 | <Message Importance="high" Text="Signing file: $(TargetPath)" /> | 119 | <Message Importance="high" Text="Signing file: $(TargetPath)" /> |
| 121 | 120 | ||
| 122 | <Exec Command='"$(SigningToolExe)" code azure-key-vault $(TargetPath) $(SigningConfiguration)' | 121 | <Exec Command='"$(SigningToolExe)" $(SigningCommand) $(SigningConfiguration) $(TargetPath)' |
| 123 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 122 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 124 | </Target> | 123 | </Target> |
| 125 | 124 | ||
| @@ -131,21 +130,21 @@ | |||
| 131 | 130 | ||
| 132 | <Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->'%(Identity)')" /> | 131 | <Message Importance="high" Text="Signing nupkg: @(SigningNupkgs->'%(Identity)')" /> |
| 133 | 132 | ||
| 134 | <Exec Command='"$(SigningToolExe)" code azure-key-vault "@(SigningNupkgs->'%(Identity)')" $(SigningConfiguration)' | 133 | <Exec Command='"$(SigningToolExe)" $(SigningCommand) $(SigningConfiguration) "@(SigningNupkgs->'%(Identity)')"' |
| 135 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 134 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 136 | </Target> | 135 | </Target> |
| 137 | 136 | ||
| 138 | <Target Name="SignBundleEngine" Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' "> | 137 | <Target Name="SignBundleEngine" Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' "> |
| 139 | <Message Importance="high" Text="Signing bundle engine: @(SignBundleEngine->'%(Identity)')" /> | 138 | <Message Importance="high" Text="Signing bundle engine: @(SignBundleEngine->'%(Identity)')" /> |
| 140 | 139 | ||
| 141 | <Exec Command='"$(SigningToolExe)" code azure-key-vault "@(SignBundleEngine->'%(Identity)')" $(SigningConfiguration)' | 140 | <Exec Command='"$(SigningToolExe)" $(SigningCommand) $(SigningConfiguration) "@(SignBundleEngine->'%(Identity)')"' |
| 142 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 141 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 143 | </Target> | 142 | </Target> |
| 144 | 143 | ||
| 145 | <Target Name="SignBundle" Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' "> | 144 | <Target Name="SignBundle" Condition=" '$(SigningCertName)'!='' and '$(SignOutput)'!='false' "> |
| 146 | <Message Importance="high" Text="Signing bundle: @(SignBundle->'%(Identity)')" /> | 145 | <Message Importance="high" Text="Signing bundle: @(SignBundle->'%(Identity)')" /> |
| 147 | 146 | ||
| 148 | <Exec Command='"$(SigningToolExe)" code azure-key-vault "@(SignBundle->'%(Identity)')" $(SigningConfiguration)' | 147 | <Exec Command='"$(SigningToolExe)" $(SigningCommand) $(SigningConfiguration) "@(SignBundle->'%(Identity)')"' |
| 149 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | 148 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> |
| 150 | </Target> | 149 | </Target> |
| 151 | 150 | ||