Removing all references to a static 'aspnetpatch' Nuget.Config (#8556)
This commit is contained in:
John Beisner
GitHub
parent
36cde15e4e
commit
be228a492f
6 changed files with 19 additions and 74 deletions
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
|
||||
<clear />
|
||||
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
|
|
@ -7,12 +7,6 @@
|
|||
<AssetTargetFallback>$(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8</AssetTargetFallback>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="MSBuild.exe;MSBuild.exe.config;NuGet.tempaspnetpatch.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj" />
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
using System.IO;
|
||||
|
||||
namespace Microsoft.DotNet.New.Tests
|
||||
{
|
||||
public class AspNetNuGetConfiguration
|
||||
{
|
||||
public static void WriteNuGetConfigWithAspNetPrivateFeeds(string path)
|
||||
{
|
||||
string resourceName = "dotnet-new.Tests.NuGet.tempaspnetpatch.config";
|
||||
using (Stream input = typeof(GivenThatIWantANewAppWithSpecifiedType).Assembly.GetManifestResourceStream(resourceName))
|
||||
using (Stream output = File.OpenWrite(path))
|
||||
{
|
||||
input.CopyTo(output);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -16,30 +16,29 @@ namespace Microsoft.DotNet.New.Tests
|
|||
public class GivenThatIWantANewAppWithSpecifiedType : TestBase
|
||||
{
|
||||
[Theory]
|
||||
[InlineData("C#", "console", false, false)]
|
||||
[InlineData("C#", "classlib", false, false)]
|
||||
[InlineData("C#", "mstest", false, false)]
|
||||
[InlineData("C#", "xunit", false, false)]
|
||||
[InlineData("C#", "web", true, false)]
|
||||
[InlineData("C#", "mvc", true, false)]
|
||||
[InlineData("C#", "webapi", true, false)]
|
||||
[InlineData("C#", "angular", false, true)]
|
||||
[InlineData("C#", "react", false, true)]
|
||||
[InlineData("C#", "reactredux", false, true)]
|
||||
[InlineData("F#", "console", false, false)]
|
||||
[InlineData("C#", "console", false)]
|
||||
[InlineData("C#", "classlib", false)]
|
||||
[InlineData("C#", "mstest", false)]
|
||||
[InlineData("C#", "xunit", false)]
|
||||
[InlineData("C#", "web", false)]
|
||||
[InlineData("C#", "mvc", false)]
|
||||
[InlineData("C#", "webapi", false)]
|
||||
[InlineData("C#", "angular", true)]
|
||||
[InlineData("C#", "react", true)]
|
||||
[InlineData("C#", "reactredux", true)]
|
||||
[InlineData("F#", "console", false)]
|
||||
// re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574
|
||||
//[InlineData("F#", "classlib", false, false)]
|
||||
[InlineData("F#", "mstest", false, false)]
|
||||
[InlineData("F#", "xunit", false, false)]
|
||||
[InlineData("F#", "mvc", true, false)]
|
||||
[InlineData("VB", "console", false, false)]
|
||||
[InlineData("VB", "classlib", false, false)]
|
||||
[InlineData("VB", "mstest", false, false)]
|
||||
[InlineData("VB", "xunit", false, false)]
|
||||
//[InlineData("F#", "classlib", false)]
|
||||
[InlineData("F#", "mstest", false)]
|
||||
[InlineData("F#", "xunit", false)]
|
||||
[InlineData("F#", "mvc", false)]
|
||||
[InlineData("VB", "console", false)]
|
||||
[InlineData("VB", "classlib", false)]
|
||||
[InlineData("VB", "mstest", false)]
|
||||
[InlineData("VB", "xunit", false)]
|
||||
public void TemplateRestoresAndBuildsWithoutWarnings(
|
||||
string language,
|
||||
string projectType,
|
||||
bool useNuGetConfigForAspNet,
|
||||
bool skipSpaWebpackSteps)
|
||||
{
|
||||
string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
|
||||
|
|
@ -49,11 +48,6 @@ namespace Microsoft.DotNet.New.Tests
|
|||
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}")
|
||||
.Should().Pass();
|
||||
|
||||
if (useNuGetConfigForAspNet)
|
||||
{
|
||||
AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(Path.Combine(rootPath, "NuGet.Config"));
|
||||
}
|
||||
|
||||
if (skipSpaWebpackSteps)
|
||||
{
|
||||
// Not all CI machines have Node installed, so the build would fail if we tried
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
|
||||
<clear />
|
||||
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
|
||||
<add key="dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
|
|
@ -7,11 +7,6 @@
|
|||
<AssetTargetFallback>$(AssetTargetFallback);dnxcore50;portable-net45+win8</AssetTargetFallback>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="NuGet.tempaspnetpatch.config" />
|
||||
<EmbeddedResource Include="NuGet.tempaspnetpatch.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj" />
|
||||
<ProjectReference Include="..\..\src\dotnet\dotnet.csproj" />
|
||||
|
|
|
|||
Loading…
Reference in a new issue