From d53af5bf39cc7cefbcfbfba393d60ea5606f9ea1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:41:29 -0700
Subject: [PATCH] [main] Update dependencies from dotnet/aspnetcore (#3329)

* 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

* Disable EventLogsPipelineUnitTests on Windows. Issue #2541

* Fix where the skip exception is thrown

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <mikem@microsoft.com>
---
 eng/Version.Details.xml                       |  8 ++---
 eng/Versions.props                            |  4 +--
 .../EventLogsPipelineUnitTests.cs             | 30 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9dd835a485..11858a726e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -32,13 +32,13 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>2d1a4de6b2da59647a9538bf9cc4e252847e6231</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.2.22429.3">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.2.22429.7">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4fc34ae0bc15a854661711b0fd5e0dd99d323dbc</Sha>
+      <Sha>437fd5a8b7bb1ea4ff167b556953da61804ae156</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.2.22429.3">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.2.22429.7">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>4fc34ae0bc15a854661711b0fd5e0dd99d323dbc</Sha>
+      <Sha>437fd5a8b7bb1ea4ff167b556953da61804ae156</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.2.22428.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 4e38873a7e..ec1c7527ab 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,8 +21,8 @@
     <VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rc.2.22428.3</VSRedistCommonNetCoreSharedFrameworkx6470Version>
     <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.2.22428.3</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rc.2.22429.3</MicrosoftAspNetCoreAppRefInternalVersion>
-    <MicrosoftAspNetCoreAppRefVersion>7.0.0-rc.2.22429.3</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rc.2.22429.7</MicrosoftAspNetCoreAppRefInternalVersion>
+    <MicrosoftAspNetCoreAppRefVersion>7.0.0-rc.2.22429.7</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
     <MicrosoftDotnetSdkInternalVersion>7.0.100-rc.2.22426.5</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
index 1066aed1b7..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<string, LogLevel?>()
@@ -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;