From fb2e418c64d915b4d75f55f815e67923216def62 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 24 Jan 2019 11:48:10 -0500
Subject: [PATCH] VS: Fix `/analyze:log` flag mapping for v142

Apply the change from commit 44dc9fc48a (VS: Fix /analyze:log flag
mapping, 2018-11-26) to the v142 flag table.

The `/analyze:log` argument requires a value in the following argument.
Also drop the general `/analyze:` flag table entry so that such flags
will be passed through as plain additional options.  This is necessary
because some such options have following values and some do not but
not all have `.vcxproj` elements to hold the values.
---
 Templates/MSBuild/FlagTables/v142_CL.json | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index db85dd82db..437b711b8e 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -1056,13 +1056,12 @@
     ]
   },
   {
-    "name": "PREfastAdditionalOptions",
-    "switch": "analyze:",
-    "comment": "Additional Code Analysis Native options",
+    "name": "PREfastLog",
+    "switch": "analyze:log",
+    "comment": "Code Analysis Log",
     "value": "",
     "flags": [
-      "UserValue",
-      "SemicolonAppendable"
+      "UserFollowing"
     ]
   },
   {
@@ -1179,15 +1178,6 @@
       "UserRequired"
     ]
   },
-  {
-    "name": "PREfastLog",
-    "switch": "analyze:log",
-    "comment": "Code Analysis Log",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
   {
     "name": "ProcessorNumber",
     "switch": "MP",