From 4b8d88112ae23f1759b3c94586d4918035efab86 Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:34:49 -0700 Subject: [PATCH 01/10] Builds and tests pass with SARIF sdk newtonsoft updates. --- Src/sarif-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/sarif-sdk b/Src/sarif-sdk index ce8c5cb1..23d1f216 160000 --- a/Src/sarif-sdk +++ b/Src/sarif-sdk @@ -1 +1 @@ -Subproject commit ce8c5cb12d29aa407d0bf98f5fa2c764ec7fb65b +Subproject commit 23d1f216956f5db9e48ab84d64dbdfe3a85a3963 From 2a075c16ffce26bd3443e4f900d1ed22175c7629 Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:52:53 -0700 Subject: [PATCH 02/10] Update Microsoft.NET.Test.Sdk to v17.4.0-preview-20220707-01 --- Src/Strings.Interop/Strings.Interop.csproj | 6 +++++- .../Test.UnitTests.Sarif.PatternMatcher.Cli.csproj | 1 + .../Test.UnitTests.Sarif.PatternMatcher.Function.csproj | 1 + .../Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj | 1 + .../Test.UnitTests.Sarif.PatternMatcher.csproj | 1 + .../Test.UnitTests.Strings.Interop.csproj | 6 +++++- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Src/Strings.Interop/Strings.Interop.csproj b/Src/Strings.Interop/Strings.Interop.csproj index 2a4b1331..3f1ec0b2 100644 --- a/Src/Strings.Interop/Strings.Interop.csproj +++ b/Src/Strings.Interop/Strings.Interop.csproj @@ -2,11 +2,15 @@ - + String8 Library Specialized types for seamless handling of UTF8 and UTF16 strings. Microsoft.Strings.Interop Microsoft Strings Interop + + + + diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj index ec3b7597..61fa4f67 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj @@ -20,6 +20,7 @@ + diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj index 8dcecad9..7a3a8f7f 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj @@ -5,6 +5,7 @@ + diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj index b2e61cb7..e04cfca6 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj @@ -10,6 +10,7 @@ + diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj index be1bb549..e2d8c84b 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj @@ -10,6 +10,7 @@ + diff --git a/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj b/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj index 36dfefd5..5e317451 100644 --- a/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj +++ b/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj @@ -6,7 +6,11 @@ Microsoft.Strings.Interop - + + + + + From 169786f6cc7311196f4c893219368b9a1ca3e730 Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Wed, 20 Jul 2022 17:12:53 -0700 Subject: [PATCH 03/10] More Microsoft.NET.Test.Sdk updates --- .../Tests.AzureDevOpsConfiguration.csproj | 1 + .../Tests.SalModernization/Tests.SalModernization.csproj | 4 ++++ Src/Plugins/Tests.Security/Tests.Security.csproj | 1 + .../Test.UnitTests.RE2.Managed.csproj | 1 + 4 files changed, 7 insertions(+) diff --git a/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj b/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj index b5c7347b..61567d8a 100644 --- a/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj +++ b/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj @@ -9,6 +9,7 @@ + diff --git a/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj b/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj index 3195b040..73c9031c 100644 --- a/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj +++ b/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj @@ -7,6 +7,10 @@ $(RootNamespaceBase).Sarif.PatternMatcher.Plugins.SalModernization + + + + diff --git a/Src/Plugins/Tests.Security/Tests.Security.csproj b/Src/Plugins/Tests.Security/Tests.Security.csproj index 5e7c463c..9bd4c1aa 100644 --- a/Src/Plugins/Tests.Security/Tests.Security.csproj +++ b/Src/Plugins/Tests.Security/Tests.Security.csproj @@ -15,6 +15,7 @@ + diff --git a/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj b/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj index 295c6a27..19a6fe1a 100644 --- a/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj +++ b/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj @@ -13,5 +13,6 @@ + From fa3b43006d4dac1de33665e8d2bce20a6b21c81b Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Wed, 20 Jul 2022 20:43:25 -0700 Subject: [PATCH 04/10] Fix build error --- Targets/build.test.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Targets/build.test.props b/Targets/build.test.props index f484a000..aeeeaec0 100644 --- a/Targets/build.test.props +++ b/Targets/build.test.props @@ -1,7 +1,7 @@ - + From 805f9b44120a64a6e023cb410f1ca513081a8854 Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Thu, 21 Jul 2022 11:53:30 -0700 Subject: [PATCH 05/10] Rearranging test nuget dependencies. --- .../Tests.AzureDevOpsConfiguration.csproj | 1 - .../Tests.SalModernization/Tests.SalModernization.csproj | 4 ---- Src/Plugins/Tests.Security/Tests.Security.csproj | 1 - Src/Strings.Interop/Strings.Interop.csproj | 5 ----- .../Test.UnitTests.RE2.Managed.csproj | 1 - .../Test.UnitTests.Sarif.PatternMatcher.Cli.csproj | 1 - .../Test.UnitTests.Sarif.PatternMatcher.Function.csproj | 1 - .../Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj | 1 - .../Test.UnitTests.Sarif.PatternMatcher.csproj | 1 - .../Test.UnitTests.Strings.Interop.csproj | 4 ---- 10 files changed, 20 deletions(-) diff --git a/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj b/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj index 61567d8a..b5c7347b 100644 --- a/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj +++ b/Src/Plugins/Tests.AzureDevOpsConfiguration/Tests.AzureDevOpsConfiguration.csproj @@ -9,7 +9,6 @@ - diff --git a/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj b/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj index 73c9031c..3195b040 100644 --- a/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj +++ b/Src/Plugins/Tests.SalModernization/Tests.SalModernization.csproj @@ -7,10 +7,6 @@ $(RootNamespaceBase).Sarif.PatternMatcher.Plugins.SalModernization - - - - diff --git a/Src/Plugins/Tests.Security/Tests.Security.csproj b/Src/Plugins/Tests.Security/Tests.Security.csproj index 9bd4c1aa..5e7c463c 100644 --- a/Src/Plugins/Tests.Security/Tests.Security.csproj +++ b/Src/Plugins/Tests.Security/Tests.Security.csproj @@ -15,7 +15,6 @@ - diff --git a/Src/Strings.Interop/Strings.Interop.csproj b/Src/Strings.Interop/Strings.Interop.csproj index 3f1ec0b2..b73daf4a 100644 --- a/Src/Strings.Interop/Strings.Interop.csproj +++ b/Src/Strings.Interop/Strings.Interop.csproj @@ -2,15 +2,10 @@ - String8 Library Specialized types for seamless handling of UTF8 and UTF16 strings. Microsoft.Strings.Interop Microsoft Strings Interop - - - - diff --git a/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj b/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj index 19a6fe1a..295c6a27 100644 --- a/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj +++ b/Src/Test.UnitTests.RE2.Managed/Test.UnitTests.RE2.Managed.csproj @@ -13,6 +13,5 @@ - diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj index 61fa4f67..ec3b7597 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher.Cli/Test.UnitTests.Sarif.PatternMatcher.Cli.csproj @@ -20,7 +20,6 @@ - diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj index 7a3a8f7f..8dcecad9 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher.Function/Test.UnitTests.Sarif.PatternMatcher.Function.csproj @@ -5,7 +5,6 @@ - diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj index e04cfca6..b2e61cb7 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher.Sdk/Test.UnitTests.Sarif.PatternMatcher.Sdk.csproj @@ -10,7 +10,6 @@ - diff --git a/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj b/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj index e2d8c84b..be1bb549 100644 --- a/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj +++ b/Src/Test.UnitTests.Sarif.PatternMatcher/Test.UnitTests.Sarif.PatternMatcher.csproj @@ -10,7 +10,6 @@ - diff --git a/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj b/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj index 5e317451..28380b07 100644 --- a/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj +++ b/Src/Test.UnitTests.Strings.Interop/Test.UnitTests.Strings.Interop.csproj @@ -7,10 +7,6 @@ Microsoft.Strings.Interop - - - - From 51dfd95098592f3bd4b976228b5769c6c6ea5db8 Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Thu, 21 Jul 2022 11:53:44 -0700 Subject: [PATCH 06/10] Update sarif-sdk to current main. --- Src/sarif-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/sarif-sdk b/Src/sarif-sdk index 23d1f216..41c12efe 160000 --- a/Src/sarif-sdk +++ b/Src/sarif-sdk @@ -1 +1 @@ -Subproject commit 23d1f216956f5db9e48ab84d64dbdfe3a85a3963 +Subproject commit 41c12efef265094d9fb0dcf35eb890fc35079337 From faa4e69dc7363504357ef04d82089be197a6fdaf Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Thu, 21 Jul 2022 13:49:48 -0700 Subject: [PATCH 07/10] Partial update to release history. Full update pending next pull from sarif-sdk main. --- Src/ReleaseHistory.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Src/ReleaseHistory.md b/Src/ReleaseHistory.md index 02bd4732..4d542867 100644 --- a/Src/ReleaseHistory.md +++ b/Src/ReleaseHistory.md @@ -16,6 +16,9 @@ - UER => eliminate unhandled exceptions in rules - UEE => eliminate unhandled exceptions in engine +## Unreleased +* Bump Sarif.Sdk from 2.4.15 to [2.4.16]() by updating submodule to commit []()in response to [Advisory: Improper Handling of Exceptional Conditions in Newtonsoft.Json](https://github.com/advisories/GHSA-5crp-9r3c-p9vr). [#627](https://github.com/microsoft/sarif-pattern-matcher/pull/627) + ## *v1.10.0* - FEATURE: Enable response file parsing provided by driver framework. Arguments (e.g., '@Commands.rsp') prefixed with a '@' character will be evaluated as a file path to a text file that contains commands to be injected on the command-line. From 1ac1eb23f6dc0cc9cf6f2da09e5658333480e4ae Mon Sep 17 00:00:00 2001 From: marmegh <30842915+marmegh@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:21:00 -0700 Subject: [PATCH 08/10] Update sarif.sdk to current main. --- Src/sarif-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/sarif-sdk b/Src/sarif-sdk index 41c12efe..698adb63 160000 --- a/Src/sarif-sdk +++ b/Src/sarif-sdk @@ -1 +1 @@ -Subproject commit 41c12efef265094d9fb0dcf35eb890fc35079337 +Subproject commit 698adb6365a242c6bb75adde56e3bd4be39c21d7 From 598474005bc043df1c9f8ee3a62c03afd990149b Mon Sep 17 00:00:00 2001 From: "Michael C. Fanning" Date: Mon, 25 Jul 2022 14:17:07 -0700 Subject: [PATCH 09/10] Update ReleaseHistory.md Add links --- Src/ReleaseHistory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/ReleaseHistory.md b/Src/ReleaseHistory.md index 79052208..dbd9b040 100644 --- a/Src/ReleaseHistory.md +++ b/Src/ReleaseHistory.md @@ -20,7 +20,7 @@ - BUG: Resolve `OutofMemoryException` and `NullReferenceException' failures resulting from a failure to honor file size scan limits set by `--file-size-in-kb` argument and updated Sarif.Sdk submodule to commit [ce8c5cb12d29aa407d0bf98f5fa2c764ec7fb65b](https://github.com/microsoft/sarif-sdk/commit/ce8c5cb12d29aa407d0bf98f5fa2c764ec7fb65b). [#621](https://github.com/microsoft/sarif-pattern-matcher/pull/621) - BUG: Resolve SAL Modernization Plugin capture group showing incorrect region properties in SARIF. [#626](https://github.com/microsoft/sarif-pattern-matcher/pull/626) -- Bump Sarif.Sdk from 2.4.15 to [2.4.16]() by updating submodule to commit []()in response to [Advisory: Improper Handling of Exceptional Conditions in Newtonsoft.Json](https://github.com/advisories/GHSA-5crp-9r3c-p9vr). [#627](https://github.com/microsoft/sarif-pattern-matcher/pull/627) +- Bump Sarif.Sdk from 2.4.15 to [2.4.16](https://github.com/microsoft/sarif-sdk/blob/v2.4.16/src/ReleaseHistory.md) by updating submodule to commit [698adb6365a242c6bb75adde56e3bd4be39c21d7](https://github.com/microsoft/sarif-sdk/commit/698adb6365a242c6bb75adde56e3bd4be39c21d7)in response to [Advisory: Improper Handling of Exceptional Conditions in Newtonsoft.Json](https://github.com/advisories/GHSA-5crp-9r3c-p9vr). [#627](https://github.com/microsoft/sarif-pattern-matcher/pull/627) ## *v1.10.0* From fe550b4e5968f7e17e77296e2ed3ad939d4f0eef Mon Sep 17 00:00:00 2001 From: "Michael C. Fanning" Date: Mon, 25 Jul 2022 14:17:51 -0700 Subject: [PATCH 10/10] Update ReleaseHistory.md --- Src/ReleaseHistory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/ReleaseHistory.md b/Src/ReleaseHistory.md index dbd9b040..61855e50 100644 --- a/Src/ReleaseHistory.md +++ b/Src/ReleaseHistory.md @@ -20,7 +20,7 @@ - BUG: Resolve `OutofMemoryException` and `NullReferenceException' failures resulting from a failure to honor file size scan limits set by `--file-size-in-kb` argument and updated Sarif.Sdk submodule to commit [ce8c5cb12d29aa407d0bf98f5fa2c764ec7fb65b](https://github.com/microsoft/sarif-sdk/commit/ce8c5cb12d29aa407d0bf98f5fa2c764ec7fb65b). [#621](https://github.com/microsoft/sarif-pattern-matcher/pull/621) - BUG: Resolve SAL Modernization Plugin capture group showing incorrect region properties in SARIF. [#626](https://github.com/microsoft/sarif-pattern-matcher/pull/626) -- Bump Sarif.Sdk from 2.4.15 to [2.4.16](https://github.com/microsoft/sarif-sdk/blob/v2.4.16/src/ReleaseHistory.md) by updating submodule to commit [698adb6365a242c6bb75adde56e3bd4be39c21d7](https://github.com/microsoft/sarif-sdk/commit/698adb6365a242c6bb75adde56e3bd4be39c21d7)in response to [Advisory: Improper Handling of Exceptional Conditions in Newtonsoft.Json](https://github.com/advisories/GHSA-5crp-9r3c-p9vr). [#627](https://github.com/microsoft/sarif-pattern-matcher/pull/627) +- Bump Sarif.Sdk from 2.4.15 to [2.4.16](https://github.com/microsoft/sarif-sdk/blob/v2.4.16/src/ReleaseHistory.md) by updating submodule to commit [698adb6365a242c6bb75adde56e3bd4be39c21d7](https://github.com/microsoft/sarif-sdk/commit/698adb6365a242c6bb75adde56e3bd4be39c21d7) in response to [Advisory: Improper Handling of Exceptional Conditions in Newtonsoft.Json](https://github.com/advisories/GHSA-5crp-9r3c-p9vr). [#627](https://github.com/microsoft/sarif-pattern-matcher/pull/627) ## *v1.10.0*