fix: Error while creating delta nupkg for Windows: System.DllNotFoundException: msdelta.dl #294

develar · develar · commit 574add75839a · 2016-04-14T12:29:44.000+02:00
Closes #294
diff --git a/package.json b/package.json
@@ -54,10 +54,10 @@
   "bugs": "https://github.com/electron-userland/electron-builder/issues",
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
-    "bluebird": "^3.3.4",
+    "bluebird": "^3.3.5",
     "command-line-args": "^2.1.6",
-    "electron-packager-tf": "^6.0.3-beta.0",
-    "electron-winstaller-fixed": "^2.0.6-beta.8",
+    "electron-packager-tf": "^6.0.3-beta.1",
+    "electron-winstaller-fixed": "^2.2.1-beta.0",
     "fs-extra": "^0.26.7",
     "fs-extra-p": "^0.2.0",
     "globby": "^4.0.0",
diff --git a/src/winPackager.ts b/src/winPackager.ts
@@ -126,6 +126,7 @@ export class WinPackager extends PlatformPackager<WinBuildOptions> {
       certificateFile: certificateFile,
       certificatePassword: this.options.cscKeyPassword,
       fixUpPaths: false,
+      skipUpdateIcon: true,
       usePackageJson: false,
       noMsi: true,
       extraFileSpecs: this.extraNuGetFileSources == null ? null : ("\n" + (await this.extraNuGetFileSources).join("\n")),
@@ -229,7 +230,7 @@ export function computeDistOut(outDir: string, arch: string): string {
 }
 
 function checkConflictingOptions(options: any) {
-  for (let name of ["outputDirectory", "appDirectory", "exe", "fixUpPaths", "usePackageJson", "extraFileSpecs", "extraMetadataSpecs"]) {
+  for (let name of ["outputDirectory", "appDirectory", "exe", "fixUpPaths", "usePackageJson", "extraFileSpecs", "extraMetadataSpecs", "skipUpdateIcon", "setupExe"]) {
     if (name in options) {
       throw new Error(`Option ${name} is ignored, do not specify it.`)
     }
diff --git a/test/src/helpers/expectedContents.ts b/test/src/helpers/expectedContents.ts
@@ -23,7 +23,7 @@ export const expectedLinuxContents = [
   "/usr/share/doc/",
   "/usr/share/icons/",
   "/usr/share/doc/testapp/",
-  "/usr/share/doc/testapp/changelog.Debian.gz",
+  "/usr/share/doc/testapp/changelog.gz",
   "/usr/share/icons/hicolor/",
   "/usr/share/icons/hicolor/128x128/",
   "/usr/share/icons/hicolor/16x16/",
diff --git a/test/src/winPackagerTest.ts b/test/src/winPackagerTest.ts
@@ -1,6 +1,6 @@
 ///<reference path="helpers/packTester.ts"/>
 import test from "./helpers/avaEx"
-import { assertPack, platform } from "./helpers/packTester"
+import { assertPack, platform, modifyPackageJson } from "./helpers/packTester"
 import { move } from "fs-extra-p"
 import * as path from "path"
 import { WinPackager, computeDistOut } from "out/winPackager"
@@ -13,14 +13,14 @@ const __awaiter = require("out/awaiter")
 
 test.ifNotTravis("win", () => assertPack("test-app-one", {
     platform: ["win32"],
+  },
+  {
+    tempDirCreated: process.env.TEST_DELTA ? it => modifyPackageJson(it, data => {
+      data.build.win = {
+        remoteReleases: "https://github.com/develar/__test-app-releases",
+      }
+    }) : null
   }
-  // {
-  //   tempDirCreated: it => modifyPackageJson(it, data => {
-  //     data.build.win = {
-  //       remoteReleases: "https://github.com/develar/__test-app-releases",
-  //     }
-  //   })
-  // }
 ))
 
 test("detect install-spinner", () => {
