summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Szabo <stephan.szabo@sony.com>2018-11-26 15:55:48 (GMT)
committerStephan Szabo <stephan.szabo@sony.com>2018-11-28 15:43:29 (GMT)
commitb9fe2785f2df089c731a64c4939a364d49009333 (patch)
treeedbcca469d95b9bdfd57a22be55541a65ecb15cf
parent6c6c13297c67a7838ff8e05fde1bfedb41401b1d (diff)
downloadCMake-b9fe2785f2df089c731a64c4939a364d49009333.zip
CMake-b9fe2785f2df089c731a64c4939a364d49009333.tar.gz
CMake-b9fe2785f2df089c731a64c4939a364d49009333.tar.bz2
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
-rw-r--r--Templates/MSBuild/FlagTables/v10_CSharp.json9
-rw-r--r--Templates/MSBuild/FlagTables/v11_CSharp.json9
-rw-r--r--Templates/MSBuild/FlagTables/v12_CSharp.json9
-rw-r--r--Templates/MSBuild/FlagTables/v140_CSharp.json9
-rw-r--r--Templates/MSBuild/FlagTables/v141_CSharp.json9
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",