Skip to content

Commit 1e11de7

Browse files
MiYanniMiYanni
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#49317)
2 parents 039de15 + 8af6c2e commit 1e11de7

File tree

11 files changed

+225
-240
lines changed

11 files changed

+225
-240
lines changed

‎eng/install-scancode.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ 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.2"
8+
SCANCODE_VERSION="32.3.3"
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
1415
deactivate
1516

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

‎eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 169 additions & 174 deletions
Large diffs are not rendered by default.

‎eng/pipelines/vmr-build-pr-internal.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ stages:
5555
isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }}
5656
${{ if contains(variables['Build.DefinitionName'], '-full') }}:
5757
scope: full
58-
${{ elseif eq(variables.isSourceOnlyBuild, 'true') }}:
59-
scope: ultralite
6058
${{ else }}:
6159
scope: lite
6260

‎eng/pipelines/vmr-build-pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ stages:
6363
isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }}
6464
${{ if contains(variables['Build.DefinitionName'], '-full') }}:
6565
scope: full
66-
${{ elseif eq(variables.isSourceOnlyBuild, 'true') }}:
67-
scope: ultralite
6866
${{ else }}:
6967
scope: lite
7068

‎src/SourceBuild/content/eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->
31-
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
31+
<MicrosoftBuildVersion>17.8.29</MicrosoftBuildVersion>
3232
<!-- runtime dependencies -->
3333
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
3434
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>

‎src/SourceBuild/content/eng/pipelines/sb-ci.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ variables:
1616
- name: isSourceOnlyBuild
1717
value: ${{ contains(variables['Build.DefinitionName'], '-source-build') }}
1818

19-
- name: isSourceOnlyBuildLite
20-
value: ${{ contains(variables['Build.DefinitionName'], '-source-build-lite') }}
21-
2219
- name: isScheduleTrigger
2320
value: ${{ eq(variables['Build.Reason'], 'Schedule') }}
2421

@@ -67,11 +64,7 @@ extends:
6764
isSourceOnlyBuild: ${{ variables.isSourceOnlyBuild }}
6865
${{ if eq(variables.isScheduleTrigger, 'true') }}:
6966
scope: full
70-
${{ elseif eq(variables.isSourceOnlyBuildLite, 'true') }}:
71-
scope: lite
72-
${{ elseif and(eq(variables.isPRTrigger, 'true'), eq(variables.isSourceOnlyBuild, 'true')) }}:
73-
scope: ultralite
74-
${{ elseif and(eq(variables.isPRTrigger, 'true'), ne(variables.isSourceOnlyBuild, 'true')) }}:
67+
${{ elseif eq(variables.isPRTrigger, 'true') }}:
7568
scope: lite
7669
${{ else }}:
7770
scope: full

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ schedules:
99
# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/pipeline-triggers?view=azure-devops#branch-considerations
1010
resources:
1111
pipelines:
12-
- pipeline: dotnet-source-build
13-
source: dotnet-source-build
12+
- pipeline: dotnet-source-build-pre10.0
13+
source: dotnet-source-build-pre10.0
1414
# For releases branches only run on internal/release branches because that's where dependencies flow.
1515

1616
# Previews don't have internal/release branches so they must be run from non-internal release branches.
@@ -37,7 +37,7 @@ variables:
3737
- template: /src/sdk/eng/pipelines/templates/variables/vmr-build.yml@self
3838

3939
# GH access token for SB bot - BotAccount-dotnet-sb-bot-pat
40-
- group: DotNet-Source-Build-Bot-Secrets-MVP
40+
- group: Dotnet-SourceBuild-Secrets
4141

4242
jobs:
4343
- template: templates/jobs/sdk-diff-tests.yml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ parameters:
3434

3535
variables:
3636
# GH access token for SB bot - BotAccount-dotnet-sb-bot-pat
37-
- group: DotNet-Source-Build-Bot-Secrets-MVP
37+
- group: Dotnet-SourceBuild-Secrets
3838
- name: sdkRoot
3939
value: '$(Build.SourcesDirectory)/src/sdk'
4040

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,9 @@ public GivenThatWeWantToVerifyNuGetReferenceCompat(ITestOutputHelper log) : base
1313

