aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-10-28 20:39:28 -0400
committerBob Arnson <bob@firegiant.com>2020-10-29 20:38:05 -0400
commita530a132079287c5d8d22e73ecc9a6eaab69bd82 (patch)
tree7d5fa2d6f367bee93c91c4c3d5e5ae8eac51157b
parentf28de8b2b38a09af130bc128b6226a2010ab535d (diff)
downloadwix-a530a132079287c5d8d22e73ecc9a6eaab69bd82.tar.gz
wix-a530a132079287c5d8d22e73ecc9a6eaab69bd82.tar.bz2
wix-a530a132079287c5d8d22e73ecc9a6eaab69bd82.zip
Strong-name sign WiX assemblies.
-rw-r--r--src/CSharp.Build.props11
-rw-r--r--src/Directory.Build.props1
-rw-r--r--src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj2
-rw-r--r--src/wix.snkbin0 -> 596 bytes
4 files changed, 13 insertions, 1 deletions
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/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
index 1571b6a0..cbf2c548 100644
--- a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+++ b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
@@ -13,7 +13,7 @@
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo"> 15 <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
16 <_Parameter1>WixToolset.Core.TestPackage</_Parameter1> 16 <_Parameter1>WixToolset.Core.TestPackage, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1>
17 </AssemblyAttribute> 17 </AssemblyAttribute>
18 </ItemGroup> 18 </ItemGroup>
19 19
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