Skip to content

Commit 3c2ed39

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-f85a2483-11df-47ff-9da9-65cbee35bec0
2 parents 17736e4 + 9edd837 commit 3c2ed39

19 files changed

+245
-344
lines changed

‎.vsts-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ resources:
5757
ref: refs/tags/release
5858

5959
extends:
60-
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
61-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
62-
${{ else }}:
63-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
60+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6461
parameters:
6562
containers:
6663
alpine319WithNode:

‎NuGet.config

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@
88
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
99
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
1010
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-6/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-5/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-15/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-14/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-13/nuget/v3/index.json" />
22+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-12/nuget/v3/index.json" />
23+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-11/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-10/nuget/v3/index.json" />
1125
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-1/nuget/v3/index.json" />
1226
<!-- End: Package sources from dotnet-deployment-tools -->
1327
<!-- Begin: Package sources from dotnet-aspire -->
@@ -35,7 +49,7 @@
3549
<add key="darc-int-dotnet-aspnetcore-4442a18-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-1/nuget/v3/index.json" />
3650
<!-- End: Package sources from dotnet-aspnetcore -->
3751
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
38-
<add key="darc-pub-DotNet-msbuild-Trusted-90b52dd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-90b52dda-1/nuget/v3/index.json" />
52+
<add key="darc-pub-DotNet-msbuild-Trusted-f7ab67b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f7ab67b0/nuget/v3/index.json" />
3953
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4054
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
4155
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -49,6 +63,20 @@
4963
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
5064
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
5165
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
66+
<add key="darc-pub-dotnet-templating-f46c70a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-9/nuget/v3/index.json" />
67+
<add key="darc-pub-dotnet-templating-f46c70a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-8/nuget/v3/index.json" />
68+
<add key="darc-pub-dotnet-templating-f46c70a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-7/nuget/v3/index.json" />
69+
<add key="darc-pub-dotnet-templating-f46c70a-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-6/nuget/v3/index.json" />
70+
<add key="darc-pub-dotnet-templating-f46c70a-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-5/nuget/v3/index.json" />
71+
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
72+
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
73+
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
74+
<add key="darc-pub-dotnet-templating-f46c70a-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-15/nuget/v3/index.json" />
75+
<add key="darc-pub-dotnet-templating-f46c70a-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-14/nuget/v3/index.json" />
76+
<add key="darc-pub-dotnet-templating-f46c70a-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-13/nuget/v3/index.json" />
77+
<add key="darc-pub-dotnet-templating-f46c70a-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-12/nuget/v3/index.json" />
78+
<add key="darc-pub-dotnet-templating-f46c70a-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-11/nuget/v3/index.json" />
79+
<add key="darc-pub-dotnet-templating-f46c70a-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-10/nuget/v3/index.json" />
5280
<add key="darc-pub-dotnet-templating-f46c70a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-1/nuget/v3/index.json" />
5381
<!-- End: Package sources from dotnet-templating -->
5482
<!-- Begin: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.24">
76+
<Dependency Name="Microsoft.Build" Version="17.12.26">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
78+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.24-preview-25066-04">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.26-preview-25071-08">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
82+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.24-preview-25066-04">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.26-preview-25071-08">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>90b52dda697be7d9b07b90b3a7eb7a80b433ef09</Sha>
87+
<Sha>f7ab67b00991bd693a518451426ba33915614d19</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.24602.3">
@@ -325,22 +325,22 @@
325325
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24616.4">
328+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25104.3">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
330+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24616.4">
332+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25104.3">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
334+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24616.4">
336+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25104.3">
337337
<Uri>https://github.com/dotnet/razor</Uri>
338-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
338+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
339339
</Dependency>
340340
<!-- Intermediate is necessary for source build. -->
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24616.4">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25104.3">
342342
<Uri>https://github.com/dotnet/razor</Uri>
343-
<Sha>e0c5e5892684a5ce8f4fa0dcc504a0af4c140ac7</Sha>
343+
<Sha>36abdce12db3b9c9360e8c7711d489204a4eac71</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />
345345
</Dependency>
346346
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.1">
@@ -631,14 +631,14 @@
631631
<Uri>https://github.com/dotnet/arcade-services</Uri>
632632
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
633633
</Dependency>
634-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25061.2">
634+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25102.1">
635635
<Uri>https://github.com/dotnet/scenario-tests</Uri>
636-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
636+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
637637
</Dependency>
638638
<!-- Intermediate is necessary for source build. -->
639-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25061.2">
639+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25102.1">
640640
<Uri>https://github.com/dotnet/scenario-tests</Uri>
641-
<Sha>1512fd86b0eb245fe6d8efd7e833c37f5e290803</Sha>
641+
<Sha>008b3a357044b102ec30e15ac381c2e880f573af</Sha>
642642
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
643643
</Dependency>
644644
<!--

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>03</VersionFeature>
9+
<VersionFeature>04</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -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.24</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.24-preview-25066-04</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.26</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.26-preview-25071-08</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -231,9 +231,9 @@
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Dependencies from https://github.com/dotnet/razor -->
234-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24616.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24616.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24616.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
234+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25104.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25104.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25104.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -261,7 +261,7 @@
261261
<PropertyGroup Label="Infrastructure and test only dependencies">
262262
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
263263
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
264-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25061.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
264+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25102.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
265265
</PropertyGroup>
266266
<PropertyGroup Label="Manually updated">
267267
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void CanBuildProjectWithPackageReferencesWithConflictingTypes()
3939
var testAsset = _testAssetsManager.CreateTestProject(testProject);
4040

