Skip to content

Commit b3d8e04

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#49715)
2 parents a58fba3 + 2853802 commit b3d8e04

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

eng/install-scancode.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ 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.3.3"
8+
SCANCODE_VERSION="32.4.0"
99

1010
pyEnvPath="/tmp/scancode-env"
1111
python3 -m venv $pyEnvPath
1212
source $pyEnvPath/bin/activate
1313
pip install scancode-toolkit==$SCANCODE_VERSION
14-
pip install click==8.1.8
1514
deactivate
1615

1716
# Setup a script which executes scancode in the virtual environment

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

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
#
1414

1515
# False positive
16-
src/arcade/Documentation/UnifiedBuild/VMR-Permissible-Sources.md|free-unknown
17-
src/arcade/src/Microsoft.DotNet.XUnitAssert/src/README.md|free-unknown
16+
src/arcade/Documentation/UnifiedBuild/VMR-Permissible-Sources.md|free-unknown,unknown-license-reference
17+
src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright|unknown-license-reference
18+
src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright|unknown-license-reference
1819

1920
# Doesn't apply to code
2021
src/arcade/eng/xcopy-msbuild/msbuild.nuspec|ms-visual-2015-sdk
@@ -27,6 +28,9 @@ src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/eula.rtf
2728
# aspnetcore
2829
#
2930

31+
# False positive
32+
src/aspnetcore/src/Installers/Debian/tools/templates/debian/copyright|unknown-license-reference
33+
3034
# A generic statement about license applicability that is being detected as "unknown"
3135
src/aspnetcore/src/Components/THIRD-PARTY-NOTICES.txt|unknown
3236
src/aspnetcore/THIRD-PARTY-NOTICES.txt|unknown
@@ -37,7 +41,6 @@ src/aspnetcore/src/Installers/Windows/**/*.wxs|unknown-license-reference
3741

3842
# License reference used in configuration, but not applying to code
3943
src/aspnetcore/src/Mvc/Settings.StyleCop|unknown-license-reference
40-
src/aspnetcore/src/submodules/MessagePack-CSharp/stylecop.json|unknown
4144

4245
#
4346
# command-line-api
@@ -90,17 +93,20 @@ src/msbuild/src/Directory.Build.props|ms-net-library-2018-11
9093
# False positive
9194
src/msbuild/documentation/specs/BuildCheck/interactive-package-references.md|unknown-license-reference
9295
src/msbuild/src/Build/Instance/ProjectItemInstance.cs|generic-exception
96+
src/msbuild/src/Tasks/XamlRules/ProjectItemsSchema.xaml|unknown-license-reference
9397

9498
#
9599
# nuget-client
96100
#
97101

98102
# False positive
103+
src/nuget-client/.editorconfig|unknown-license-reference
99104
src/nuget-client/README.md|unknown-license-reference
100105
src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources.Designer.cs|unknown-license-reference
101106
src/nuget-client/src/NuGet.Clients/NuGet.PackageManagement.UI/Actions/UIActionEngine.cs|unknown-license-reference
102107
src/nuget-client/src/NuGet.Clients/NuGet.VisualStudio.Internal.Contracts/Formatters/LicenseMetadataFormatter.cs|proprietary-license
103108
src/nuget-client/src/NuGet.Core/NuGet.Packaging/Rules/DefaultManifestValuesRule.cs|unknown-license-reference
109+
src/nuget-client/scripts/utils/UpdateNuGetLicenseSPDXList.ps1|json
104110
src/nuget-client/test/TestExtensions/GenerateLicenseList/Program.cs|json
105111

106112
# Test data
@@ -111,6 +117,7 @@ src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValue
111117
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs
112118
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseExpressionParserTests.cs
113119
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/NuGetLicenseTests.cs
120+
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/NuspecReaderTests.cs|unknown-license-reference
114121
src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs|389-exception
115122
src/nuget-client/test/TestUtilities/Test.Utility/JsonData.cs
116123

@@ -126,7 +133,7 @@ src/roslyn-analyzers/assets/EULA.txt|ms-net-library
126133
#
127134

