mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx

Browse source
This commit is contained in:
Nick Guerrera 2019-09-24 12:25:06 -07:00
commit ceaa1c3a24
24 changed files with 335 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/EndToEnd/GivenFrameworkDependentApps.cs
View file

@ -19,7 +19,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
{
if (minorVersion == "3.0")
if (minorVersion == "3.0" || minorVersion == "3.1")
{
// https://github.com/dotnet/core-sdk/issues/621
return;
@ -31,7 +31,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
{
if (minorVersion == "3.0")
if (minorVersion == "3.0" || minorVersion == "3.1")
{
// https://github.com/dotnet/core-sdk/issues/621
return;

4
test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file

@ -23,7 +23,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
{
if (minorVersion == "3.0")
if (minorVersion == "3.0" || minorVersion == "3.1")
{
// https://github.com/dotnet/core-sdk/issues/621
return;
@ -35,7 +35,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
{
if (minorVersion == "3.0")
if (minorVersion == "3.0" || minorVersion == "3.1")
{
// https://github.com/dotnet/core-sdk/issues/621
return;

2
test/EndToEnd/ProjectBuildTests.cs
View file

@ -61,7 +61,7 @@ namespace EndToEnd.Tests
binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories);
}
[Fact]
[Fact(Skip = "Need support for ASP.NET on .NET Core 3.1")]
public void ItCanRunAnAppUsingTheWebSdk()
{
var directory = TestAssets.CreateTestDirectory();

3
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -21,7 +21,8 @@ namespace EndToEnd
"2.0",
"2.1",
"2.2",
"3.0"
"3.0",
"3.1",
};
}
}