4141
var packagesPaths = packageReferences.Select(e => Path.GetDirectoryName(e.NupkgPath));
42-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed };
42+
List<string> sources = new();
4343
sources.AddRange(packagesPaths);
4444
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
4545

@@ -85,7 +85,7 @@ public void CanBuildProjectWithMultiplePackageReferencesWithAliases()
8585
testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage;
8686
var testAsset = _testAssetsManager.CreateTestProject(testProject);
8787

88-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
88+
List<string> sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath), Path.GetDirectoryName(packageReferenceB.NupkgPath) };
8989
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
9090

9191
var buildCommand = new BuildCommand(testAsset)
@@ -122,7 +122,7 @@ public void CanBuildProjectWithAPackageReferenceWithMultipleAliases()
122122
testProject.SourceFiles[$"{testProject.Name}.cs"] = ClassLibAandBUsage;
123123
var testAsset = _testAssetsManager.CreateTestProject(testProject);
124124

125-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed, Path.GetDirectoryName(packageReferenceA.NupkgPath) };
125+
List<string> sources = new() { Path.GetDirectoryName(packageReferenceA.NupkgPath) };
126126
NuGetConfigWriter.Write(testAsset.TestRoot, sources);
127127

128128
var buildCommand = new BuildCommand(testAsset)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void It_targets_the_right_framework(
133133

134134
var testAsset = _testAssetsManager.CreateTestProject(testProject, testIdentifier);
135135

136-
NuGetConfigWriter.Write(testAsset.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
136+
NuGetConfigWriter.Write(testAsset.TestRoot);
137137

138138
var buildCommand = new BuildCommand(testAsset);
139139

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem
8686

8787
var toolProjectInstance = _testAssetsManager.CreateTestProject(toolProject, callingMethod, identifier: toolProject.Name);
8888

89-
NuGetConfigWriter.Write(toolProjectInstance.TestRoot, NuGetConfigWriter.DotnetCoreBlobFeed);
89+
NuGetConfigWriter.Write(toolProjectInstance.TestRoot);
9090

9191
// Workaround https://github.com/dotnet/cli/issues/9701
9292
var useBundledNETCoreAppPackage = "/p:UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion=true";
@@ -118,7 +118,7 @@ private CommandResult GenerateDepsAndRunTool(TestProject toolProject, [CallerMem
118118
new XAttribute("Version", "1.0.0")));
119119
});
120120

121-
List<string> sources = new() { NuGetConfigWriter.DotnetCoreBlobFeed };
121+
List<string> sources = new();
122122
sources.Add(nupkgPath);
123123

124124
NuGetConfigWriter.Write(toolReferencerInstance.TestRoot, sources);

0 commit comments

Comments
 (0)