Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit be228a4

Browse files
authored
Removing all references to a static 'aspnetpatch' Nuget.Config (#8556)
1 parent 36cde15 commit be228a4

File tree

6 files changed

+19
-74
lines changed

6 files changed

+19
-74
lines changed

test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
<AssetTargetFallback>$(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8</AssetTargetFallback>
88
</PropertyGroup>
99

10-
<ItemGroup>
11-
<Content Include="MSBuild.exe;MSBuild.exe.config;NuGet.tempaspnetpatch.config">
12-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13-
</Content>
14-
</ItemGroup>
15-
1610
<ItemGroup>
1711
<ProjectReference Include="..\..\src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj" />
1812
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj" />

test/dotnet-new.Tests/AspNetNuGetConfiguration.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,29 @@ namespace Microsoft.DotNet.New.Tests
1616
public class GivenThatIWantANewAppWithSpecifiedType : TestBase
1717
{
1818
[Theory]
19-
[InlineData("C#", "console", false, false)]
20-
[InlineData("C#", "classlib", false, false)]
21-
[InlineData("C#", "mstest", false, false)]
22-
[InlineData("C#", "xunit", false, false)]
23-
[InlineData("C#", "web", true, false)]
24-
[InlineData("C#", "mvc", true, false)]
25-
[InlineData("C#", "webapi", true, false)]
26-
[InlineData("C#", "angular", false, true)]
27-
[InlineData("C#", "react", false, true)]
28-
[InlineData("C#", "reactredux", false, true)]
29-
[InlineData("F#", "console", false, false)]
19+
[InlineData("C#", "console", false)]
20+
[InlineData("C#", "classlib", false)]
21+
[InlineData("C#", "mstest", false)]
22+
[InlineData("C#", "xunit", false)]
23+
[InlineData("C#", "web", false)]
24+
[InlineData("C#", "mvc", false)]
25+
[InlineData("C#", "webapi", false)]
26+
[InlineData("C#", "angular", true)]
27+
[InlineData("C#", "react", true)]
28+
[InlineData("C#", "reactredux", true)]
29+
[InlineData("F#", "console", false)]
3030
// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
31-
//[InlineData("F#", "classlib", false, false)]
32-
[InlineData("F#", "mstest", false, false)]
33-
[InlineData("F#", "xunit", false, false)]
34-
[InlineData("F#", "mvc", true, false)]
35-
[InlineData("VB", "console", false, false)]
36-
[InlineData("VB", "classlib", false, false)]
37-
[InlineData("VB", "mstest", false, false)]
38-
[InlineData("VB", "xunit", false, false)]
31+
//[InlineData("F#", "classlib", false)]
32+
[InlineData("F#", "mstest", false)]
33+
[InlineData("F#", "xunit", false)]
34+
[InlineData("F#", "mvc", false)]
35+
[InlineData("VB", "console", false)]
36+
[InlineData("VB", "classlib", false)]
37+
[InlineData("VB", "mstest", false)]
38+
[InlineData("VB", "xunit", false)]
3939
public void TemplateRestoresAndBuildsWithoutWarnings(
4040
string language,
4141
string projectType,
42-
bool useNuGetConfigForAspNet,
4342
bool skipSpaWebpackSteps)
4443
{
4544
string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
@@ -49,11 +48,6 @@ public void TemplateRestoresAndBuildsWithoutWarnings(
4948
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}")
5049
.Should().Pass();
5150

52-
if (useNuGetConfigForAspNet)
53-
{
54-
AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(Path.Combine(rootPath, "NuGet.Config"));
55-
}
56-
5751
if (skipSpaWebpackSteps)
5852
{
5953
// Not all CI machines have Node installed, so the build would fail if we tried

test/dotnet-new.Tests/NuGet.tempaspnetpatch.config

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/dotnet-new.Tests/dotnet-new.Tests.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
<AssetTargetFallback>$(AssetTargetFallback);dnxcore50;portable-net45+win8</AssetTargetFallback>
88
</PropertyGroup>
99

10-
<ItemGroup>
11-
<None Remove="NuGet.tempaspnetpatch.config" />
12-
<EmbeddedResource Include="NuGet.tempaspnetpatch.config" />
13-
</ItemGroup>
14-
1510
<ItemGroup>
1611
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj" />
1712
<ProjectReference Include="..\..\src\dotnet\dotnet.csproj" />

0 commit comments

Comments
 (0)