From 9b49c6cada9ad3eb41286d7fbbcf19141b4a7e90 Mon Sep 17 00:00:00 2001 From: Gabe Stocco <98900+gfs@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:53:59 -0800 Subject: [PATCH 1/4] Convert Detect Cryptography tool to use Application Inspector --- .../DetectCryptographyTool.cs | 58 ++++++++++++------- src/oss-detect-cryptography/Issue.cs | 22 +++++++ .../oss-detect-cryptography.csproj | 6 +- src/oss-tests/DetectCryptographyTests.cs | 3 +- 4 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 src/oss-detect-cryptography/Issue.cs diff --git a/src/oss-detect-cryptography/DetectCryptographyTool.cs b/src/oss-detect-cryptography/DetectCryptographyTool.cs index 2a8c36b6..ab57dcbf 100644 --- a/src/oss-detect-cryptography/DetectCryptographyTool.cs +++ b/src/oss-detect-cryptography/DetectCryptographyTool.cs @@ -3,7 +3,6 @@ using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.CSharp; using Microsoft.CST.OpenSource.Shared; -using Microsoft.DevSkim; using PeNet; using SharpDisasm; using System; @@ -18,6 +17,8 @@ using WebAssembly.Instructions; using Microsoft.ApplicationInspector.Commands; using static Crayon.Output; +using Microsoft.ApplicationInspector.RulesEngine; +using Microsoft.CST.RecursiveExtractor; namespace Microsoft.CST.OpenSource { @@ -124,7 +125,7 @@ private static async Task Main(string[] args) sb.AppendLine("Summary Results:"); sb.AppendLine(Blue("Cryptographic Implementations:")); - var implementations = results.SelectMany(r => r.Issue.Rule.Tags ?? new List()) + var implementations = results.SelectMany(r => r.Issue.Rule.Tags ?? Array.Empty()) .Distinct() .Where(t => t.StartsWith("Cryptography.Implementation.")) .Select(t => t.Replace("Cryptography.Implementation.", "")) @@ -143,7 +144,7 @@ private static async Task Main(string[] args) sb.AppendLine(); sb.AppendLine(Red("Cryptographic Library References:")); - var references = results.SelectMany(r => r.Issue.Rule.Tags ?? new List()) + var references = results.SelectMany(r => r.Issue.Rule.Tags ?? Array.Empty()) .Distinct() .Where(t => t.StartsWith("Cryptography.Reference.")) .Select(t => t.Replace("Cryptography.Reference.", "")) @@ -163,7 +164,7 @@ private static async Task Main(string[] args) sb.AppendLine(); sb.AppendLine(Green("Other Cryptographic Characteristics:")); - var characteristics = results.SelectMany(r => r.Issue.Rule.Tags ?? new List()) + var characteristics = results.SelectMany(r => r.Issue.Rule.Tags ?? Array.Empty()) .Distinct() .Where(t => t.Contains("Crypto", StringComparison.InvariantCultureIgnoreCase)&& !t.StartsWith("Cryptography.Implementation.") && @@ -414,7 +415,7 @@ public async Task> AnalyzeDirectory(string directory) var analysisResults = new List(); - RuleSet rules = new RuleSet(); + RuleSet rules = new RuleSet(null); if (Options["disable-default-rules"] is bool disableDefaultRules && !disableDefaultRules) { var assembly = Assembly.GetExecutingAssembly(); @@ -436,7 +437,7 @@ public async Task> AnalyzeDirectory(string directory) } // Add Appliation Inspector cryptography rules - assembly = typeof(ApplicationInspector.Commands.AnalyzeCommand).Assembly; + assembly = typeof(AnalyzeCommand).Assembly; foreach (var resourceName in assembly.GetManifestResourceNames()) { if (resourceName.EndsWith(".json")) @@ -465,12 +466,7 @@ public async Task> AnalyzeDirectory(string directory) Logger.Error("No rules were specified, unable to continue."); return analysisResults; // empty } - - var processor = new RuleProcessor(rules) - { - EnableSuppressions = false, - SeverityLevel = (Severity)31 - }; + var processor = new RuleProcessor(rules, new RuleProcessorOptions()); string[] fileList; @@ -530,12 +526,12 @@ public async Task> AnalyzeDirectory(string directory) Boundary: new Boundary(), StartLocation: new Location(), EndLocation: new Location(), - Rule: new Rule("Crypto Symbols") + Rule: new Rule() { Id = "_CRYPTO_DENSITY", Name = "Cryptographic symbols", Description = cryptoOperationLikelihood.ToString(), - Tags = new List() + Tags = new string[] { "Cryptography.GenericImplementation.HighDensityOperators" } @@ -545,8 +541,13 @@ public async Task> AnalyzeDirectory(string directory) } Logger.Debug($"Analyzing {filename}, length={buffer.Length}"); - Issue[]? fileResults = null; - var task = Task.Run(() => processor.Analyze(buffer, Language.FromFileName(filename))); + List? fileResults = null; + //processor.AnalyzeFile + var holderEntry = new FileEntry("placeholder", new MemoryStream(Encoding.UTF8.GetBytes(buffer))); + LanguageInfo languageInfo = new LanguageInfo(); + + Language.FromFileName(filename, ref languageInfo); + var task = Task.Run(() => processor.AnalyzeFile(holderEntry,languageInfo)); if (task.Wait(TimeSpan.FromSeconds(30))) { fileResults = task.Result; @@ -557,13 +558,13 @@ public async Task> AnalyzeDirectory(string directory) return analysisResults; } - Logger.Debug("Operation Complete: {0}", fileResults?.Length); - foreach (var issue in fileResults ?? Array.Empty()) + Logger.Debug("Operation Complete: {0}", fileResults?.Count); + foreach (var issue in fileResults ?? new List()) { var fileContentArray = buffer.Split(new[] { Environment.NewLine }, StringSplitOptions.None); var excerpt = new List(); - var startLoc = Math.Max(issue.StartLocation.Line - 1, 0); - var endLoc = Math.Min(issue.EndLocation.Line + 1, fileContentArray.Length - 1); + var startLoc = Math.Max(issue.StartLocationLine - 1, 0); + var endLoc = Math.Min(issue.EndLocationLine + 1, fileContentArray.Length - 1); for (int i = startLoc; i <= endLoc; i++) { excerpt.Add(fileContentArray[i].Trim()); @@ -572,8 +573,21 @@ public async Task> AnalyzeDirectory(string directory) analysisResults.Add(new IssueRecord( Filename: filename, Filesize: buffer.Length, - TextSample: issue.StartLocation.Line + " => " + string.Join(Environment.NewLine, excerpt), - Issue: issue) + TextSample: issue.StartLocationLine + " => " + string.Join(Environment.NewLine, excerpt), + Issue: new Issue( + issue.Boundary, + new Location() + { + Column = issue.StartLocationColumn, + Line = issue.StartLocationLine + }, + new Location() + { + Column = issue.EndLocationColumn, + Line = issue.EndLocationLine + }, + issue.Rule) + ) ); } } diff --git a/src/oss-detect-cryptography/Issue.cs b/src/oss-detect-cryptography/Issue.cs new file mode 100644 index 00000000..bdc52856 --- /dev/null +++ b/src/oss-detect-cryptography/Issue.cs @@ -0,0 +1,22 @@ +// Copyright (c) Microsoft Corporation. Licensed under the MIT License. + +namespace Microsoft.CST.OpenSource +{ + using Microsoft.ApplicationInspector.RulesEngine; + + public record Issue + { + public Boundary Boundary { get; } + public Location StartLocation { get; } + public Location EndLocation { get; } + public Rule Rule { get; } + + public Issue(Boundary Boundary, Location StartLocation, Location EndLocation, Rule Rule) + { + this.Boundary = Boundary; + this.StartLocation = StartLocation; + this.EndLocation = EndLocation; + this.Rule = Rule; + } + } +} \ No newline at end of file diff --git a/src/oss-detect-cryptography/oss-detect-cryptography.csproj b/src/oss-detect-cryptography/oss-detect-cryptography.csproj index ea41c85b..cea55e19 100644 --- a/src/oss-detect-cryptography/oss-detect-cryptography.csproj +++ b/src/oss-detect-cryptography/oss-detect-cryptography.csproj @@ -72,15 +72,11 @@ - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-tests/DetectCryptographyTests.cs b/src/oss-tests/DetectCryptographyTests.cs index a3fda8f8..c03ce65f 100644 --- a/src/oss-tests/DetectCryptographyTests.cs +++ b/src/oss-tests/DetectCryptographyTests.cs @@ -2,6 +2,7 @@ using Microsoft.CST.OpenSource.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -40,7 +41,7 @@ private async Task TestDetectCryptography(string purl, params string[] expectedT List? results = await detectCryptographyTool.AnalyzePackage(new PackageURL(purl), targetDirectoryName, false); IEnumerable? distinctTargets = expectedTags.Distinct(); - IEnumerable? distinctFindings = results.SelectMany(s => s.Issue.Rule.Tags ?? new List()) + IEnumerable? distinctFindings = results.SelectMany(s => s.Issue.Rule.Tags ?? Array.Empty()) .Where(s => s.StartsWith("Cryptography.Implementation")) .Distinct(); From edde5b2e7e73ce1726a43a0835a550f41161cdb2 Mon Sep 17 00:00:00 2001 From: Gabe Stocco <98900+gfs@users.noreply.github.com> Date: Fri, 10 Dec 2021 10:54:13 -0800 Subject: [PATCH 2/4] Update NBGV dependency --- Directory.Build.props | 2 +- src/Shared/Shared.csproj | 4 ---- src/oss-characteristics/oss-characteristic.csproj | 4 ---- src/oss-defog/oss-defog.csproj | 4 ---- src/oss-detect-backdoor/oss-detect-backdoor.csproj | 7 ------- src/oss-diff/oss-diff.csproj | 4 ---- src/oss-download/oss-download.csproj | 4 ---- src/oss-find-domain-squats/oss-find-domain-squats.csproj | 4 ---- src/oss-find-source/oss-find-source.csproj | 4 ---- src/oss-find-squats/oss-find-squats.csproj | 4 ---- src/oss-health/oss-health.csproj | 4 ---- src/oss-metadata/oss-metadata.csproj | 7 ------- src/oss-reproducible/oss-reproducible.csproj | 4 ---- src/oss-risk-calculator/oss-risk-calculator.csproj | 7 ------- src/oss-tests/oss-tests.csproj | 4 ---- 15 files changed, 1 insertion(+), 66 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 95a6843e..ac14b5c7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.3.37 + 3.4.244 all diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj index 6f890c06..8e217580 100644 --- a/src/Shared/Shared.csproj +++ b/src/Shared/Shared.csproj @@ -53,10 +53,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-characteristics/oss-characteristic.csproj b/src/oss-characteristics/oss-characteristic.csproj index 63f799c8..1ddcd1f6 100644 --- a/src/oss-characteristics/oss-characteristic.csproj +++ b/src/oss-characteristics/oss-characteristic.csproj @@ -30,10 +30,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-defog/oss-defog.csproj b/src/oss-defog/oss-defog.csproj index c80d98ca..3d297974 100644 --- a/src/oss-defog/oss-defog.csproj +++ b/src/oss-defog/oss-defog.csproj @@ -35,10 +35,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-detect-backdoor/oss-detect-backdoor.csproj b/src/oss-detect-backdoor/oss-detect-backdoor.csproj index 7d8a57d7..8e6f205a 100644 --- a/src/oss-detect-backdoor/oss-detect-backdoor.csproj +++ b/src/oss-detect-backdoor/oss-detect-backdoor.csproj @@ -74,13 +74,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/src/oss-diff/oss-diff.csproj b/src/oss-diff/oss-diff.csproj index 0ffe6336..7a123d37 100644 --- a/src/oss-diff/oss-diff.csproj +++ b/src/oss-diff/oss-diff.csproj @@ -36,10 +36,6 @@ - - - - diff --git a/src/oss-download/oss-download.csproj b/src/oss-download/oss-download.csproj index f8140802..5fabb3fe 100644 --- a/src/oss-download/oss-download.csproj +++ b/src/oss-download/oss-download.csproj @@ -33,10 +33,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-find-domain-squats/oss-find-domain-squats.csproj b/src/oss-find-domain-squats/oss-find-domain-squats.csproj index 4f58c989..472a6bfd 100644 --- a/src/oss-find-domain-squats/oss-find-domain-squats.csproj +++ b/src/oss-find-domain-squats/oss-find-domain-squats.csproj @@ -26,8 +26,4 @@ - - - - diff --git a/src/oss-find-source/oss-find-source.csproj b/src/oss-find-source/oss-find-source.csproj index a2c031a9..3a71d8eb 100644 --- a/src/oss-find-source/oss-find-source.csproj +++ b/src/oss-find-source/oss-find-source.csproj @@ -38,10 +38,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-find-squats/oss-find-squats.csproj b/src/oss-find-squats/oss-find-squats.csproj index 74e57c84..7da8da1e 100644 --- a/src/oss-find-squats/oss-find-squats.csproj +++ b/src/oss-find-squats/oss-find-squats.csproj @@ -31,10 +31,6 @@ - - - - diff --git a/src/oss-health/oss-health.csproj b/src/oss-health/oss-health.csproj index aeecb657..38056b57 100644 --- a/src/oss-health/oss-health.csproj +++ b/src/oss-health/oss-health.csproj @@ -35,10 +35,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/oss-metadata/oss-metadata.csproj b/src/oss-metadata/oss-metadata.csproj index 5340173f..6495e97e 100644 --- a/src/oss-metadata/oss-metadata.csproj +++ b/src/oss-metadata/oss-metadata.csproj @@ -30,13 +30,6 @@ false - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/src/oss-reproducible/oss-reproducible.csproj b/src/oss-reproducible/oss-reproducible.csproj index 005b284d..a7d165f1 100644 --- a/src/oss-reproducible/oss-reproducible.csproj +++ b/src/oss-reproducible/oss-reproducible.csproj @@ -82,10 +82,6 @@ - - - - diff --git a/src/oss-risk-calculator/oss-risk-calculator.csproj b/src/oss-risk-calculator/oss-risk-calculator.csproj index 6271c7ca..8c3a55e0 100644 --- a/src/oss-risk-calculator/oss-risk-calculator.csproj +++ b/src/oss-risk-calculator/oss-risk-calculator.csproj @@ -28,13 +28,6 @@ icon-128.png - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/src/oss-tests/oss-tests.csproj b/src/oss-tests/oss-tests.csproj index 8511d660..8c815d67 100644 --- a/src/oss-tests/oss-tests.csproj +++ b/src/oss-tests/oss-tests.csproj @@ -19,10 +19,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - From 47c4eae4b056491809373fa7c38e1d2c9a993ab2 Mon Sep 17 00:00:00 2001 From: Gabe Stocco <98900+gfs@users.noreply.github.com> Date: Fri, 10 Dec 2021 11:18:42 -0800 Subject: [PATCH 3/4] Bump to .net 6 --- Dockerfile | 26 +++++++++---------- ...dotnet-build-publish-all-platforms-job.yml | 2 +- Pipelines/templates/dotnet-test-job.yml | 2 +- Pipelines/templates/nuget-build-job.yml | 2 +- .../PackageManagers/GolangProjectManager.cs | 1 + src/Shared/Shared.csproj | 4 +-- .../oss-characteristic.csproj | 4 +-- src/oss-defog/oss-defog.csproj | 4 +-- .../oss-detect-backdoor.csproj | 4 +-- .../oss-detect-cryptography.csproj | 4 +-- src/oss-diff/oss-diff.csproj | 4 +-- src/oss-download/oss-download.csproj | 4 +-- .../oss-find-domain-squats.csproj | 4 +-- src/oss-find-source/oss-find-source.csproj | 4 +-- .../oss-find-squats-lib.csproj | 4 +-- src/oss-find-squats/oss-find-squats.csproj | 4 +-- src/oss-health/oss-health.csproj | 4 +-- src/oss-metadata/oss-metadata.csproj | 4 +-- src/oss-reproducible/oss-reproducible.csproj | 4 +-- .../oss-risk-calculator.csproj | 4 +-- src/oss-tests/oss-tests.csproj | 4 +-- 21 files changed, 49 insertions(+), 48 deletions(-) diff --git a/Dockerfile b/Dockerfile index 87c9a27c..89c4f750 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,19 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 +FROM mcr.microsoft.com/dotnet/sdk:6.0 COPY . /app/ WORKDIR /app/src RUN set -o errexit -o nounset \ && dotnet build \ - && ln --symbolic /app/src/oss-characteristics/bin/Debug/net5.0/oss-characteristic /usr/bin/oss-characteristic \ - && ln --symbolic /app/src/oss-defog/bin/Debug/net5.0/oss-defog /usr/bin/oss-defog \ - && ln --symbolic /app/src/oss-detect-backdoor/bin/Debug/net5.0/oss-detect-backdoor /usr/bin/oss-detect-backdoor \ - && ln --symbolic /app/src/oss-detect-cryptography/bin/Debug/net5.0/oss-detect-cryptography /usr/bin/oss-detect-cryptography \ - && ln --symbolic /app/src/oss-diff/bin/Debug/net5.0/oss-diff /usr/bin/oss-diff \ - && ln --symbolic /app/src/oss-download/bin/Debug/net5.0/oss-download /usr/bin/oss-download \ - && ln --symbolic /app/src/oss-find-domain-squats/bin/Debug/net5.0/oss-find-domain-squats /usr/bin/oss-find-domain-squats \ - && ln --symbolic /app/src/oss-find-source/bin/Debug/net5.0/oss-find-source /usr/bin/oss-find-source \ - && ln --symbolic /app/src/oss-find-squats/bin/Debug/net5.0/oss-find-squats /usr/bin/oss-find-squats \ - && ln --symbolic /app/src/oss-health/bin/Debug/net5.0/oss-health /usr/bin/oss-health \ - && ln --symbolic /app/src/oss-metadata/bin/Debug/net5.0/oss-metadata /usr/bin/oss-metadata \ - && ln --symbolic /app/src/oss-risk-calculator/bin/Debug/net5.0/oss-risk-calculator /usr/bin/oss-risk-calculator + && ln --symbolic /app/src/oss-characteristics/bin/Debug/net6.0/oss-characteristic /usr/bin/oss-characteristic \ + && ln --symbolic /app/src/oss-defog/bin/Debug/net6.0/oss-defog /usr/bin/oss-defog \ + && ln --symbolic /app/src/oss-detect-backdoor/bin/Debug/net6.0/oss-detect-backdoor /usr/bin/oss-detect-backdoor \ + && ln --symbolic /app/src/oss-detect-cryptography/bin/Debug/net6.0/oss-detect-cryptography /usr/bin/oss-detect-cryptography \ + && ln --symbolic /app/src/oss-diff/bin/Debug/net6.0/oss-diff /usr/bin/oss-diff \ + && ln --symbolic /app/src/oss-download/bin/Debug/net6.0/oss-download /usr/bin/oss-download \ + && ln --symbolic /app/src/oss-find-domain-squats/bin/Debug/net6.0/oss-find-domain-squats /usr/bin/oss-find-domain-squats \ + && ln --symbolic /app/src/oss-find-source/bin/Debug/net6.0/oss-find-source /usr/bin/oss-find-source \ + && ln --symbolic /app/src/oss-find-squats/bin/Debug/net6.0/oss-find-squats /usr/bin/oss-find-squats \ + && ln --symbolic /app/src/oss-health/bin/Debug/net6.0/oss-health /usr/bin/oss-health \ + && ln --symbolic /app/src/oss-metadata/bin/Debug/net6.0/oss-metadata /usr/bin/oss-metadata \ + && ln --symbolic /app/src/oss-risk-calculator/bin/Debug/net6.0/oss-risk-calculator /usr/bin/oss-risk-calculator # home directory of root user WORKDIR /root diff --git a/Pipelines/templates/dotnet-build-publish-all-platforms-job.yml b/Pipelines/templates/dotnet-build-publish-all-platforms-job.yml index 44c33691..c9bb1cfd 100644 --- a/Pipelines/templates/dotnet-build-publish-all-platforms-job.yml +++ b/Pipelines/templates/dotnet-build-publish-all-platforms-job.yml @@ -10,7 +10,7 @@ parameters: # Version of Dotnet SDK to use - name: dotnetVersion type: string - default: '5.0.x' + default: '6.0.x' # Include preview versions of Dotnet SDK - name: includePreviewVersions type: boolean diff --git a/Pipelines/templates/dotnet-test-job.yml b/Pipelines/templates/dotnet-test-job.yml index c7168e1c..67c29856 100644 --- a/Pipelines/templates/dotnet-test-job.yml +++ b/Pipelines/templates/dotnet-test-job.yml @@ -6,7 +6,7 @@ parameters: # Version of Dotnet SDK to use - name: dotnetVersion type: string - default: '5.0.x' + default: '6.0.x' # Should Dotnet SDK install preview versions? - name: includePreviewVersions type: boolean diff --git a/Pipelines/templates/nuget-build-job.yml b/Pipelines/templates/nuget-build-job.yml index 657465d9..b6fb615e 100644 --- a/Pipelines/templates/nuget-build-job.yml +++ b/Pipelines/templates/nuget-build-job.yml @@ -6,7 +6,7 @@ parameters: # Version of Dotnet SDK to use - name: dotnetVersion type: string - default: '5.0.x' + default: '6.0.x' # Should Dotnet SDK install preview versions? - name: includePreviewVersions type: boolean diff --git a/src/Shared/PackageManagers/GolangProjectManager.cs b/src/Shared/PackageManagers/GolangProjectManager.cs index a857cb19..87587867 100644 --- a/src/Shared/PackageManagers/GolangProjectManager.cs +++ b/src/Shared/PackageManagers/GolangProjectManager.cs @@ -2,6 +2,7 @@ namespace Microsoft.CST.OpenSource.Shared { + using Microsoft.CST.OpenSource.Model; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj index 8e217580..f9c951e4 100644 --- a/src/Shared/Shared.csproj +++ b/src/Shared/Shared.csproj @@ -1,14 +1,14 @@  - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Shared Functionality GitHub https://github.com/Microsoft/OSSGadget Debug;Release Shared - 9.0 + 10.0 enable © Microsoft Corporation. All rights reserved. Microsoft diff --git a/src/oss-characteristics/oss-characteristic.csproj b/src/oss-characteristics/oss-characteristic.csproj index 1ddcd1f6..8e9919ba 100644 --- a/src/oss-characteristics/oss-characteristic.csproj +++ b/src/oss-characteristics/oss-characteristic.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Characteristic Identifier GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.CharacteristicTool Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-defog/oss-defog.csproj b/src/oss-defog/oss-defog.csproj index 3d297974..80097478 100644 --- a/src/oss-defog/oss-defog.csproj +++ b/src/oss-defog/oss-defog.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Obfuscated String Detector GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.DefoggerTool Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-detect-backdoor/oss-detect-backdoor.csproj b/src/oss-detect-backdoor/oss-detect-backdoor.csproj index 8e6f205a..0cf5df79 100644 --- a/src/oss-detect-backdoor/oss-detect-backdoor.csproj +++ b/src/oss-detect-backdoor/oss-detect-backdoor.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Backdoor Identifier GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.DetectBackdoorTool Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-detect-cryptography/oss-detect-cryptography.csproj b/src/oss-detect-cryptography/oss-detect-cryptography.csproj index cea55e19..8af03ffd 100644 --- a/src/oss-detect-cryptography/oss-detect-cryptography.csproj +++ b/src/oss-detect-cryptography/oss-detect-cryptography.csproj @@ -2,13 +2,13 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Cryptography Detector GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.DetectCryptographyTool - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-diff/oss-diff.csproj b/src/oss-diff/oss-diff.csproj index 7a123d37..a44ac651 100644 --- a/src/oss-diff/oss-diff.csproj +++ b/src/oss-diff/oss-diff.csproj @@ -2,13 +2,13 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Package Differ GitHub https://github.com/Microsoft/OSSGadget Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-download/oss-download.csproj b/src/oss-download/oss-download.csproj index 5fabb3fe..512917dc 100644 --- a/src/oss-download/oss-download.csproj +++ b/src/oss-download/oss-download.csproj @@ -2,13 +2,13 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Package Downloader GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.DownloadTool - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-find-domain-squats/oss-find-domain-squats.csproj b/src/oss-find-domain-squats/oss-find-domain-squats.csproj index 472a6bfd..12e4097f 100644 --- a/src/oss-find-domain-squats/oss-find-domain-squats.csproj +++ b/src/oss-find-domain-squats/oss-find-domain-squats.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource Microsoft Corporation OSS Gadget - Domain Typosquatting Detector @@ -10,7 +10,7 @@ GitHub https://github.com/Microsoft/OSSGadget Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-find-source/oss-find-source.csproj b/src/oss-find-source/oss-find-source.csproj index 3a71d8eb..3119eaf3 100644 --- a/src/oss-find-source/oss-find-source.csproj +++ b/src/oss-find-source/oss-find-source.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Source Code Locator GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.FindSourceTool Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-find-squats-lib/oss-find-squats-lib.csproj b/src/oss-find-squats-lib/oss-find-squats-lib.csproj index 6f8b437c..9667470a 100644 --- a/src/oss-find-squats-lib/oss-find-squats-lib.csproj +++ b/src/oss-find-squats-lib/oss-find-squats-lib.csproj @@ -1,14 +1,14 @@ - net5.0 + net6.0 Microsoft.CST.OpenSource.FindSquats OSS Gadget - Package Typosquatting Detector Library GitHub https://github.com/Microsoft/OSSGadget Debug;Release oss-find-squats-lib - 9.0 + 10.0 enable © Microsoft Corporation. All rights reserved. Microsoft diff --git a/src/oss-find-squats/oss-find-squats.csproj b/src/oss-find-squats/oss-find-squats.csproj index 7da8da1e..f248f99d 100644 --- a/src/oss-find-squats/oss-find-squats.csproj +++ b/src/oss-find-squats/oss-find-squats.csproj @@ -2,13 +2,13 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Package Typosquatting Detector GitHub https://github.com/Microsoft/OSSGadget Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-health/oss-health.csproj b/src/oss-health/oss-health.csproj index 38056b57..c1947d3e 100644 --- a/src/oss-health/oss-health.csproj +++ b/src/oss-health/oss-health.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Project Health Estimator GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.HealthTool Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-metadata/oss-metadata.csproj b/src/oss-metadata/oss-metadata.csproj index 6495e97e..abb6ea0a 100644 --- a/src/oss-metadata/oss-metadata.csproj +++ b/src/oss-metadata/oss-metadata.csproj @@ -2,11 +2,11 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource enable OSS Gadget - Package Metadata Collector - 9.0 + 10.0 https://github.com/Microsoft/OSSGadget Github win-x64;osx-x64;linux-x64 diff --git a/src/oss-reproducible/oss-reproducible.csproj b/src/oss-reproducible/oss-reproducible.csproj index a7d165f1..5514d2e8 100644 --- a/src/oss-reproducible/oss-reproducible.csproj +++ b/src/oss-reproducible/oss-reproducible.csproj @@ -2,13 +2,13 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Package Reprodicibility Finder GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.ReproducibleTool - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-risk-calculator/oss-risk-calculator.csproj b/src/oss-risk-calculator/oss-risk-calculator.csproj index 8c3a55e0..ad2525f6 100644 --- a/src/oss-risk-calculator/oss-risk-calculator.csproj +++ b/src/oss-risk-calculator/oss-risk-calculator.csproj @@ -2,14 +2,14 @@ Exe - net5.0 + net6.0 Microsoft.CST.OpenSource OSS Gadget - Risk Calculator GitHub https://github.com/Microsoft/OSSGadget Microsoft.CST.OpenSource.RiskCalculatorTool Debug;Release - 9.0 + 10.0 enable win-x64;osx-x64;linux-x64 false diff --git a/src/oss-tests/oss-tests.csproj b/src/oss-tests/oss-tests.csproj index 8c815d67..fe730434 100644 --- a/src/oss-tests/oss-tests.csproj +++ b/src/oss-tests/oss-tests.csproj @@ -1,9 +1,9 @@  - net5.0 + net6.0 false - 9.0 + 10.0 enable From 9506d6fb9f5aca4a30fc7d3c23d9f30f98a8c211 Mon Sep 17 00:00:00 2001 From: Gabe Stocco <98900+gfs@users.noreply.github.com> Date: Fri, 10 Dec 2021 11:19:07 -0800 Subject: [PATCH 4/4] Bump Dependencies --- src/Shared/Shared.csproj | 16 ++++++++-------- src/oss-diff/oss-diff.csproj | 6 +++--- .../oss-find-domain-squats.csproj | 2 +- src/oss-reproducible/oss-reproducible.csproj | 6 +++--- src/oss-tests/oss-tests.csproj | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj index f9c951e4..b951f23e 100644 --- a/src/Shared/Shared.csproj +++ b/src/Shared/Shared.csproj @@ -41,14 +41,14 @@ - + - + - - - - + + + + @@ -62,7 +62,7 @@ - - + + \ No newline at end of file diff --git a/src/oss-diff/oss-diff.csproj b/src/oss-diff/oss-diff.csproj index a44ac651..9db768ab 100644 --- a/src/oss-diff/oss-diff.csproj +++ b/src/oss-diff/oss-diff.csproj @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - - + + diff --git a/src/oss-find-domain-squats/oss-find-domain-squats.csproj b/src/oss-find-domain-squats/oss-find-domain-squats.csproj index 12e4097f..f9ea2d18 100644 --- a/src/oss-find-domain-squats/oss-find-domain-squats.csproj +++ b/src/oss-find-domain-squats/oss-find-domain-squats.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/oss-reproducible/oss-reproducible.csproj b/src/oss-reproducible/oss-reproducible.csproj index 5514d2e8..ec1a0660 100644 --- a/src/oss-reproducible/oss-reproducible.csproj +++ b/src/oss-reproducible/oss-reproducible.csproj @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - - + + diff --git a/src/oss-tests/oss-tests.csproj b/src/oss-tests/oss-tests.csproj index fe730434..b9cb9c62 100644 --- a/src/oss-tests/oss-tests.csproj +++ b/src/oss-tests/oss-tests.csproj @@ -12,13 +12,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + +