diff options
author | Bob Arnson <bob@firegiant.com> | 2020-10-31 22:03:37 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-10-31 22:07:41 -0400 |
commit | 26c0c0af9fbb3653730c4d32ca30b908ac3daf55 (patch) | |
tree | e1d5cc5e24cea51c8da17a312c3d8eae518cf29a | |
parent | e6c98d58a9044a74ba6590a9a04ad42881db12a4 (diff) | |
download | wix-26c0c0af9fbb3653730c4d32ca30b908ac3daf55.tar.gz wix-26c0c0af9fbb3653730c4d32ca30b908ac3daf55.tar.bz2 wix-26c0c0af9fbb3653730c4d32ca30b908ac3daf55.zip |
Strong-name sign WiX assemblies.
-rw-r--r-- | global.json | 2 | ||||
-rw-r--r-- | src/CSharp.Build.props | 11 | ||||
-rw-r--r-- | src/Directory.Build.props | 1 | ||||
-rw-r--r-- | src/wix.snk | bin | 0 -> 596 bytes |
4 files changed, 13 insertions, 1 deletions
diff --git a/global.json b/global.json index f94ab6df..10345833 100644 --- a/global.json +++ b/global.json | |||
@@ -1,5 +1,5 @@ | |||
1 | { | 1 | { |
2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
3 | "WixToolset.Sdk": "4.0.0-build-0162" | 3 | "WixToolset.Sdk": "4.0.0-build-0163" |
4 | } | 4 | } |
5 | } | 5 | } |
diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props new file mode 100644 index 00000000..b12f4c6e --- /dev/null +++ b/src/CSharp.Build.props | |||
@@ -0,0 +1,11 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | <!-- | ||
3 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props | ||
4 | then update all of the repos. | ||
5 | --> | ||
6 | <Project> | ||
7 | <PropertyGroup> | ||
8 | <SignAssembly>true</SignAssembly> | ||
9 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
10 | </PropertyGroup> | ||
11 | </Project> | ||
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a22f4470..f83cc154 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
@@ -22,6 +22,7 @@ | |||
22 | <Product>WiX Toolset</Product> | 22 | <Product>WiX Toolset</Product> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | 24 | ||
25 | <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> | ||
25 | <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " /> | 26 | <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " /> |
26 | <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | 27 | <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " /> |
27 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | 28 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> |
diff --git a/src/wix.snk b/src/wix.snk new file mode 100644 index 00000000..3908a66a --- /dev/null +++ b/src/wix.snk | |||
Binary files differ | |||