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..b951f23e 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 @@ -41,14 +41,14 @@ - + - + - - - - + + + + @@ -62,7 +62,7 @@ - - + + \ No newline at end of file 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..9db768ab 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 @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - - + + 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..f9ea2d18 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,14 +10,14 @@ 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..ec1a0660 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 @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - - + + 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..b9cb9c62 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 @@ -12,13 +12,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + +