huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16668 from dotnet-maestro-bot/merge/release/3.1-preview2-to-release/3.1 

[automated] Merge branch 'release/3.1-preview2' => 'release/3.1'
This commit is contained in:
Brennan 2019-10-31 12:37:30 -07:00 committed by GitHub
parent 3e355d45cf 4c37e0f2f8
commit 8acff52cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
View File

@ -397,7 +397,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
var responseContent = await response.Content.ReadAsStringAsync(); var responseContent = await response.Content.ReadAsStringAsync();
Assert.Contains("HTTP Error 500.31 - ANCM Failed to Find Native Dependencies", responseContent); Assert.Contains("HTTP Error 500.31 - ANCM Failed to Find Native Dependencies", responseContent);
Assert.Contains("The specified framework 'Microsoft.NETCore.App', version '2.9.9'", responseContent); Assert.Contains("The framework 'Microsoft.NETCore.App', version '2.9.9'", responseContent);
} }
else else
{ {

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs
View File

@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
} }
else else
{ {
return "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."; return "The framework 'Microsoft.NETCore.App', version '2.9.9' was not found.";
} }
} }

4
src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
View File

@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
StopServer(); StopServer();
EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.VerifyEventLogEvent(deploymentResult,
"The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found.", Logger); "The framework 'Microsoft.NETCore.App', version '2.9.9' was not found.", Logger);
} }
[ConditionalFact] [ConditionalFact]
@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
StopServer(); StopServer();
var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger); var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath), Logger);
var expectedString = "The specified framework 'Microsoft.NETCore.App', version '2.9.9' was not found."; var expectedString = "The framework 'Microsoft.NETCore.App', version '2.9.9' was not found.";
EventLogHelpers.VerifyEventLogEvent(deploymentResult, expectedString, Logger); EventLogHelpers.VerifyEventLogEvent(deploymentResult, expectedString, Logger);
Assert.Contains(expectedString, contents); Assert.Contains(expectedString, contents);
} }