Skip to content

Commit e71c6a8

Browse files
authored
[automated] Merge branch 'release/8.0.2xx' => 'release/8.0.3xx' (#19370)
2 parents 22010ca + 9e8f752 commit e71c6a8

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,18 @@ schedules:
44
branches:
55
include:
66
- main
7-
- release/*.0.1xx*
8-
- internal/release/*.0.1xx*
7+
8+
# Relies on dotnet-source-build being in the same repo as this pipeline
9+
# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/pipeline-triggers?view=azure-devops#branch-considerations
10+
resources:
11+
pipelines:
12+
- pipeline: dotnet-source-build
13+
source: dotnet-source-build
14+
trigger:
15+
branches:
16+
include:
17+
- release/*.0.1xx*
18+
- internal/release/*.0.1xx*
919

1020
pr: none
1121
trigger: none

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public class LicenseScanTests : TestBase
6161
"cc-by-sa-3.0", // https://creativecommons.org/licenses/by-sa/3.0/legalcode
6262
"cc-by-sa-4.0", // https://creativecommons.org/licenses/by-sa/4.0/legalcode
6363
"cc-pd", // https://creativecommons.org/publicdomain/mark/1.0/
64+
"cc-sa-1.0", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/cc-sa-1.0.LICENSE
6465
"epl-1.0", // https://opensource.org/license/epl-1-0/
6566
"generic-cla", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/generic-cla.LICENSE
6667
"gpl-1.0-plus", // https://opensource.org/license/gpl-1-0/
@@ -76,6 +77,7 @@ public class LicenseScanTests : TestBase
7677
"lzma-sdk-9.22", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/lzma-sdk-9.22.LICENSE
7778
"mit", // https://opensource.org/license/mit/
7879
"mit-addition", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/mit-addition.LICENSE
80+
"mit-testregex", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/mit-testregex.LICENSE
7981
"ms-patent-promise", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ms-patent-promise.LICENSE
8082
"ms-lpl", // https://github.com/nexB/scancode-toolkit/blob/develop/src/licensedcode/data/licenses/ms-lpl.LICENSE
8183
"ms-pl", // https://opensource.org/license/ms-pl-html/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,11 @@ src/source-build-externals/patches/application-insights/0002-Remove-WebGrease-fr
222222

223223
# False positive
224224
src/source-build-reference-packages/src/targetPacks/ILsrc/microsoft.netcore.app.ref/3.*/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
225-
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown
226-
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown
225+
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/1.6.1/ThirdPartyNotices.txt|unknown-license-reference
226+
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library/2.0.*/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
227227
src/source-build-reference-packages/src/targetPacks/ILsrc/netstandard.library.ref/2.1.0/THIRD-PARTY-NOTICES.TXT|codesourcery-2004
228228
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.codeanalysis.collections/4.2.0-1.22102.8/ThirdPartyNotices.rtf|json
229-
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown
229+
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.netcore.*/1.*/ThirdPartyNotices.txt|unknown-license-reference
230230
src/source-build-reference-packages/src/textOnlyPackages/src/microsoft.private.intellisense/8.0.*/IntellisenseFiles/*/1033/System.Security.Permissions.xml|unknown-license-reference
231231

232232
# Contains references to licenses which are not applicable to the source

0 commit comments

Comments
 (0)