Skip to content

Commit a47cbb8

Browse files
ellahathawaybaronfel
authored andcommitted
Update scancode to latest (dotnet#46108)
1 parent 5dd825e commit a47cbb8

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

eng/install-scancode.sh

+1-1
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/test/Microsoft.DotNet.SourceBuild.Tests/LicenseScanTests.cs

+2
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
@@ -103,6 +104,7 @@ public class LicenseScanTests : TestBase
103104
"sax-pd", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/sax-pd.LICENSE
104105
"unicode", // https://opensource.org/license/unicode-inc-license-agreement-data-files-and-software/
105106
"unicode-mappings", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/unicode-mappings.LICENSE
107+
"unlicense", // https://opensource.org/license/unlicense/
106108
"uoi-ncsa", // https://opensource.org/license/uoi-ncsa-php/
107109
"w3c-software-19980720", // https://opensource.org/license/w3c/
108110
"w3c-software-doc-20150513", // https://opensource.org/license/w3c/

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,17 @@ src/diagnostics/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
6868

6969
# False positive
7070
src/efcore/test/EfCore.Tests/ChangeTracking/ComplexPropertyEntryTest.cs|proprietary-license
71+
src/efcore/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs|proprietary-license
7172
src/efcore/test/EfCore.Tests/ChangeTracking/MemberEntryTest.cs|proprietary-license
73+
src/efcore/test/EFCore.Tests/ChangeTracking/PropertyEntryTest.cs|proprietary-license
7274

7375
#
7476
# fsharp
7577
#
7678

7779
# Applies to installer, not source
7880
src/fsharp/setup/resources/eula/*.rtf
81+
src/fsharp/tests/fsharp/core/members/ops/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
7982

8083
#
8184
# msbuild
@@ -108,6 +111,7 @@ src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValue
108111
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs
109112
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs
110113
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
111115
src/nuget-client/test/TestUtilities/Test.Utility/JsonData.cs
112116

113117
#
@@ -238,11 +242,15 @@ src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontE
238242
src/wpf/eng/WpfArcadeSdk/tools/AvTrace/GenTraceSources.pl|proprietary-license
239243
src/wpf/eng/WpfArcadeSdk/tools/GenXmlStringTable.pl|proprietary-license
240244

241-
# False positive - https://github.com/dotnet/source-build/issues/4373
245+
# False positive
242246
src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/Documents/RMPublishingDialog.RightsTable.cs|unknown-license-reference
243247
src/wpf/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/WindowBackdropType.cs|bsd-2-clause-views
244248
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/*.xaml|bsd-2-clause-views
245249
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/*.xaml|bsd-2-clause-views
246250
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|bsd-2-clause-views
247251
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|mpl-2.0
248252
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/*.xaml|bsd-2-clause-views
253+
src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/RightsManagementEncryptionTransform.cs|proprietary-license
254+
255+
# Test data
256+
src/wpf/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/System/Security/RightsManagement/PublishLicenseTests.cs|unknown-license-reference

0 commit comments

Comments
 (0)