From 0727e3e3418fa6e47f1ed622de3c97e1bae8e511 Mon Sep 17 00:00:00 2001 From: ByteDecoder Date: Wed, 14 Aug 2024 11:03:13 -0600 Subject: [PATCH] Nuget packages updated --- src/.config/dotnet-tools.json | 8 ++++--- src/Queryology.Abstractions/NuGetDefense.json | 18 ++++++++------- .../Queryology.Abstractions.csproj | 3 +-- src/Queryology.Example/NuGetDefense.json | 18 ++++++++------- .../Queryology.Example.csproj | 5 ++-- .../NuGetDefense.json | 18 ++++++++------- .../Queryology.Providers.ObjectDumper.csproj | 1 - src/Queryology.Tests/NuGetDefense.json | 12 ++++++++-- src/Queryology.Tests/Queryology.Tests.csproj | 10 ++++---- src/Queryology/NuGetDefense.json | 23 ++++++++++++------- src/Queryology/Queryology.csproj | 1 - src/global.json | 2 +- 12 files changed, 69 insertions(+), 50 deletions(-) diff --git a/src/.config/dotnet-tools.json b/src/.config/dotnet-tools.json index dc261e7..8f20197 100644 --- a/src/.config/dotnet-tools.json +++ b/src/.config/dotnet-tools.json @@ -6,13 +6,15 @@ "version": "5.6.7", "commands": [ "security-scan" - ] + ], + "rollForward": false }, "dotnet-reportgenerator-globaltool": { - "version": "5.2.5", + "version": "5.3.8", "commands": [ "reportgenerator" - ] + ], + "rollForward": false } } } \ No newline at end of file diff --git a/src/Queryology.Abstractions/NuGetDefense.json b/src/Queryology.Abstractions/NuGetDefense.json index 7cdbe75..10ca158 100644 --- a/src/Queryology.Abstractions/NuGetDefense.json +++ b/src/Queryology.Abstractions/NuGetDefense.json @@ -15,13 +15,9 @@ ], "IgnoredCvEs": [], "AllowedPackages": [], - "BlockedPackages": [] - }, - "GitHubAdvisoryDatabase": { - "ApiToken": "", - "Username": "", - "Enabled": false, - "BreakIfCannotRun": false + "WhiteListedPackages": [], + "BlockedPackages": [], + "BlacklistedPackages": [] }, "OssIndex": { "ApiToken": "", @@ -29,6 +25,12 @@ "Enabled": true, "BreakIfCannotRun": true }, + "GitHubAdvisoryDatabase": { + "ApiToken": "", + "Username": "", + "Enabled": false, + "BreakIfCannotRun": false + }, "NVD": { "SelfUpdate": false, "TimeoutInSeconds": 15, @@ -36,4 +38,4 @@ "BreakIfCannotRun": true }, "SensitivePackages": [] -} +} \ No newline at end of file diff --git a/src/Queryology.Abstractions/Queryology.Abstractions.csproj b/src/Queryology.Abstractions/Queryology.Abstractions.csproj index 57cd772..12b5f66 100644 --- a/src/Queryology.Abstractions/Queryology.Abstractions.csproj +++ b/src/Queryology.Abstractions/Queryology.Abstractions.csproj @@ -31,10 +31,9 @@ - + - diff --git a/src/Queryology.Example/NuGetDefense.json b/src/Queryology.Example/NuGetDefense.json index 7cdbe75..10ca158 100644 --- a/src/Queryology.Example/NuGetDefense.json +++ b/src/Queryology.Example/NuGetDefense.json @@ -15,13 +15,9 @@ ], "IgnoredCvEs": [], "AllowedPackages": [], - "BlockedPackages": [] - }, - "GitHubAdvisoryDatabase": { - "ApiToken": "", - "Username": "", - "Enabled": false, - "BreakIfCannotRun": false + "WhiteListedPackages": [], + "BlockedPackages": [], + "BlacklistedPackages": [] }, "OssIndex": { "ApiToken": "", @@ -29,6 +25,12 @@ "Enabled": true, "BreakIfCannotRun": true }, + "GitHubAdvisoryDatabase": { + "ApiToken": "", + "Username": "", + "Enabled": false, + "BreakIfCannotRun": false + }, "NVD": { "SelfUpdate": false, "TimeoutInSeconds": 15, @@ -36,4 +38,4 @@ "BreakIfCannotRun": true }, "SensitivePackages": [] -} +} \ No newline at end of file diff --git a/src/Queryology.Example/Queryology.Example.csproj b/src/Queryology.Example/Queryology.Example.csproj index e36b4c2..5df2639 100644 --- a/src/Queryology.Example/Queryology.Example.csproj +++ b/src/Queryology.Example/Queryology.Example.csproj @@ -12,14 +12,13 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - diff --git a/src/Queryology.Providers.ObjectDumper/NuGetDefense.json b/src/Queryology.Providers.ObjectDumper/NuGetDefense.json index 7cdbe75..10ca158 100644 --- a/src/Queryology.Providers.ObjectDumper/NuGetDefense.json +++ b/src/Queryology.Providers.ObjectDumper/NuGetDefense.json @@ -15,13 +15,9 @@ ], "IgnoredCvEs": [], "AllowedPackages": [], - "BlockedPackages": [] - }, - "GitHubAdvisoryDatabase": { - "ApiToken": "", - "Username": "", - "Enabled": false, - "BreakIfCannotRun": false + "WhiteListedPackages": [], + "BlockedPackages": [], + "BlacklistedPackages": [] }, "OssIndex": { "ApiToken": "", @@ -29,6 +25,12 @@ "Enabled": true, "BreakIfCannotRun": true }, + "GitHubAdvisoryDatabase": { + "ApiToken": "", + "Username": "", + "Enabled": false, + "BreakIfCannotRun": false + }, "NVD": { "SelfUpdate": false, "TimeoutInSeconds": 15, @@ -36,4 +38,4 @@ "BreakIfCannotRun": true }, "SensitivePackages": [] -} +} \ No newline at end of file diff --git a/src/Queryology.Providers.ObjectDumper/Queryology.Providers.ObjectDumper.csproj b/src/Queryology.Providers.ObjectDumper/Queryology.Providers.ObjectDumper.csproj index 335380b..881cf30 100644 --- a/src/Queryology.Providers.ObjectDumper/Queryology.Providers.ObjectDumper.csproj +++ b/src/Queryology.Providers.ObjectDumper/Queryology.Providers.ObjectDumper.csproj @@ -38,7 +38,6 @@ - diff --git a/src/Queryology.Tests/NuGetDefense.json b/src/Queryology.Tests/NuGetDefense.json index a220e77..10ca158 100644 --- a/src/Queryology.Tests/NuGetDefense.json +++ b/src/Queryology.Tests/NuGetDefense.json @@ -15,7 +15,9 @@ ], "IgnoredCvEs": [], "AllowedPackages": [], - "BlockedPackages": [] + "WhiteListedPackages": [], + "BlockedPackages": [], + "BlacklistedPackages": [] }, "OssIndex": { "ApiToken": "", @@ -23,6 +25,12 @@ "Enabled": true, "BreakIfCannotRun": true }, + "GitHubAdvisoryDatabase": { + "ApiToken": "", + "Username": "", + "Enabled": false, + "BreakIfCannotRun": false + }, "NVD": { "SelfUpdate": false, "TimeoutInSeconds": 15, @@ -30,4 +38,4 @@ "BreakIfCannotRun": true }, "SensitivePackages": [] -} +} \ No newline at end of file diff --git a/src/Queryology.Tests/Queryology.Tests.csproj b/src/Queryology.Tests/Queryology.Tests.csproj index ba39c21..5c338b1 100644 --- a/src/Queryology.Tests/Queryology.Tests.csproj +++ b/src/Queryology.Tests/Queryology.Tests.csproj @@ -8,9 +8,9 @@ ..\_stylecop\StyleCopRules.ruleset - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -18,13 +18,13 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + diff --git a/src/Queryology/NuGetDefense.json b/src/Queryology/NuGetDefense.json index 7cdbe75..a9c4351 100644 --- a/src/Queryology/NuGetDefense.json +++ b/src/Queryology/NuGetDefense.json @@ -15,13 +15,9 @@ ], "IgnoredCvEs": [], "AllowedPackages": [], - "BlockedPackages": [] - }, - "GitHubAdvisoryDatabase": { - "ApiToken": "", - "Username": "", - "Enabled": false, - "BreakIfCannotRun": false + "WhiteListedPackages": [], + "BlockedPackages": [], + "BlacklistedPackages": [] }, "OssIndex": { "ApiToken": "", @@ -29,11 +25,22 @@ "Enabled": true, "BreakIfCannotRun": true }, + "GitHubAdvisoryDatabase": { + "ApiToken": "", + "Username": "", + "Enabled": false, + "BreakIfCannotRun": false + }, "NVD": { "SelfUpdate": false, "TimeoutInSeconds": 15, "Enabled": true, "BreakIfCannotRun": true }, + "NvdApi": { + "ApiToken": "", + "Enabled": true, + "BreakIfCannotRun": true + }, "SensitivePackages": [] -} +} \ No newline at end of file diff --git a/src/Queryology/Queryology.csproj b/src/Queryology/Queryology.csproj index 36d5024..7de463b 100644 --- a/src/Queryology/Queryology.csproj +++ b/src/Queryology/Queryology.csproj @@ -35,7 +35,6 @@ - diff --git a/src/global.json b/src/global.json index e2138e0..bfca90d 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.200" + "version": "8.0.400" } } \ No newline at end of file