Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit 412fa26

Browse files
robmenrobmen
committed
Enable signing
1 parent a27cdef commit 412fa26

19 files changed

+174
-255
lines changed

‎appveyor.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ branches:
55
- master
66
- develop
77

8+
image: Visual Studio 2015
9+
810
version: 0.0.0.{build}
911
configuration: Release
1012

@@ -47,7 +49,12 @@ for:
4749

4850
environment:
4951
KeyPairDownloadToken:
50-
secure: U5OkonXbnqz0MB5NLRcfxdPvz7bG9QWHRt8ZeldmeSpoqW6GmkAirTlIDU1OZAW8pWIyz6LrTeTVRntzVSRoXw6pwRYfYO+Zzl43RHd7UvmPEPKvrqiqlDBT9+TrFPmOdvm13FaX4ljs19K94ALL9w==
52+
secure: U5OkonXbnqz0MB5NLRcfxbJyt5ZSAlKYbaJbs1z4qX3EuLHX83tMQvW7Kgf594jPsw7NZqAYepUCJTLuyr3vazJsuHO1p5A4AHyCiRjqxG+8nI4937EhbWtsxqrEnUttrs2M/6jLKOTk6fvJv7zkXFiEfur1JHnJNb3Moe2jQvBVBe1WoCYGTJqo1eSQccnD
53+
PleaseSignOutput: true
54+
SignClientUser:
55+
secure: s+b2kuhi/AlE8ZYFsNVHFLfgJOwi0fIKMCOP+xL++8U=
56+
SignClientSecret:
57+
secure: tlJbxYs82lHpHf8dttYr4LpKbWSAC/gKlvyDfUWKBj0=
5158

5259
install:
5360
- ps: $env:OFFICIAL_WIX_BUILD=$ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath(".\wix4_keypair.snk")

‎src/Votive2010/Votive2010.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ProjectGuid>{3FFC5AB2-97CC-48C1-A28B-CC7F1CEEE92A}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AssemblyName>Votive2010</AssemblyName>
9+
<ShouldSignOutput>true</ShouldSignOutput>
910

1011
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1112
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>

‎src/Votive2012/Votive2012.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ProjectGuid>{40F7D778-7677-4597-AF84-C956A31A9EE9}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AssemblyName>Votive2012</AssemblyName>
9+
<ShouldSignOutput>true</ShouldSignOutput>
910

1011
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1112
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>

‎src/Votive2013/Votive2013.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ProjectGuid>{0877C6F6-73D9-46F1-89AB-43B6EC05EB9F}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AssemblyName>Votive2013</AssemblyName>
9+
<ShouldSignOutput>true</ShouldSignOutput>
910

1011
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1112
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>

‎src/Votive2015/Votive2015.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ProjectGuid>{C06BEF93-8980-4E98-BBB6-86CCBD3F1578}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AssemblyName>Votive2015</AssemblyName>
9+
<ShouldSignOutput>true</ShouldSignOutput>
910

1011
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1112
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>

‎src/Votive2017/Votive2017.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ProjectGuid>{08182574-F5E5-4800-BE08-1E5DDB0DB5D7}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AssemblyName>Votive2017</AssemblyName>
9+
<ShouldSignOutput>true</ShouldSignOutput>
910

1011
<VsixType>v3</VsixType>
1112

‎src/Votive2019/Votive2019.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,33 @@
66
<ProjectGuid>{B97AB81C-BE5B-4757-B2CC-96D92EB84182}</ProjectGuid>
77
<OutputType>Library</OutputType>
88
<AssemblyName>Votive2019</AssemblyName>
9+
<ShouldSignOutput>true</ShouldSignOutput>
10+
911
<VsixType>v3</VsixType>
12+
1013
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
1114
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
15+
1216
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
1317
<GeneratePkgDefFile>false</GeneratePkgDefFile>
1418
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
1519
<DeployExtension>false</DeployExtension>
1620
<DeployVSTemplates>false</DeployVSTemplates>
1721
</PropertyGroup>
22+
1823
<Import Project="..\..\tools\WixBuild.csproj.props" />
24+
1925
<ItemGroup>
2026
<None Include="packages.config" />
2127
<None Include="source.extension.vsixmanifest" />
2228
</ItemGroup>
29+
2330
<ItemGroup>
2431
<Content Include="WixLogoDev16.png">
2532
<IncludeInVSIX>true</IncludeInVSIX>
2633
</Content>
2734
</ItemGroup>
35+
2836
<ItemGroup>
2937
<Content Include="redirects\v3\wix.ca.targets">
3038
<IncludeInVSIX>true</IncludeInVSIX>
@@ -256,6 +264,7 @@
256264
<VSIXSubPath>.</VSIXSubPath>
257265
</Content>
258266
</ItemGroup>
267+
259268
<ItemGroup>
260269
<ProjectReference Include="..\votive\votive.csproj">
261270
<Project>{24A98296-9D58-42C1-95C0-CC36736409E2}</Project>
@@ -284,6 +293,7 @@
284293
</VSIXSourceItem>
285294
</ItemGroup>
286295
</Target>
296+
287297
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
288298
<PropertyGroup>
289299
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

