Enable MSI signing

jasongin · Nov 22, 2016 · ba1b3a2 · ba1b3a2
1 parent d800402
commit ba1b3a2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -72,8 +72,11 @@ A version or filter consists of a complete or partial semantic version number or
 
 ## Interactive menus
 When invoked with no parameters, `nvs` displays an interactive menu for switching and downloading node versions.
+
 ![nvs menu](https://github.com/jasongin/nvs/releases/download/v0.8.0/nvs-menu.gif)
 
+*NVS uses [**console-menu**](https://github.com/jasongin/console-menu), a module originally written for this project then published separately.*
+
 ## Configurable remotes
 The `nvs remote` command allows configuration of multiple named download locations. NVS manages versions from different remote locations separately, so there is no risk of version collisions. By default there are remotes pointing to Node.js official releases and nightly builds:
 ```

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nvs",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Node Version Switcher",
   "main": "lib/main.js",
   "scripts": {

diff --git a/setup/NvsSetup.wixproj b/setup/NvsSetup.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
   <Import Project="packages\WiX.3.10.3\build\wix.props" Condition="Exists('packages\WiX.3.10.3\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -32,9 +33,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="nvs.wxs" />
-    <Compile Include="$(IntermediateOutputPath)\nvslib.wxs" />
-    <Compile Include="$(IntermediateOutputPath)\nvsdoc.wxs" />
-    <Compile Include="$(IntermediateOutputPath)\nvsdeps.wxs" />
+    <Compile Include="$(IntermediateOutputPath)nvslib.wxs" />
+    <Compile Include="$(IntermediateOutputPath)nvsdoc.wxs" />
+    <Compile Include="$(IntermediateOutputPath)nvsdeps.wxs" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="WixUIExtension">
@@ -50,6 +51,7 @@
     <Content Include="packages.config" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
+  <Import Project="packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
   <Import Project="PackageVersion.targets" />
   <Target Name="BeforeBuild">
     <GetPackageVersion PackageJsonPath="..\package.json" Condition=" '$(NvsVersion)' == '' ">
@@ -62,13 +64,13 @@
       <TargetPdbName>$(TargetName)$(TargetPdbExt)</TargetPdbName>
     </PropertyGroup>
     <ItemGroup>
-      <FilesToSign Include="$(TargetDir)\$(TargetName)$(TargetExt)">
-        <Authenticode>MicrosoftSHA2</Authenticode>
+      <FilesToSign Include="$(TargetDir)$(TargetFileName)">
+        <Authenticode>Microsoft400</Authenticode>
       </FilesToSign>
     </ItemGroup>
-    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\lib" PreprocessorVariable="var.NvsLibDir" DirectoryRefId="INSTALLDIR" ComponentGroupName="NvsLibFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="$(IntermediateOutputPath)\nvslib.wxs" RunAsSeparateProcess="true" />
-    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\doc" PreprocessorVariable="var.NvsDocDir" DirectoryRefId="INSTALLDIR" ComponentGroupName="NvsDocFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="$(IntermediateOutputPath)\nvsdoc.wxs" RunAsSeparateProcess="true" />
-    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\deps" PreprocessorVariable="var.NvsDepsDir" DirectoryRefId="INSTALLDIR" ComponentGroupName="NvsDepsFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="$(IntermediateOutputPath)\nvsdeps.wxs" RunAsSeparateProcess="true" />
+    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\lib" PreprocessorVariable="var.NvsLibDir" DirectoryRefId="INSTALLDIR" ComponentGroupName="NvsLibFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="$(IntermediateOutputPath)nvslib.wxs" RunAsSeparateProcess="true" />
+    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\doc" PreprocessorVariable="var.NvsDocDir" DirectoryRefId="INSTALLDIR" ComponentGroupName="NvsDocFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="$(IntermediateOutputPath)nvsdoc.wxs" RunAsSeparateProcess="true" />
+    <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\deps" PreprocessorVariable="var.NvsDepsDir" DirectoryRefId="INSTALLDIR" ComponentGroupName="NvsDepsFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="$(IntermediateOutputPath)nvsdeps.wxs" RunAsSeparateProcess="true" />
   </Target>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/setup/packages.config b/setup/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="WiX" version="3.10.3" />
-</packages>
+  <package id="MicroBuild.Core" version="0.2.0" targetFramework="native" developmentDependency="true" />
+</packages>