Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 0fb5841

Browse files
committed
Fix CI packaging and enable packaging matrix in master
Fix packaging to use an existing newtonsoft.json.dll to generate the json manifest
1 parent e96f0b8 commit 0fb5841

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ for:
5757
branches:
5858
only:
5959
- /releases/.*-vsinstaller/
60+
- master
6061
environment:
6162
matrix:
63+
- BUILD_TYPE: package
6264
- BUILD_TYPE: vsinstaller
63-
- BUILD_TYPE: package

scripts/modules.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ New-Module -ScriptBlock {
185185

186186
New-Module -ScriptBlock {
187187
function Write-Manifest([string]$directory) {
188-
Add-Type -Path (Join-Path $rootDirectory packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll)
188+
Add-Type -Path (Join-Path $rootDirectory build\Release\Newtonsoft.Json.dll)
189189

190190
$manifest = @{
191191
NewestExtension = @{

0 commit comments

Comments
 (0)