‎src/votive/votive.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<OutputType>Library</OutputType>
88
<RootNamespace>WixToolset.VisualStudioExtension</RootNamespace>
99
<AssemblyName>votive</AssemblyName>
10+
<ShouldSignOutput>true</ShouldSignOutput>
1011

1112
<GeneratePkgDefFile>true</GeneratePkgDefFile>
1213
<CopyZipOutputToOutputDirectory>true</CopyZipOutputToOutputDirectory>

‎tools/Dotnet.targets

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!-- 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. -->
3+
4+
5+
<Project InitialTargets="DotnetToolRestore"
6+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
7+
<PropertyGroup>
8+
<WixRoot Condition=" '$(WixRoot)'=='' ">$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\))</WixRoot>
9+
<DotnetToolsFolder>$(WixRoot)packages\tools\</DotnetToolsFolder>
10+
<DotnetExe>$(ProgramW6432)\dotnet\dotnet.exe</DotnetExe>
11+
<DotnetExe Condition="!Exists('$(DotnetExe)')">$(MSBuildProgramFiles32)\dotnet\dotnet.exe</DotnetExe>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<SignClientPath>$(DotnetToolsFolder)SignClient.exe</SignClientPath>
16+
</PropertyGroup>
17+
18+
<!--
19+
================================================================================================
20+
DotnetToolRestore
21+
22+
Restores the required packages to build using nuget.exe.
23+
================================================================================================
24+
-->
25+
<ItemGroup>
26+
<RestoreDotnetToolsPackage Include="SignClient" Condition="'$(PleaseSignOutput)'!=''">
27+
<Version>1.1.7</Version>
28+
</RestoreDotnetToolsPackage>
29+
</ItemGroup>
30+
<Target Name="DotnetToolRestore" DependsOnTargets="_FindDotnetExe;_FindMissingDotnetToolPackages">
31+
<Exec Command="&quot;$(DotnetExe)&quot; tool install %(Identity) --version %(Version) --tool-path &quot;$(DotnetToolsFolder)\&quot;" Condition="Exists('$(DotnetExe)') and '@(_MissingDotnetToolPackage)'!=''" WorkingDirectory="$(MSBuildThisFileDirectory)" />
32+
</Target>
33+
34+
<Target Name="_FindMissingDotnetToolPackages">
35+
<CreateItem Include="@(RestoreDotnetToolsPackage)" Condition="!Exists('$(DotnetToolsFolder).store\%(Identity)\%(Version)\%(Identity)\%(Version)\%(Identity).%(Version).nupkg')" PreserveExistingMetadata="true">
36+
<Output TaskParameter="Include" ItemName="_MissingDotnetToolPackage"/>
37+
</CreateItem>
38+
</Target>
39+
40+
<!-- Find dotnet.exe in the PATH if it is not in the default location. -->
41+
<Target Name="_FindDotnetExe" Condition="!Exists('$(DotnetExe)')">
42+
<CreateItem Include="$(PATH)">
43+
<Output TaskParameter="Include" ItemName="_FindDotnetExePaths" />
44+
</CreateItem>
45+
<CombinePath BasePath="%(_FindDotnetExePaths.Identity)" Paths="dotnet.exe">
46+
<Output TaskParameter="CombinedPaths" ItemName="_FindDotnetExeCombinedPaths" />
47+
</CombinePath>
48+
<CreateItem Include="@(_FindDotnetExeCombinedPaths->Reverse())">
49+
<Output TaskParameter="Include" ItemName="_FindDotnetExeCombinedPathsReversed" />
50+
</CreateItem>
51+
<CreateItem Include="@(_FindDotnetExeCombinedPathsReversed)">
52+
<Output TaskParameter="Include" PropertyName="DotnetExe" Condition="Exists('%(_FindDotnetExeCombinedPathsReversed.Identity)')" />
53+
</CreateItem>
54+
</Target>
55+
56+
<!-- Sentinel value that indicates Dotnet.targets has been initialized. -->
57+
<PropertyGroup>
58+
<WixBuildDotnetToolPropertiesDefined>true</WixBuildDotnetToolPropertiesDefined>
59+
</PropertyGroup>
60+
</Project>

‎tools/Version.proj

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)