Skip to content

Commit b147026

Browse files
authored
[release/9.0.1xx] Update scancode to latest (#46004)
1 parent a0384c7 commit b147026

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

eng/install-scancode.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
# Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip
66

77
# See latest release at https://github.com/nexB/scancode-toolkit/releases
8-
SCANCODE_VERSION="32.2.1"
8+
SCANCODE_VERSION="32.3.2"
99

1010
pyEnvPath="/tmp/scancode-env"
1111
python3 -m venv $pyEnvPath

src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- job: Setup
4343
pool:
4444
name: NetCore1ESPool-Svc-Internal
45-
demands: ImageOverride -equals 1es-ubuntu-2004
45+
demands: ImageOverride -equals 1es-ubuntu-2204
4646
steps:
4747
- script: |
4848
vmrSrcDir="$(Build.SourcesDirectory)/src"
@@ -77,7 +77,7 @@ jobs:
7777
dependsOn: Setup
7878
pool:
7979
name: NetCore1ESPool-Svc-Internal
80-
demands: ImageOverride -equals 1es-ubuntu-2004
80+
demands: ImageOverride -equals 1es-ubuntu-2204
8181
timeoutInMinutes: 420
8282
strategy:
8383
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
@@ -163,7 +163,7 @@ jobs:
163163
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
164164
pool:
165165
name: NetCore1ESPool-Svc-Internal
166-
demands: ImageOverride -equals 1es-ubuntu-2004
166+
demands: ImageOverride -equals 1es-ubuntu-2204
167167
variables:
168168
- template: templates/variables/pipelines.yml
169169
steps:

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class LicenseScanTests : TestBase
5656
"bsd-original", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bsd-original.LICENSE
5757
"bsd-original-uc", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bsd-original-uc.LICENSE
5858
"bsd-simplified", // https://opensource.org/license/bsd-2-clause/
59+
"bsd-zero", // https://opensource.org/license/0bsd/
5960
"bytemark", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bytemark.LICENSE
6061
"bzip2-libbzip-2010", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/bzip2-libbzip-2010.LICENSE
6162
"cc0-1.0", // https://creativecommons.org/publicdomain/zero/1.0/legalcode
@@ -101,6 +102,7 @@ public class LicenseScanTests : TestBase
101102
"sax-pd", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/sax-pd.LICENSE
102103
"unicode", // https://opensource.org/license/unicode-inc-license-agreement-data-files-and-software/
103104
"unicode-mappings", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/unicode-mappings.LICENSE
105+
"unlicense", // https://opensource.org/license/unlicense/
104106
"uoi-ncsa", // https://opensource.org/license/uoi-ncsa-php/
105107
"w3c-software-19980720", // https://opensource.org/license/w3c/
106108
"w3c-software-doc-20150513", // https://opensource.org/license/w3c/

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ src/diagnostics/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
6666

6767
# False positive
6868
src/efcore/test/EfCore.Tests/ChangeTracking/ComplexPropertyEntryTest.cs|proprietary-license
69+
src/efcore/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs|proprietary-license
6970
src/efcore/test/EfCore.Tests/ChangeTracking/MemberEntryTest.cs|proprietary-license
71+
src/efcore/test/EFCore.Tests/ChangeTracking/PropertyEntryTest.cs|proprietary-license
7072

7173
#
7274
# fsharp
@@ -75,6 +77,9 @@ src/efcore/test/EfCore.Tests/ChangeTracking/MemberEntryTest.cs|proprietary-licen
7577
# Applies to installer, not source
7678
src/fsharp/setup/resources/eula/*.rtf
7779

80+
# False positive
81+
src/fsharp/tests/fsharp/core/members/ops/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
82+
7883
#
7984
# msbuild
8085
#
@@ -106,6 +111,7 @@ src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValue
106111
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs
107112
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs
108113
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseTests.cs
114+
src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs|389-exception
109115
src/nuget-client/test/TestUtilities/Test.Utility/JsonData.cs
110116

111117
#
@@ -245,11 +251,12 @@ src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontE
245251
src/wpf/eng/WpfArcadeSdk/tools/AvTrace/GenTraceSources.pl|proprietary-license
246252
src/wpf/eng/WpfArcadeSdk/tools/GenXmlStringTable.pl|proprietary-license
247253

248-
# False positive - https://github.com/dotnet/source-build/issues/4373
254+
# False positive
249255
src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/RMPublishingDialog.RightsTable.cs|unknown-license-reference
250256
src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/WindowBackdropType.cs|bsd-2-clause-views
251257
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/*.xaml|bsd-2-clause-views
252258
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/*.xaml|bsd-2-clause-views
253259
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|bsd-2-clause-views
254260
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|mpl-2.0
255261
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/*.xaml|bsd-2-clause-views
262+
src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/RightsManagementEncryptionTransform.cs|proprietary-license

0 commit comments

Comments
 (0)