From 3790f5063c1e13aff9e5ed876a17f307a11e0701 Mon Sep 17 00:00:00 2001
From: Alexis Campailla <alexis@janeasystems.com>
Date: Fri, 15 Aug 2014 18:25:38 +0200
Subject: [PATCH 1/2] win: manifest node.exe for Windows 8.1

This is a port of 03e93526e6b38279c04d69ddf98c493342730e85 .

Original commit message:

  Adding a compatibility section to node.exe embedded manifest so that
  Node is declared explicitly compatible with Windows 8.1. Required so
  that os.release() can return the correct version on Windows 8.1.

  See http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx

  Reviewed-by: Trevor Norris <trev.norris@gmail.com>
---
 node.gyp                        |  6 ++++++
 src/res/node.exe.extra.manifest | 15 +++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 src/res/node.exe.extra.manifest

diff --git a/node.gyp b/node.gyp
index b641584c312136..4243ece806d5a3 100644
--- a/node.gyp
+++ b/node.gyp
@@ -324,6 +324,12 @@
             ],
         }],
       ],
+      'msvs_settings': {
+        'VCManifestTool': {
+          'EmbedManifest': 'true',
+          'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest'
+        }
+      },
     },
     # generate ETW header and resource files
     {
diff --git a/src/res/node.exe.extra.manifest b/src/res/node.exe.extra.manifest
new file mode 100644
index 00000000000000..c4cc80a141d9dd
--- /dev/null
+++ b/src/res/node.exe.extra.manifest
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+  </application>
+  </compatibility>
+</assembly>

From 9f3496915f7e88b50aa9e09c9a8713c3bee2b39a Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Sat, 8 Aug 2015 23:56:08 -0600
Subject: [PATCH 2/2] build: update manifest to include Windows 10

This is a port of b0dd3bf499083214023da534e6cd0989f57dbecd .

Original commit message:

  Windows 10 wasn't listed in the executable manifest.
  This caused problems with trying to detect Windows 10
  via `os.release()`.

  PR-URL: https://github.com/nodejs/io.js/pull/2332
  Reviewed-By: Roman Reiss <me@silverwind.io>
---
 src/res/node.exe.extra.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/res/node.exe.extra.manifest b/src/res/node.exe.extra.manifest
index c4cc80a141d9dd..e2e9f175473305 100644
--- a/src/res/node.exe.extra.manifest
+++ b/src/res/node.exe.extra.manifest
@@ -2,6 +2,8 @@
 <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows 8 -->