1414
[Theory]
1515
[InlineData("net45", "Full", "netstandard1.0 netstandard1.1 net45", true, true)]
16-
[InlineData("net451", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 net45 net451", true, true)]
17-
[InlineData("net46", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 net45 net451 net46", true, true)]
18-
[InlineData("net461", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0 net45 net451 net46 net461", true, true)]
1916
[InlineData("net462", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0 net45 net451 net46 net461 net462", true, true)]
20-
[InlineData("netstandard1.0", "Full", "netstandard1.0", true, true)]
21-
[InlineData("netstandard1.1", "Full", "netstandard1.0 netstandard1.1", true, true)]
22-
[InlineData("netstandard1.2", "Full", "netstandard1.0 netstandard1.1 netstandard1.2", true, true)]
23-
[InlineData("netstandard1.3", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3", true, true)]
24-
[InlineData("netstandard1.4", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4", true, true)]
25-
[InlineData("netstandard1.5", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5", true, true)]
2617
[InlineData("netstandard1.6", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6", true, true)]
2718
[InlineData("netstandard2.0", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0", true, true)]
28-
[InlineData("netcoreapp1.0", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netcoreapp1.0", true, true)]
29-
[InlineData("netcoreapp1.1", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netcoreapp1.0 netcoreapp1.1", true, true)]
3019
[InlineData("netcoreapp2.0", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0 netcoreapp1.0 netcoreapp1.1 netcoreapp2.0", true, true)]
3120

3221
[InlineData("netstandard2.0", "OptIn", "net45 net451 net46 net461", true, true)]
@@ -46,31 +35,53 @@ public void Nuget_reference_compat(string referencerTarget, string testDescripti
4635
return;
4736
}
4837

49-
foreach (string dependencyTarget in rawDependencyTargets.Split(',', ';', ' ').ToList())
50-
{
51-
TestProject dependencyProject = GetTestProject(ConstantStringValues.DependencyDirectoryNamePrefix + dependencyTarget.Replace('.', '_'), dependencyTarget, true);
52-
TestPackageReference dependencyPackageReference = new(
53-
dependencyProject.Name,
54-
"1.0.0",
55-
ConstantStringValues.ConstructNuGetPackageReferencePath(dependencyProject, identifier: referencerTarget + testDescription + rawDependencyTargets));
38+
var dependencyPackageReferences = new List<TestPackageReference>();
5639

57-
// Skip creating the NuGet package if not running on Windows; or if the NuGet package already exists
58-
// https://github.com/dotnet/sdk/issues/335
59-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || dependencyProject.BuildsOnNonWindows)
40+
// Process all dependencies in parallel
41+
Parallel.ForEach(
42+
rawDependencyTargets.Split(',', ';', ' ').Where(s => !string.IsNullOrWhiteSpace(s)),
43+
new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount },
44+
dependencyTarget =>
6045
{
61-
if (!dependencyPackageReference.NuGetPackageExists())
46+
// Create the dependency project and package
47+
TestProject dependencyProject = GetTestProject(
48+
ConstantStringValues.DependencyDirectoryNamePrefix + dependencyTarget.Replace('.', '_'),
49+
dependencyTarget,
50+
true);
51+
52+
TestPackageReference dependencyPackageReference = new(
53+
dependencyProject.Name,
54+
"1.0.0",
55+
ConstantStringValues.ConstructNuGetPackageReferencePath(dependencyProject, identifier: referencerTarget + testDescription + rawDependencyTargets));
56+
57+
// Create package if it doesn't exist
58+
if (!dependencyPackageReference.NuGetPackageExists() &&
59+
(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || dependencyProject.BuildsOnNonWindows))
6260
{
63-
// Create the NuGet packages
64-
var dependencyTestAsset = _testAssetsManager.CreateTestProject(dependencyProject, identifier: referencerTarget + testDescription + rawDependencyTargets);
65-
var dependencyRestoreCommand = dependencyTestAsset.GetRestoreCommand(Log, relativePath: dependencyProject.Name).Execute().Should().Pass();
66-
var dependencyProjectDirectory = Path.Combine(dependencyTestAsset.TestRoot, dependencyProject.Name);
61+
if (!dependencyPackageReference.NuGetPackageExists())
62+
{
63+
var dependencyTestAsset = _testAssetsManager.CreateTestProject(
64+
dependencyProject,
65+
identifier: referencerTarget + testDescription + rawDependencyTargets);
66+
67+
dependencyTestAsset.GetRestoreCommand(Log, relativePath: dependencyProject.Name)
68+
.Execute().Should().Pass();
69+
70+
var dependencyProjectDirectory = Path.Combine(
71+
dependencyTestAsset.TestRoot,
72+
dependencyProject.Name);
73+
74+
new PackCommand(Log, dependencyProjectDirectory)
75+
.Execute().Should().Pass();
76+
}
6777

68-
var dependencyPackCommand = new PackCommand(Log, dependencyProjectDirectory);
69-
var dependencyPackResult = dependencyPackCommand.Execute().Should().Pass();
7078
}
79+
});
7180

72-
referencerProject.PackageReferences.Add(dependencyPackageReference);
73-
}
81+
// Add all references to the referencer project
82+
foreach (var dependencyPackageReference in dependencyPackageReferences)
83+
{
84+
referencerProject.PackageReferences.Add(dependencyPackageReference);
7485
}
7586

7687
// Skip running tests if no NuGet packages are referenced

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyProjectReferenceCompat.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,9 @@ public GivenThatWeWantToVerifyProjectReferenceCompat(ITestOutputHelper log) : ba
1111

1212
[Theory]
1313
[InlineData("net45", "Full", "netstandard1.0 netstandard1.1 net45", true, true)]
14-
[InlineData("net451", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 net45 net451", true, true)]
15-
[InlineData("net46", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 net45 net451 net46", true, true)]
16-
[InlineData("net461", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0 net45 net451 net46 net461", true, true)]
1714
[InlineData("net462", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0 net45 net451 net46 net461 net462", true, true)]
18-
[InlineData("netstandard1.0", "Full", "netstandard1.0", true, true)]
19-
[InlineData("netstandard1.1", "Full", "netstandard1.0 netstandard1.1", true, true)]
20-
[InlineData("netstandard1.2", "Full", "netstandard1.0 netstandard1.1 netstandard1.2", true, true)]
21-
[InlineData("netstandard1.3", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3", true, true)]
22-
[InlineData("netstandard1.4", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4", true, true)]
23-
[InlineData("netstandard1.5", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5", true, true)]
2415
[InlineData("netstandard1.6", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6", true, true)]
2516
[InlineData("netstandard2.0", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0", true, true)]
26-
[InlineData("netcoreapp1.0", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netcoreapp1.0", true, true)]
27-
[InlineData("netcoreapp1.1", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netcoreapp1.0 netcoreapp1.1", true, true)]
2817
[InlineData("netcoreapp2.0", "Full", "netstandard1.0 netstandard1.1 netstandard1.2 netstandard1.3 netstandard1.4 netstandard1.5 netstandard1.6 netstandard2.0 netcoreapp1.0 netcoreapp1.1 netcoreapp2.0", true, true)]
2918

3019
public void Project_reference_compat(string referencerTarget, string testIDPostFix, string rawDependencyTargets,

0 commit comments

Comments
 (0)