Skip to content

Commit 0069831

Browse files
authored
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#20322)
2 parents a1f53af + e8b8a29 commit 0069831

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
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/eng/pipelines/vmr-license-scan.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- job: Setup
3030
pool:
3131
name: NetCore1ESPool-Svc-Internal
32-
demands: ImageOverride -equals 1es-ubuntu-2004
32+
demands: ImageOverride -equals 1es-ubuntu-2204
3333
steps:
3434
- script: |
3535
vmrSrcDir="$(Build.SourcesDirectory)/src"
@@ -65,7 +65,7 @@ jobs:
6565
dependsOn: Setup
6666
pool:
6767
name: NetCore1ESPool-Svc-Internal
68-
demands: ImageOverride -equals 1es-ubuntu-2004
68+
demands: ImageOverride -equals 1es-ubuntu-2204
6969
timeoutInMinutes: 420
7070
strategy:
7171
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
@@ -145,7 +145,7 @@ jobs:
145145
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
146146
pool:
147147
name: NetCore1ESPool-Svc-Internal
148-
demands: ImageOverride -equals 1es-ubuntu-2004
148+
demands: ImageOverride -equals 1es-ubuntu-2204
149149
variables:
150150
- template: templates/variables/pipelines.yml
151151
steps:

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

+3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ src/format/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
7474

7575
# False positive
7676
src/fsharp/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs|unknown-license-reference
77+
src/fsharp/tests/fsharp/core/members/ops/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
7778
src/fsharp/tests/service/data/TestTP/ProvidedTypes.fs|unknown-license-reference
7879
src/fsharp/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs|unknown-license-reference
7980

@@ -122,6 +123,7 @@ src/nuget-client/test/TestExtensions/GenerateLicenseList/Program.cs|json
122123
src/nuget-client/test/**/resources/*.json
123124
src/nuget-client/test/**/resources/*.xml
124125
src/nuget-client/test/NuGet.Clients.Tests/NuGet.PackageManagement.UI.Test/PackageLicenseUtilitiesTests.cs
126+
src/nuget-client/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs|389-exception
125127
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/DefaultManifestValuesRuleTests.cs
126128
src/nuget-client/test/NuGet.Core.Tests/NuGet.Packaging.Test/LicensesTests/LicenseExpressionTokenizerTests.cs
127129
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
180182
src/runtime/src/mono/mono/mini/mini-windows.c|unknown-license-reference
181183
src/runtime/src/native/external/libunwind/doc/libunwind-ia64.*|generic-exception
182184
src/runtime/src/tests/JIT/Performance/CodeQuality/V8/Crypto/Crypto.cs|unknown-license-reference
185+
src/runtime/src/tests/sizeondisk/sodbench/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
183186

184187
# Test data
185188
src/runtime/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/InputSpace.cs|other-permissive

0 commit comments

Comments
 (0)