Merge branch 'master' into fixes/2214-open-from-github-url-filter

Author: jcansdale

appveyor.yml

@@ -57,7 +57,8 @@ for:
   branches:
     only:
       - /releases/.*-vsinstaller/
+      - master
   environment:
     matrix:
+      - BUILD_TYPE: package
       - BUILD_TYPE: vsinstaller
-      - BUILD_TYPE: package

scripts/modules.ps1

@@ -185,7 +185,7 @@ New-Module -ScriptBlock {
 
 New-Module -ScriptBlock {
     function Write-Manifest([string]$directory) {
-        Add-Type -Path (Join-Path $rootDirectory packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll)
+        Add-Type -Path (Join-Path $rootDirectory build\Release\Newtonsoft.Json.dll)
 
         $manifest = @{
             NewestExtension = @{