Skip to content

Commit a6d6d97

Browse files
MiYanniMiYanni
authored
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/9.0.1xx
2 parents 2c417cd + 6239bab commit a6d6d97

File tree

9 files changed

+115
-75
lines changed

9 files changed

+115
-75
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<!-- Begin: Package sources from dotnet-aspnetcore -->
2929
<!-- End: Package sources from dotnet-aspnetcore -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31+
<add key="darc-pub-DotNet-msbuild-Trusted-6c6276d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6c6276d5/nuget/v3/index.json" />
3132
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3233
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3334
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎eng/Version.Details.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>78f6f07d38e8755e573039a8aa04e131d3e59b76</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.35">
76+
<Dependency Name="Microsoft.Build" Version="17.12.38">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>13c590f8d138d6a30b899a5172cc6ec494db930b</Sha>
78+
<Sha>6c6276d5998f8be9811497003566e5924141d600</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.35-preview-25210-18">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.38-preview-25306-07">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>13c590f8d138d6a30b899a5172cc6ec494db930b</Sha>
82+
<Sha>6c6276d5998f8be9811497003566e5924141d600</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.35-preview-25210-18">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.38-preview-25306-07">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>13c590f8d138d6a30b899a5172cc6ec494db930b</Sha>
87+
<Sha>6c6276d5998f8be9811497003566e5924141d600</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -97,41 +97,41 @@
9797
<Sha>47d4e3f91e4e5414b6dafbf14288b9c5a798ef99</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25256.6">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25275.3">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102102
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25256.6">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.25275.3">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107107
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25256.6">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.25275.3">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112112
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25256.6">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.25275.3">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116116
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25256.6">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.25275.3">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120120
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25256.6">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.25275.3">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124124
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25256.6">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.25275.3">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128128
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25256.6">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.25275.3">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25256.6">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.25275.3">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136136
<Sha>3f5cf9fbbd91f2047e988801a5142ca1cb6bab45</Sha>
137137
</Dependency>
@@ -451,9 +451,9 @@
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
454-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25266.1">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25272.2">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>2bdf6b694572c45f6249c5406ae2303d678cda3f</Sha>
456+
<Sha>9859d82ffce48f49b5e93fa46a38bdddc4ba26be</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.35</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.35-preview-25210-18</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.38</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.38-preview-25306-07</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.31</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -204,14 +204,14 @@
204204
</PropertyGroup>
205205
<PropertyGroup>
206206
<!-- Dependencies from https://github.com/dotnet/roslyn -->
207-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25256.6</MicrosoftNetCompilersToolsetVersion>
208-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25256.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisPackageVersion>
210-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpPackageVersion>
211-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25256.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
207+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25275.3</MicrosoftNetCompilersToolsetVersion>
208+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.25275.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
209+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisPackageVersion>
210+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpPackageVersion>
211+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
212+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
213+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
214+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.25275.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
215215
</PropertyGroup>
216216
<PropertyGroup>
217217
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎src/Layout/redist/trustedroots/timestampctl.pem

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9257,6 +9257,41 @@ sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib
92579257
oTM3VxKKcl+Yqg==
92589258
-----END CERTIFICATE-----
92599259

