From 9012654b158e774348e3e623e6ac9a11d5f536e1 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Wed, 15 Jan 2025 18:18:52 +0000 Subject: [PATCH 1/3] Update scancode to latest version --- eng/install-scancode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/install-scancode.sh b/eng/install-scancode.sh index c82c274ed018..eca6b8fbcd8b 100755 --- a/eng/install-scancode.sh +++ b/eng/install-scancode.sh @@ -5,7 +5,7 @@ set -euo pipefail # Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip # See latest release at https://github.com/nexB/scancode-toolkit/releases -SCANCODE_VERSION="32.2.1" +SCANCODE_VERSION="32.3.1" pyEnvPath="/tmp/scancode-env" python3 -m venv $pyEnvPath From eaaf35fa4c8e17f211743a85f09ceee1fa79328f Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 17 Jan 2025 18:33:22 +0000 Subject: [PATCH 2/3] Update image to 2204 --- src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml index d00e6450e0c2..163dbf7008df 100644 --- a/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml @@ -29,7 +29,7 @@ jobs: - job: Setup pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals 1es-ubuntu-2004 + demands: ImageOverride -equals 1es-ubuntu-2204 steps: - script: | vmrSrcDir="$(Build.SourcesDirectory)/src" @@ -65,7 +65,7 @@ jobs: dependsOn: Setup pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals 1es-ubuntu-2004 + demands: ImageOverride -equals 1es-ubuntu-2204 timeoutInMinutes: 420 strategy: matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ] @@ -145,7 +145,7 @@ jobs: condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release')) pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals 1es-ubuntu-2004 + demands: ImageOverride -equals 1es-ubuntu-2204 variables: - template: templates/variables/pipelines.yml steps: From 318b8f6df8b56d1af9d65a879e207402f7ca8938 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 17 Jan 2025 22:33:53 +0000 Subject: [PATCH 3/3] Resolve failures --- .../assets/LicenseExclusions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt index 4c044d9070fd..31f95c0df206 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseExclusions.txt @@ -74,6 +74,7 @@ src/format/THIRD-PARTY-NOTICES.TXT|unknown-license-reference # False positive src/fsharp/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs|unknown-license-reference +src/fsharp/tests/fsharp/core/members/ops/THIRD-PARTY-NOTICES.TXT|unknown-license-reference src/fsharp/tests/service/data/TestTP/ProvidedTypes.fs|unknown-license-reference src/fsharp/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs|unknown-license-reference @@ -122,6 +123,7 @@ src/nuget-client/test/TestExtensions/GenerateLicenseList/Program.cs|json src/nuget-client/test/**/resources/*.json src/nuget-client/test/**/resources/*.xml src/nuget-client/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/PackageLicenseUtilitiesTests.cs +src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs|389-exception src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValuesRuleTests.cs src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs @@ -180,6 +182,7 @@ src/runtime/src/mono/mono/mini/mini-posix.c|unknown-license-reference src/runtime/src/mono/mono/mini/mini-windows.c|unknown-license-reference src/runtime/src/native/external/libunwind/doc/libunwind-ia64.*|generic-exception src/runtime/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs|unknown-license-reference +src/runtime/src/tests/sizeondisk/sodbench/THIRD-PARTY-NOTICES.TXT|unknown-license-reference # Test data src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/InputSpace.cs|other-permissive