From 8f81933b1aec66249e62798fc0515f19c40749d6 Mon Sep 17 00:00:00 2001
From: Michael Maietta <michael.maietta@mikes-mbp-2.lan>
Date: Mon, 23 Jan 2023 08:34:07 -0800
Subject: [PATCH 1/3] fix: Manually reseting `GYP_MSVS_VERSION` for multi-arch
 builds due to electron-rebuild and node-gyp overwriting the default var

---
 .github/issue_template.md                        | 1 -
 docs/configuration/configuration.md              | 2 +-
 packages/app-builder-lib/scheme.json             | 2 +-
 packages/app-builder-lib/src/platformPackager.ts | 3 +++
 scripts/jsdoc2md2html.js                         | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 14043a7fa6e..c75cf6e5e34 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -19,4 +19,3 @@ issue_labeler_regex_version=0
 * **Target**: 
 
 <!-- Enter your issue details below this comment. -->
-<!-- If you want, you can donate to increase issue priority (https://www.electron.build/donate) -->
diff --git a/docs/configuration/configuration.md b/docs/configuration/configuration.md
index 00a4c21c1c2..3360d6b0a31 100644
--- a/docs/configuration/configuration.md
+++ b/docs/configuration/configuration.md
@@ -66,7 +66,7 @@ Env file `electron-builder.env` in the current dir ([example](https://github.com
 <hr>
 <ul>
 <li><code id="Configuration-linux">linux</code> <a href="linux">LinuxConfiguration</a> - Options related to how build Linux targets.</li>
-<li><code id="Configuration-deb">deb</code> <a href="/configuration/linux#de">DebOptions</a> - Debian package options.</li>
+<li><code id="Configuration-deb">deb</code> <a href="/configuration/linux#deb">DebOptions</a> - Debian package options.</li>
 <li><code id="Configuration-snap">snap</code> <a href="snap">SnapOptions</a> - Snap options.</li>
 <li><code id="Configuration-appImage">appImage</code> <a href="/configuration/linux#appimageoptions">AppImageOptions</a> - AppImage options.</li>
 <li><code id="Configuration-flatpak">flatpak</code> <a href="flatpak">FlatpakOptions</a> - Flatpak options.</li>
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
index 772817075b8..37167d86e86 100644
--- a/packages/app-builder-lib/scheme.json
+++ b/packages/app-builder-lib/scheme.json
@@ -390,7 +390,7 @@
           ]
         },
         "token": {
-          "description": "The app password (account>>settings>app-passwords) to support auto-update from private bitbucket repositories.",
+          "description": "The app password (account>settings>app-passwords) to support auto-update from private bitbucket repositories.",
           "type": [
             "null",
             "string"
diff --git a/packages/app-builder-lib/src/platformPackager.ts b/packages/app-builder-lib/src/platformPackager.ts
index c664a481c88..e2ad4b326f7 100644
--- a/packages/app-builder-lib/src/platformPackager.ts
+++ b/packages/app-builder-lib/src/platformPackager.ts
@@ -201,6 +201,9 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
       return
     }
 
+    // Due to node-gyp rewriting GYP_MSVS_VERSION when reused across the same session, we must reset the env var: https://github.com/electron-userland/electron-builder/issues/7256
+    delete process.env.GYP_MSVS_VERSION
+
     const beforePack = resolveFunction(this.config.beforePack, "beforePack")
     if (beforePack != null) {
       await beforePack({
diff --git a/scripts/jsdoc2md2html.js b/scripts/jsdoc2md2html.js
index 68cd56bbf54..9c053e1ea11 100644
--- a/scripts/jsdoc2md2html.js
+++ b/scripts/jsdoc2md2html.js
@@ -188,7 +188,7 @@ async function render2(files, jsdoc2MdOptions) {
       return "[AppImageOptions](/configuration/linux#appimageoptions)"
     }
     if (types.some(it => it.endsWith("DebOptions"))) {
-      return "[DebOptions](/configuration/linux#de)"
+      return "[DebOptions](/configuration/linux#deb)"
     }
     if (types.some(it => it.endsWith("LinuxTargetSpecificOptions"))) {
       return "[LinuxTargetSpecificOptions](/configuration/linux#LinuxTargetSpecificOptions)"

From 0595d2660026c90b871cf2e64230a1cc5851831a Mon Sep 17 00:00:00 2001
From: Mike Maietta <mmaietta@outlook.com>
Date: Mon, 23 Jan 2023 09:05:52 -0800
Subject: [PATCH 2/3] Regenerating schema

---
 docs/generated/PlatformSpecificBuildOptions.md      |  1 +
 packages/app-builder-lib/scheme.json                | 13 ++++++++++---
 .../src/options/PlatformSpecificBuildOptions.ts     |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/generated/PlatformSpecificBuildOptions.md b/docs/generated/PlatformSpecificBuildOptions.md
index 02c81210cba..f52250ac0ca 100644
--- a/docs/generated/PlatformSpecificBuildOptions.md
+++ b/docs/generated/PlatformSpecificBuildOptions.md
@@ -92,6 +92,7 @@
 <li><code id="ReleaseInfo-releaseNotes">releaseNotes</code> String | “undefined” - The release notes.</li>
 <li><code id="ReleaseInfo-releaseNotesFile">releaseNotesFile</code> String | “undefined” - The path to release notes file. Defaults to <code>release-notes-${platform}.md</code> (where <code>platform</code> it is current platform — <code>mac</code>, <code>linux</code> or <code>windows</code>) or <code>release-notes.md</code> in the <a href="#MetadataDirectories-buildResources">build resources</a>.</li>
 <li><code id="ReleaseInfo-releaseDate">releaseDate</code> String - The release date.</li>
+<li><code id="ReleaseInfo-vendor">vendor</code> Object&lt;String, any&gt; | “undefined” - Vendor specific information.</li>
 </ul>
 </li>
 <li>
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
index ca223ced41f..fd47f9365e4 100644
--- a/packages/app-builder-lib/scheme.json
+++ b/packages/app-builder-lib/scheme.json
@@ -4876,8 +4876,15 @@
           ]
         },
         "vendor": {
-          "description": "Vendor-specific informaton",
-          "type": "object"
+          "anyOf": [
+            {
+              "typeof": "function"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Vendor specific information."
         }
       },
       "type": "object"
@@ -7078,4 +7085,4 @@
     }
   },
   "type": "object"
-}
+}
\ No newline at end of file
diff --git a/packages/app-builder-lib/src/options/PlatformSpecificBuildOptions.ts b/packages/app-builder-lib/src/options/PlatformSpecificBuildOptions.ts
index cbe2a158411..d5969b7b0ae 100644
--- a/packages/app-builder-lib/src/options/PlatformSpecificBuildOptions.ts
+++ b/packages/app-builder-lib/src/options/PlatformSpecificBuildOptions.ts
@@ -147,7 +147,7 @@ export interface ReleaseInfo {
   /**
    * Vendor specific information.
    */
-  vendor?: Record<string, unknown> | null
+  vendor?: { [key: string]: any } | null
 }
 
 /**

From 464b2d649b199ad1cb9a0417c7ef57bafcd5126a Mon Sep 17 00:00:00 2001
From: Mike Maietta <mmaietta@users.noreply.github.com>
Date: Mon, 23 Jan 2023 09:12:50 -0800
Subject: [PATCH 3/3] Create purple-phones-sin.md

---
 .changeset/purple-phones-sin.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/purple-phones-sin.md

diff --git a/.changeset/purple-phones-sin.md b/.changeset/purple-phones-sin.md
new file mode 100644
index 00000000000..dfdbf576b8e
--- /dev/null
+++ b/.changeset/purple-phones-sin.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix: reset `GYP_MSVS_VERSION` for multi-arch builds before `beforePack`