9260+
-----BEGIN CERTIFICATE-----
9261+
MIIF0TCCA7mgAwIBAgIJAOOiocT+gaENMA0GCSqGSIb3DQEBDAUAMIGFMQswCQYD
9262+
VQQGEwJKUDEmMCQGA1UEChMdU0VDT00gVHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4x
9263+
MDAuBgNVBAMTJ1NFQ09NIERvY3VtZW50IFNpZ25pbmcgUlNBIFJvb3QgQ0EgMjAy
9264+
MzEcMBoGA1UEYRMTTlRSSlAtNDAxMTAwMTA0MDc4MTAeFw0yMzAxMjUwODMzNTla
9265+
Fw00ODAxMDEwODMzNTlaMIGFMQswCQYDVQQGEwJKUDEmMCQGA1UEChMdU0VDT00g
9266+
VHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4xMDAuBgNVBAMTJ1NFQ09NIERvY3VtZW50
9267+
IFNpZ25pbmcgUlNBIFJvb3QgQ0EgMjAyMzEcMBoGA1UEYRMTTlRSSlAtNDAxMTAw
9268+
MTA0MDc4MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKyMB9lGvBCA
9269+
99HZrvIqzl/AQy8EFLvxSLWA+13ZonAeMUhuSPxzfhwkuDs+vWXeKJSFQj0Xv0jf
9270+
Hc7n3e2Mjf26vP7IrCc8MWr8VFJ4LMM/TaTO+N5DwUBUY0bMStZhTakJF9jrultP
9271+
2N44hkoZTMfIKY07LsWkCj9NVteVHmWfrUzdd73Mf7847d4melxs6RL/8mbhcf0u
9272+
9oSZf6lRVJ5MjdJWMBOcWSrn6XwB6b0OzfAmy3Sopq508740UkFb55sKslKw19xa
9273+
lw5Djx/HLXcMpWlhlrDJgg30MLFSN8lFEqM9gD1fkLSpgL8O9QMzlbuRYiAOOiKJ
9274+
rzdGZOa+2lzxCPb8Yx6P0przBmPVpPm8qorYWO1sbtinx7B58poFVT5YyTzuWiw+
9275+
smj5E0Dd1SRu7gR1PDJshuP1qHoy7KuffdqErctLEVak7mLCFJAlzPzjE3MdBH5I
9276+
pYJ/m2zOKI/S9a7RgM1iugOBsjuIRiNMQcNhFyMX5u+vA4mugQtTt9/pn/6rF1uP
9277+
t3rv/D4WJwFaBN0vBkRgWYqHqAZVavScRV4lfYAFan5nmLui9bZB8ufI+NBv1vkA
9278+
FuO3Lw1q/ob314Ae9bi9iu35pGSAYHEazp+Zbxsk5XGTGkk2W+gNiFgJJEp8YG+2
9279+
OcLWcy6mZefRnQF3rPDs6Fe3qC77YzC5AgMBAAGjQjBAMB0GA1UdDgQWBBQB3bEk
9280+
MIksyAODXhCucR5J8u5LBzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
9281+
/zANBgkqhkiG9w0BAQwFAAOCAgEAoyB4wkvZg/bXHSyvp5g/H+0AGKBsGNOGUpE3
9282+
GF2ZC3lnw2KB8NFK2hkLfehaPl3mPGIC7cJdCR8lpAnCAtBuSDyhTEx+FUyM9cJz
9283+
x0Vefz8xEN5f4tYOmQl5QGpRNMkQZKbj9xRHbeDOWGD5lcXC/7NXIOhgqf1uBEWH
9284+
Kb6qz6fSsrC/JNSSEuyBE9h2l9A64G7CwhmZX9bjLBfTaMGZHB4iVjXEO7ZpoYYA
9285+
6yw8Y16vEn4IsHbJ62aBSvqefCKGWZGgu2BLNBfxdmLmd5IcHFaZPatcnusbE02+
9286+
RmS94w28Ujb4MXGiPP0oHeiirO/a6ARKvep/6cBsPMxJzDpFXTUzXbnSFkHzLxCO
9287+
fCuWIVsO9VBkvRzvGzLhb7GwfqO0FGqhXZbZ/2d9+Bi2FOJ1yBI7xfdyUjygxROB
9288+
L3WRCWNqO4ZiTCC3t0sq40a9Fs4k07HNjp9vSVszNChBAhBXCOtCbuvUWGKNj1/t
9289+
xsCzmpgsBmlyOt+wTJhj+Rx5v0j+YzxJYbjKJVZ8It+/jkzwdwoRoF9UqrKzrX+o
9290+
+9+NAhnONLINiuw9ZbCt3b0f6oCi92u6QoI6WVH/ZW5IdfewXQbDuX16BJYSZ7Yt
9291+
2eSQnr+vfogU+t0XpB1s2QUEC03y6mcxBevoILtv/023F8U2/5Mukg0vtjwR1N4J
9292+
7abHqTo=
9293+
-----END CERTIFICATE-----
9294+
92609295
-----BEGIN CERTIFICATE-----
92619296
MIICNjCCAb2gAwIBAgIUNdzqqPFud6Xd/BatNpw0vRVFzikwCgYIKoZIzj0EAwMw
92629297
WzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYu

‎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

0 commit comments

Comments
 (0)