Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx
This commit is contained in:
commit
ceaa1c3a24
24 changed files with 335 additions and 170 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -21,7 +21,8 @@ namespace EndToEnd
|
|||
"2.0",
|
||||
"2.1",
|
||||
"2.2",
|
||||
"3.0"
|
||||
"3.0",
|
||||
"3.1",
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue