From 09b7591fc4f509c4734b87f4c51ad25e4cfa3da1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Aug 2022 12:12:18 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/aspnetcore build 20220829.7 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal From Version 7.0.0-rc.2.22429.3 -> To Version 7.0.0-rc.2.22429.7 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18123ac306..d6f866f834 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,13 +32,13 @@ https://github.com/dotnet/installer 2d1a4de6b2da59647a9538bf9cc4e252847e6231 - + https://github.com/dotnet/aspnetcore - 4fc34ae0bc15a854661711b0fd5e0dd99d323dbc + 437fd5a8b7bb1ea4ff167b556953da61804ae156 - + https://github.com/dotnet/aspnetcore - 4fc34ae0bc15a854661711b0fd5e0dd99d323dbc + 437fd5a8b7bb1ea4ff167b556953da61804ae156 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ea74a55ac2..ca60cc0e5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,8 +21,8 @@ 7.0.0-rc.2.22428.3 7.0.0-rc.2.22428.3 - 7.0.0-rc.2.22429.3 - 7.0.0-rc.2.22429.3 + 7.0.0-rc.2.22429.7 + 7.0.0-rc.2.22429.7 7.0.100-rc.2.22426.5 From 0e1a1716b74c8778808fb4b9046827f59f22f8d5 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Tue, 30 Aug 2022 09:46:50 -0700 Subject: [PATCH 2/3] Disable EventLogsPipelineUnitTests on Windows. Issue #2541 --- .../EventLogsPipelineUnitTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs index 1066aed1b7..ac9e7d079b 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs @@ -202,6 +202,10 @@ public async Task TestLogsWildcardCategory(TestConfiguration config) private async Task GetLogsAsync(TestConfiguration config, Action settingsCallback = null) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } var outputStream = new MemoryStream(); await using (var testRunner = await PipelineTestUtilities.StartProcess(config, LoggerRemoteTestName, _output)) From d12410eb84ac016976cede9c4160b64cdefb8326 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Tue, 30 Aug 2022 11:02:04 -0700 Subject: [PATCH 3/3] Fix where the skip exception is thrown --- .../EventLogsPipelineUnitTests.cs | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs index ac9e7d079b..4d91d2c29d 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs @@ -41,6 +41,11 @@ public EventLogsPipelineUnitTests(ITestOutputHelper output) [SkippableTheory, MemberData(nameof(Configurations))] public async Task TestLogsAllCategoriesAllLevels(TestConfiguration config) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } + using Stream outputStream = await GetLogsAsync(config, settings => { settings.UseAppFilters = false; @@ -65,6 +70,11 @@ public async Task TestLogsAllCategoriesAllLevels(TestConfiguration config) [SkippableTheory, MemberData(nameof(Configurations))] public async Task TestLogsAllCategoriesDefaultLevel(TestConfiguration config) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } + using Stream outputStream = await GetLogsAsync(config, settings => { settings.UseAppFilters = false; @@ -88,6 +98,11 @@ public async Task TestLogsAllCategoriesDefaultLevel(TestConfiguration config) [SkippableTheory(Skip = "Unreliable test https://github.com/dotnet/diagnostics/issues/3143"), MemberData(nameof(Configurations))] public async Task TestLogsAllCategoriesDefaultLevelFallback(TestConfiguration config) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } + using Stream outputStream = await GetLogsAsync(config, settings => { settings.UseAppFilters = false; @@ -135,6 +150,11 @@ public async Task TestLogsAllCategoriesDefaultLevelNoneNotSupported(TestConfigur [SkippableTheory, MemberData(nameof(Configurations))] public async Task TestLogsUseAppFilters(TestConfiguration config) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } + using Stream outputStream = await GetLogsAsync(config); Assert.True(outputStream.Length > 0, "No data written by logging process."); @@ -154,6 +174,11 @@ public async Task TestLogsUseAppFilters(TestConfiguration config) [SkippableTheory, MemberData(nameof(Configurations))] public async Task TestLogsUseAppFiltersAndFilterSpecs(TestConfiguration config) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } + using Stream outputStream = await GetLogsAsync(config, settings => { settings.FilterSpecs = new Dictionary() @@ -179,6 +204,11 @@ public async Task TestLogsUseAppFiltersAndFilterSpecs(TestConfiguration config) [SkippableTheory, MemberData(nameof(Configurations))] public async Task TestLogsWildcardCategory(TestConfiguration config) { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); + } + using Stream outputStream = await GetLogsAsync(config, settings => { settings.UseAppFilters = false; @@ -202,10 +232,6 @@ public async Task TestLogsWildcardCategory(TestConfiguration config) private async Task GetLogsAsync(TestConfiguration config, Action settingsCallback = null) { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541"); - } var outputStream = new MemoryStream(); await using (var testRunner = await PipelineTestUtilities.StartProcess(config, LoggerRemoteTestName, _output))