From 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jun 2022 22:20:56 +0000 Subject: [PATCH] Merged PR 23388: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:1ac68a20-28fc-4e11-3a4d-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 1ac68a20-28fc-4e11-3a4d-08d961c5a689 - **Build**: 20220615.1 - **Date Produced**: June 15, 2022 9:41:06 AM UTC - **Commit**: 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore.Design**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore.InMemory**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore.Relational**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 6.0.6 to 6.0.7][10] - **Microsoft.EntityFrameworkCore.Tools**: [from 6.0.6 to 6.0.7][10] [10]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC796d2f8&targetVersion=GC5f52838&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ac68a20-28fc-4e11-3a4d-08d961c5a689) [marker]: <> (Begin:7745f62d-e15b-4ba3-39b3-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 7745f62d-e15b-4ba3-39b3-08d960f4ca81 - **Build**: 20220622.2 - **Date Produced**: June 22, 2022 2:36:52 PM UTC - **Commit**: 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2][12] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 6.0.6 to 6.0.7][12] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 6.0.6 to 6.0.7][12] - **Microsoft.NETCore.App.Ref**: [from 6.0.6 to 6.0.7][12] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 6.0.6 to 6.0.7][12] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.6 to 6.0.7][12] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 6.0.6-servicing.22267.7 to 6.0.7-servicing.22322.2][12] - **Microsoft.NETCore.Platforms**: [from 6.0.4 to 6.0.5][12] [12]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC7cca709&targetVersion=GC0ec02c8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7745f62d-e15b-4ba3-39b3-08d960f4ca81) --- NuGet.config | 4 ++ eng/Version.Details.xml | 64 +++++++++---------- eng/Versions.props | 32 +++++----- .../Common.FunctionalTests/StartupTests.cs | 2 +- .../StdOutRedirectionTests.cs | 13 ++-- 5 files changed, 62 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b821f800992..810921d0807f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,10 @@ + + @@ -25,8 +27,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8bbfe40911e..be56603fef02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 796d2f8b516781d64bbdf4c21b0163de9fa56ab8 + 5f5283806774a7fd1bbe2ec54736dc8a5d30c16d https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://github.com/dotnet/runtime @@ -245,40 +245,40 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3754e8634b06..038840512db8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,12 +63,12 @@ 6.0.0 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6-servicing.22267.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7-servicing.22322.2 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.6-servicing.22267.7 + 6.0.7-servicing.22322.2 6.0.0 6.0.0 6.0.1 @@ -120,16 +120,16 @@ 6.0.5 6.0.0 - 6.0.4 + 6.0.5 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 - 6.0.6 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 + 6.0.7 6.0.0-beta.22314.7 6.0.0-beta.22314.7 diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs index e6acee1a6d43..822bc2f34ac0 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs @@ -426,7 +426,7 @@ public async Task TargedDifferenceSharedFramework_FailedToFindNativeDependencies Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); var responseContent = await response.Content.ReadAsStringAsync(); Assert.Contains("500.31", responseContent); - Assert.Contains("The framework 'Microsoft.NETCore.App', version '2.9.9'", responseContent); + Assert.Contains("Framework: 'Microsoft.NETCore.App', version '2.9.9'", responseContent); } else { diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs index 8868e24c3226..648f3ce92399 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/StdOutRedirectionTests.cs @@ -47,7 +47,9 @@ public async Task FrameworkNotFoundExceptionLogged_Pipe() StopServer(); EventLogHelpers.VerifyEventLogEvent(deploymentResult, - @"The framework 'Microsoft.NETCore.App', version '2.9.9' \(x64\) was not found.", Logger); + @"Framework: 'Microsoft.NETCore.App', version '2.9.9' \(x64\)", Logger); + EventLogHelpers.VerifyEventLogEvent(deploymentResult, + "To install missing framework, download:", Logger); } [ConditionalFact] @@ -69,10 +71,13 @@ public async Task FrameworkNotFoundExceptionLogged_File() StopServer(); var contents = Helpers.ReadAllTextFromFile(Helpers.GetExpectedLogName(deploymentResult, LogFolderPath), Logger); - var expectedString = "The framework 'Microsoft.NETCore.App', version '2.9.9' (x64) was not found."; + var missingFrameworkString = "To install missing framework, download:"; + EventLogHelpers.VerifyEventLogEvent(deploymentResult, + @"Framework: 'Microsoft.NETCore.App', version '2.9.9' \(x64\)", Logger); EventLogHelpers.VerifyEventLogEvent(deploymentResult, - @"The framework 'Microsoft.NETCore.App', version '2.9.9' \(x64\) was not found.", Logger); - Assert.Contains(expectedString, contents); + missingFrameworkString, Logger); + Assert.Contains(@"Framework: 'Microsoft.NETCore.App', version '2.9.9' (x64)", contents); + Assert.Contains(missingFrameworkString, contents); } [ConditionalFact]