diff --git a/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj b/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj
index 4232b1ae5..6d3d2b0c9 100644
--- a/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj
+++ b/src/Test.FunctionalTests.Sarif/Test.FunctionalTests.Sarif.csproj
@@ -2816,6 +2816,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
@@ -2906,6 +2912,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
@@ -3552,21 +3564,6 @@
TextTemplatingFileGenerator
bannedAPIs.cs
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
TextTemplatingFileGenerator
AB_IrrelevantBranch.cpp.cs
diff --git a/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif b/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif
deleted file mode 100644
index 61de80281..000000000
--- a/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/FxCopExceptions-test.sarif
+++ /dev/null
@@ -1 +0,0 @@
-{"$schema":"https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.4.json","version":"2.1.0","runs":[{"results":[{"ruleId":"CA0001","message":{"text":"Engine exception: Microsoft.FxCop.Sdk.InvalidMetadataException: The following error was encountered while reading module 'ManagedPlayToReceiver': Could not resolve member reference: [Windows, Version=255.255.255.255, Culture=neutral, PublicKeyToken=null]Windows.UI.Xaml.SizeChangedEventArgs::get_PreviousSize. at Microsoft.FxCop.Sdk.Reader.HandleError(ModuleNode mod, String errorMessage) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 1048\n at Microsoft.FxCop.Sdk.Reader.GetMemberFromRef(Int32 i, TypeNodeCollection& varArgTypes, Int32 numGenericArgs) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 2408\n at Microsoft.FxCop.Sdk.Reader.GetMemberFromToken(Int32 tok, TypeNodeCollection& varArgTypes) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 2200\n at Microsoft.FxCop.Sdk.InstructionParser.ParseInstruction() in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\InstructionParser.cs:line 274\n at Microsoft.FxCop.Sdk.InstructionParser.ParseInstructions() in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\InstructionParser.cs:line 136\n at Microsoft.FxCop.Sdk.Reader.ParseMethodInstructions(Method method, Int32 methodIndex, Int32 RVA) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 3500\n at Microsoft.FxCop.Sdk.Reader.GetMethodInstructions(Method method, Object i) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 1973\n at Microsoft.FxCop.Sdk.Reader.GetMethodBody(Method method, Object i, Boolean asInstructionList) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 1910\n at Microsoft.FxCop.Sdk.Method.get_Instructions() in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Nodes\\Method.cs:line 251\n at Microsoft.FxCop.Sdk.RuleUtilities.HasImperativeSecurityAction(Method method, SecurityAction action) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\SDK\\RuleUtilities.cs:line 923\n at Microsoft.FxCop.Sdk.RuleUtilities.HasSecurityAction(Method method, SecurityAction action) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\SDK\\RuleUtilities.cs:line 870\n at Microsoft.FxCop.Sdk.RuleUtilities.HasSecurityAction(Method method, SecurityAction[] actions) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\SDK\\RuleUtilities.cs:line 880\n at Microsoft.FxCop.Engines.Introspection.LoadVisitor.RecordCallSites(Method caller) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 466\n at Microsoft.FxCop.Engines.Introspection.LoadVisitor.VisitMember(Member member, TargetMember target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 434\n at Microsoft.FxCop.Engines.Introspection.BaseVisitor.VisitMembers(MemberCollection members, TargetMemberDictionary targets, Boolean visitNestedTypes) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\BaseVisitor.cs:line 184\n at Microsoft.FxCop.Engines.Introspection.BaseVisitor.VisitType(TypeNode type, TargetType target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\BaseVisitor.cs:line 72\n at Microsoft.FxCop.Engines.Introspection.LoadVisitor.VisitType(TypeNode type, TargetType target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 417\n at Microsoft.FxCop.Engines.Introspection.BaseVisitor.VisitTypes(TypeNodeCollection types, TargetNamespaceDictionary targets) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\BaseVisitor.cs:line 131\n at Microsoft.FxCop.Engines.Introspection.LoadVisitor.VisitModule(ModuleNode module, TargetModule target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 394\n at Microsoft.FxCop.Engines.Introspection.BaseVisitor.VisitAssembly(AssemblyNode assembly, TargetFile target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\BaseVisitor.cs:line 37\n at Microsoft.FxCop.Engines.Introspection.LoadVisitor.VisitAssembly(AssemblyNode assembly, TargetFile target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 356\n at Microsoft.FxCop.Engines.Introspection.LoadVisitor.Load(TargetFile target, Boolean buildTree, Boolean queueItems, AssemblyNode loadedAssembly) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 179\n at Microsoft.FxCop.Engines.Introspection.LoadVisittor.LoadAssemblies(Queue queue, ExceptionCollection exceptions) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\LoadVisitor.cs:line 103."},"locations":[{}],"partialFingerprints":{"UniqueId":"Microsoft.FxCop.Sdk.InvalidMetadataException"}},{"ruleId":"CA0001","message":{"text":"Rule CA2001 exception: Microsoft.FxCop.Sdk.InvalidMetadataException: The following error was encountered while reading module 'ManagedPlayToReceiver': Could not resolve member reference: [Windows, Version=255.255.255.255, Culture=neutral, PublicKeyToken=null]Windows.UI.Xaml.SizeChangedEventArgs::get_PreviousSize. at Microsoft.FxCop.Sdk.Reader.HandleError(ModuleNode mod, String errorMessage) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 1048\n at Microsoft.FxCop.Sdk.Reader.GetMemberFromRef(Int32 i, TypeNodeCollection& varArgTypes, Int32 numGenericArgs) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 2408\n at Microsoft.FxCop.Sdk.Reader.GetMemberFromToken(Int32 tok, TypeNodeCollection& varArgTypes) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 2200\n at Microsoft.FxCop.Sdk.InstructionParser.ParseInstruction() in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\InstructionParser.cs:line 274\n at Microsoft.FxCop.Sdk.InstructionParser.ParseInstructions() in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\InstructionParser.cs:line 136\n at Microsoft.FxCop.Sdk.Reader.ParseMethodInstructions(Method method, Int32 methodIndex, Int32 RVA) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 3500\n at Microsoft.FxCop.Sdk.Reader.GetMethodInstructions(Method method, Object i) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 1973\n at Microsoft.FxCop.Sdk.Reader.GetMethodBody(Method method, Object i, Boolean asInstructionList) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Reader\\Reader.cs:line 1910\n at Microsoft.FxCop.Sdk.Method.get_Instructions() in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\BinaryReader\\Nodes\\Method.cs:line 251\n at Microsoft.FxCop.Rules.Reliability.AvoidCallingProblematicMethods.Check(Member member) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Rules\\Reliability\\AvoidCallingProblematicMethods.cs:line 76\n at Microsoft.FxCop.Engines.Introspection.AnalysisVisitor.CheckMember(Member memberToAnalyze, Member member, TargetMember target) in d:\\design\\src\\edev\\StaticAnalysis\\FxCop\\Source\\Engines\\Introspection\\AnalysisVisitor.cs:line 492."},"locations":[{}],"partialFingerprints":{"UniqueId":"ManagedPlayToReceiver.PlayToReceiverPage.#ImgPlayer_SizeChanged(System.Object,Windows.UI.Xaml.SizeChangedEventArgs)#Microsoft.FxCop.Sdk.InvalidMetadataException"}}],"tool":{"driver":{"name":"FxCop"}},"columnKind":"utf16CodeUnits"}]}
\ No newline at end of file
diff --git a/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/SarifSdkTest.xml.sarif b/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/SarifSdkTest.xml.sarif
index fc3218f9d..1b7250d38 100644
--- a/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/SarifSdkTest.xml.sarif
+++ b/src/Test.FunctionalTests.Sarif/v2/ConverterTestData/FxCop/SarifSdkTest.xml.sarif
@@ -3647,7 +3647,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -4016,7 +4016,7 @@
{
"ruleId": "CA3053",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -4530,7 +4530,7 @@
{
"ruleId": "CA3053",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -5906,7 +5906,7 @@
{
"ruleId": "CA3053",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -5975,7 +5975,7 @@
{
"ruleId": "CA1710",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -6222,7 +6222,7 @@
{
"ruleId": "CA1801",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -6257,7 +6257,7 @@
{
"ruleId": "CA1801",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -9748,7 +9748,7 @@
{
"ruleId": "CA5350",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -9780,7 +9780,7 @@
{
"ruleId": "CA5354",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -9846,7 +9846,7 @@
{
"ruleId": "CA5350",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -9951,7 +9951,7 @@
{
"ruleId": "CA5354",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -10056,7 +10056,7 @@
{
"ruleId": "CA2227",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -11015,7 +11015,7 @@
{
"ruleId": "CA1024",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -11249,7 +11249,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -11284,7 +11284,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -11319,7 +11319,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -11354,7 +11354,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -11682,7 +11682,7 @@
{
"ruleId": "CA3053",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -14672,7 +14672,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -15917,7 +15917,7 @@
{
"ruleId": "CA2227",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -18300,7 +18300,7 @@
{
"ruleId": "CA1726",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -18513,7 +18513,7 @@
{
"ruleId": "CA2227",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -18545,7 +18545,7 @@
{
"ruleId": "CA2227",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -18577,7 +18577,7 @@
{
"ruleId": "CA2227",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27071,7 +27071,7 @@
{
"ruleId": "CA1710",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27260,7 +27260,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27497,7 +27497,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27532,7 +27532,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27567,7 +27567,7 @@
{
"ruleId": "CA1045",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27602,7 +27602,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -27637,7 +27637,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28240,7 +28240,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28275,7 +28275,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28310,7 +28310,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28416,7 +28416,7 @@
{
"ruleId": "CA2104",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28448,7 +28448,7 @@
{
"ruleId": "CA1000",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28480,7 +28480,7 @@
{
"ruleId": "CA2215",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -28972,7 +28972,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -29007,7 +29007,7 @@
{
"ruleId": "CA1062",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -29334,7 +29334,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -30239,7 +30239,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{
@@ -30530,7 +30530,7 @@
{
"ruleId": "CA1811",
"message": {
- "text": "FxCop results that have been suppressed do not contain a message string."
+ "text": "FxCop does not provide messages for suppressed results."
},
"locations": [
{