From 454b47ba0bd16a98b15896c732f9a4b91863b581 Mon Sep 17 00:00:00 2001 From: Stephan Szabo Date: Wed, 21 Nov 2018 13:32:54 -0800 Subject: VS: Fix MANIFESTUAC link flag map to .vcxproj elements Original header commit v3.10.0-rc1~97^2 Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order to map them correctly to `.vcxproj` elements. Keep the old incorrect flag table entries for `uiAccess` and `level` flags for compatibility even though they do not really exist. Fixes: #16563 --- Templates/MSBuild/FlagTables/v10_Link.json | 25 ++++--------------------- Templates/MSBuild/FlagTables/v11_Link.json | 25 ++++--------------------- Templates/MSBuild/FlagTables/v12_Link.json | 25 ++++--------------------- Templates/MSBuild/FlagTables/v140_Link.json | 25 ++++--------------------- Templates/MSBuild/FlagTables/v141_Link.json | 25 ++++--------------------- 5 files changed, 20 insertions(+), 105 deletions(-) (limited to 'Templates') diff --git a/Templates/MSBuild/FlagTables/v10_Link.json b/Templates/MSBuild/FlagTables/v10_Link.json index 27003f8c23..ac5b8b16cc 100644 --- a/Templates/MSBuild/FlagTables/v10_Link.json +++ b/Templates/MSBuild/FlagTables/v10_Link.json @@ -531,22 +531,15 @@ "value": "true", "flags": [] }, - { - "name": "EnableUAC", - "switch": "MANIFESTUAC:NO", - "comment": "Enable User Account Control (UAC)", - "value": "false", - "flags": [] - }, { "name": "EnableUAC", "switch": "MANIFESTUAC:", - "comment": "Enable User Account Control (UAC)", - "value": "true", + "comment": "", + "value": "", "flags": [ "UserValue", - "UserIgnored", - "Continue" + "UserRequired", + "SpaceAppendable" ] }, { @@ -559,16 +552,6 @@ "UserRequired" ] }, - { - "name": "UACUIAccess", - "switch": "MANIFESTUAC:", - "comment": "UAC Bypass UI Protection", - "value": "true", - "flags": [ - "UserValue", - "UserRequired" - ] - }, { "name": "UACUIAccess", "switch": "uiAccess='false'", diff --git a/Templates/MSBuild/FlagTables/v11_Link.json b/Templates/MSBuild/FlagTables/v11_Link.json index 75b9b196f6..5d5c13f219 100644 --- a/Templates/MSBuild/FlagTables/v11_Link.json +++ b/Templates/MSBuild/FlagTables/v11_Link.json @@ -594,22 +594,15 @@ "value": "true", "flags": [] }, - { - "name": "EnableUAC", - "switch": "MANIFESTUAC:NO", - "comment": "Enable User Account Control (UAC)", - "value": "false", - "flags": [] - }, { "name": "EnableUAC", "switch": "MANIFESTUAC:", - "comment": "Enable User Account Control (UAC)", - "value": "true", + "comment": "", + "value": "", "flags": [ "UserValue", - "UserIgnored", - "Continue" + "UserRequired", + "SpaceAppendable" ] }, { @@ -622,16 +615,6 @@ "UserRequired" ] }, - { - "name": "UACUIAccess", - "switch": "MANIFESTUAC:", - "comment": "UAC Bypass UI Protection", - "value": "true", - "flags": [ - "UserValue", - "UserRequired" - ] - }, { "name": "UACUIAccess", "switch": "uiAccess='false'", diff --git a/Templates/MSBuild/FlagTables/v12_Link.json b/Templates/MSBuild/FlagTables/v12_Link.json index 75b9b196f6..5d5c13f219 100644 --- a/Templates/MSBuild/FlagTables/v12_Link.json +++ b/Templates/MSBuild/FlagTables/v12_Link.json @@ -594,22 +594,15 @@ "value": "true", "flags": [] }, - { - "name": "EnableUAC", - "switch": "MANIFESTUAC:NO", - "comment": "Enable User Account Control (UAC)", - "value": "false", - "flags": [] - }, { "name": "EnableUAC", "switch": "MANIFESTUAC:", - "comment": "Enable User Account Control (UAC)", - "value": "true", + "comment": "", + "value": "", "flags": [ "UserValue", - "UserIgnored", - "Continue" + "UserRequired", + "SpaceAppendable" ] }, { @@ -622,16 +615,6 @@ "UserRequired" ] }, - { - "name": "UACUIAccess", - "switch": "MANIFESTUAC:", - "comment": "UAC Bypass UI Protection", - "value": "true", - "flags": [ - "UserValue", - "UserRequired" - ] - }, { "name": "UACUIAccess", "switch": "uiAccess='false'", diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json index c2a18ef55a..3fb072c506 100644 --- a/Templates/MSBuild/FlagTables/v140_Link.json +++ b/Templates/MSBuild/FlagTables/v140_Link.json @@ -637,22 +637,15 @@ "value": "true", "flags": [] }, - { - "name": "EnableUAC", - "switch": "MANIFESTUAC:NO", - "comment": "Enable User Account Control (UAC)", - "value": "false", - "flags": [] - }, { "name": "EnableUAC", "switch": "MANIFESTUAC:", - "comment": "Enable User Account Control (UAC)", - "value": "true", + "comment": "", + "value": "", "flags": [ "UserValue", - "UserIgnored", - "Continue" + "UserRequired", + "SpaceAppendable" ] }, { @@ -665,16 +658,6 @@ "UserRequired" ] }, - { - "name": "UACUIAccess", - "switch": "MANIFESTUAC:", - "comment": "UAC Bypass UI Protection", - "value": "true", - "flags": [ - "UserValue", - "UserRequired" - ] - }, { "name": "UACUIAccess", "switch": "uiAccess='false'", diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json index d5144c8024..66ee76fcb4 100644 --- a/Templates/MSBuild/FlagTables/v141_Link.json +++ b/Templates/MSBuild/FlagTables/v141_Link.json @@ -644,22 +644,15 @@ "value": "true", "flags": [] }, - { - "name": "EnableUAC", - "switch": "MANIFESTUAC:NO", - "comment": "Enable User Account Control (UAC)", - "value": "false", - "flags": [] - }, { "name": "EnableUAC", "switch": "MANIFESTUAC:", - "comment": "Enable User Account Control (UAC)", - "value": "true", + "comment": "", + "value": "", "flags": [ "UserValue", - "UserIgnored", - "Continue" + "UserRequired", + "SpaceAppendable" ] }, { @@ -672,16 +665,6 @@ "UserRequired" ] }, - { - "name": "UACUIAccess", - "switch": "MANIFESTUAC:", - "comment": "UAC Bypass UI Protection", - "value": "true", - "flags": [ - "UserValue", - "UserRequired" - ] - }, { "name": "UACUIAccess", "switch": "uiAccess='false'", -- cgit v1.2.1