128135
# Test data
129-
src/roslyn/src/Analyzers/VisualBasic/Tests/FileHeaders/FileHeaderTests.vb|unknown-license-reference
136+
src/roslyn/src/Analyzers/*/Tests/FileHeaders/FileHeaderTests.*|unknown-license-reference
130137
src/roslyn/src/EditorFeatures/CSharpTest2/EmbeddedLanguages/RegularExpressions/Regex_RealWorldPatterns.json
131138

132139
# Applicable to installer, not source
@@ -153,20 +160,19 @@ src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs|ot
153160
src/runtime/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs|other-permissive
154161
src/runtime/src/libraries/System.Reflection.Metadata/tests/Resources/README.md|unknown-license-reference
155162
src/runtime/src/libraries/System.Security.Cryptography.Xml/src/System/Security/Cryptography/Xml/XmlLicenseTransform.cs|proprietary-license
156-
src/runtime/src/libraries/System.ServiceModel.Syndication/tests/BasicScenarioTests.cs|unknown-license-reference
157163
src/runtime/src/mono/mono/mini/mini-posix.c|unknown-license-reference
158164
src/runtime/src/mono/mono/mini/mini-windows.c|unknown-license-reference
159165
src/runtime/src/native/external/libunwind/doc/libunwind-ia64.*|generic-exception
160-
src/runtime/src/native/external/zlib-ng/cmake/detect-arch.cmake|unknown-license-reference
161-
src/runtime/src/native/external/zlib-ng/cmake/detect-coverage.cmake|other-permissive,tsl-2020,unknown-license-reference
162-
src/runtime/src/native/external/zlib-ng/cmake/detect-sanitizer.cmake|unknown-license-reference
166+
src/runtime/src/native/external/zlib-ng/cmake/detect-*|unknown-license-reference
167+
src/runtime/src/native/external/zlib-ng/cmake/detect-install-dirs.cmake|proprietary-license
168+
src/runtime/src/native/external/zlib-ng/cmake/fallback-macros.cmake|unknown-license-reference
163169
src/runtime/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs|unknown-license-reference
170+
src/runtime/src/tools/illink/.editorconfig|unknown-license-reference
164171

165172
# Test data
166173
src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/InputSpace.cs|other-permissive
167174
src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/THIRD-PARTY-NOTICE|other-permissive
168175
src/runtime/src/libraries/System.Runtime/tests/System.Runtime.Tests/TestModule/README.md|unknown-license-reference
169-
src/runtime/src/libraries/System.ServiceModel.Syndication/tests/TestFeeds/AtomFeeds/*.xml
170176

171177
# Reference to a license, not applicable to source
172178
src/runtime/src/libraries/System.Text.Json/roadmap/images/core-components.txt|unknown-license-reference
@@ -178,6 +184,9 @@ src/runtime/src/libraries/System.Text.Json/roadmap/images/higher-level-component
178184

179185
# False positive
180186
src/sdk/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
187+
src/sdk/src/Installer/redist-installer/packaging/deb/dotnet-debian_config.json|commercial-license
188+
src/sdk/src/Installer/redist-installer/packaging/rpm/dotnet-config.json|commercial-license
189+
src/sdk/src/Installer/redist-installer/packaging/rpm/templates/copyright|unknown-license-reference
181190

182191
# Configuration, doesn't apply to source directly
183192
src/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
@@ -187,14 +196,12 @@ src/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt
187196
#
188197

189198
# False positive
190-
src/source-build-externals/src/abstractions-xunit/README.md|free-unknown
191-
src/source-build-externals/src/application-insights/NETCORE/ThirdPartyNotices.txt|unknown
199+
src/source-build-externals/src/application-insights/NETCORE/ThirdPartyNotices.txt|unknown-license-reference
200+
src/source-build-externals/src/application-insights/WEB/ThirdPartyNotices.txt|unknown-license-reference
201+
src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.Validators/AadIssuerValidator/AadIssuerValidatorConstants.cs|cpl-1.0
192202
src/source-build-externals/src/humanizer/NuSpecs/*.nuspec*
193-
src/source-build-externals/src/xunit/README.md|free-unknown
194-
src/source-build-externals/src/xunit/src/xunit.assert/Asserts/README.md|free-unknown
195203

196204
# Configuration, doesn't apply to source directly
197-
src/source-build-externals/src/vs-solutionpersistence/stylecop.json
198205

199206
# Scanner is identifying the https://github.com/SixLabors/ImageSharp/blob/master/LICENSE license as unknown. But this license is not applicable because we're
200207
# relying on the Spectre.Console distribution.
@@ -231,16 +238,17 @@ src/sourcelink/docs/GitSpec/GitSpec.md|unknown-license-reference
231238

232239
# Not applicable to source
233240
src/test-templates/Templates/**/*.vstemplate
241+
src/test-templates/template_feed/Microsoft.DotNet.Test.ProjectTemplates.9.0/content/*/.template.config/localize/templatestrings.fr.json|proprietary-license
234242

235243
#
236244
# vstest
237245
#
238246

239247
# False positive
240248
src/vstest/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcDumpArgsBuilder.cs|proprietary-license
249+
src/vstest/src/Microsoft.TestPlatform.ObjectModel/Nuget.Frameworks/.editorconfig|unknown-license-reference
241250

242251
# Build asset, but not applying to code
243-
src/vstest/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/License.rtf
244252

245253
#
246254
# wpf
@@ -260,3 +268,4 @@ src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/
260268
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/*.xaml|mpl-2.0
261269
src/wpf/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/*.xaml|bsd-2-clause-views
262270
src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/RightsManagementEncryptionTransform.cs|proprietary-license
271+
src/wpf/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/CompoundFile/UserUseLicenseDictionaryLoader.cs|proprietary-license

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/Licenses.source-build-externals.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"files": [
33
{
44
"path": "src/application-insights/LOGGING/ThirdPartyNotices.txt",
5-
"detected_license_expression": "unknown AND apache-2.0 AND mit AND bsd-new"
5+
"detected_license_expression": "(unknown-license-reference AND apache-2.0) AND mit AND bsd-new"
66
}
77
]
88
}

0 commit comments

Comments
 (0)