From b9fe2785f2df089c731a64c4939a364d49009333 Mon Sep 17 00:00:00 2001
From: Stephan Szabo <stephan.szabo@sony.com>
Date: Mon, 26 Nov 2018 07:55:48 -0800
Subject: Vs: remove /nowin32manifest from C# flags to enable default VS
 behavior

Original header commit v3.10.0-rc1~494^2

if /nowin32manifest is specified, it will be preferred over any
occurring /win32manifest:<file> parameter
---
 Templates/MSBuild/FlagTables/v10_CSharp.json  | 9 ++++++---
 Templates/MSBuild/FlagTables/v11_CSharp.json  | 9 ++++++---
 Templates/MSBuild/FlagTables/v12_CSharp.json  | 9 ++++++---
 Templates/MSBuild/FlagTables/v140_CSharp.json | 9 ++++++---
 Templates/MSBuild/FlagTables/v141_CSharp.json | 9 ++++++---
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Templates/MSBuild/FlagTables/v10_CSharp.json b/Templates/MSBuild/FlagTables/v10_CSharp.json
index fa483bf..7d1815d 100644
--- a/Templates/MSBuild/FlagTables/v10_CSharp.json
+++ b/Templates/MSBuild/FlagTables/v10_CSharp.json
@@ -133,11 +133,14 @@
     ]
   },
   {
-    "name":  "Win32Manifest",
+    "name":  "ApplicationManifest",
     "switch": "win32manifest:",
     "comment": "",
-    "value": "true",
-    "flags": []
+    "value": "",
+    "flags": [
+      "UserValue",
+      "UserRequired"
+    ]
   },
   {
     "name":  "NoWin32Manifest",
diff --git a/Templates/MSBuild/FlagTables/v11_CSharp.json b/Templates/MSBuild/FlagTables/v11_CSharp.json
index fa483bf..7d1815d 100644
--- a/Templates/MSBuild/FlagTables/v11_CSharp.json
+++ b/Templates/MSBuild/FlagTables/v11_CSharp.json
@@ -133,11 +133,14 @@
     ]
   },
   {
-    "name":  "Win32Manifest",
+    "name":  "ApplicationManifest",
     "switch": "win32manifest:",
     "comment": "",
-    "value": "true",
-    "flags": []
+    "value": "",
+    "flags": [
+      "UserValue",
+      "UserRequired"
+    ]
   },
   {
     "name":  "NoWin32Manifest",
diff --git a/Templates/MSBuild/FlagTables/v12_CSharp.json b/Templates/MSBuild/FlagTables/v12_CSharp.json
index fa483bf..7d1815d 100644
--- a/Templates/MSBuild/FlagTables/v12_CSharp.json
+++ b/Templates/MSBuild/FlagTables/v12_CSharp.json
@@ -133,11 +133,14 @@
     ]
   },
   {
-    "name":  "Win32Manifest",
+    "name":  "ApplicationManifest",
     "switch": "win32manifest:",
     "comment": "",
-    "value": "true",
-    "flags": []
+    "value": "",
+    "flags": [
+      "UserValue",
+      "UserRequired"
+    ]
   },
   {
     "name":  "NoWin32Manifest",
diff --git a/Templates/MSBuild/FlagTables/v140_CSharp.json b/Templates/MSBuild/FlagTables/v140_CSharp.json
index fa483bf..7d1815d 100644
--- a/Templates/MSBuild/FlagTables/v140_CSharp.json
+++ b/Templates/MSBuild/FlagTables/v140_CSharp.json
@@ -133,11 +133,14 @@
     ]
   },
   {
-    "name":  "Win32Manifest",
+    "name":  "ApplicationManifest",
     "switch": "win32manifest:",
     "comment": "",
-    "value": "true",
-    "flags": []
+    "value": "",
+    "flags": [
+      "UserValue",
+      "UserRequired"
+    ]
   },
   {
     "name":  "NoWin32Manifest",
diff --git a/Templates/MSBuild/FlagTables/v141_CSharp.json b/Templates/MSBuild/FlagTables/v141_CSharp.json
index fa483bf..7d1815d 100644
--- a/Templates/MSBuild/FlagTables/v141_CSharp.json
+++ b/Templates/MSBuild/FlagTables/v141_CSharp.json
@@ -133,11 +133,14 @@
     ]
   },
   {
-    "name":  "Win32Manifest",
+    "name":  "ApplicationManifest",
     "switch": "win32manifest:",
     "comment": "",
-    "value": "true",
-    "flags": []
+    "value": "",
+    "flags": [
+      "UserValue",
+      "UserRequired"
+    ]
   },
   {
     "name":  "NoWin32Manifest",
-- 
cgit v0.12