diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ffb1c9f8e..31b3b69588 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,13 +32,13 @@ https://github.com/dotnet/installer 87ecb788b68cf14d0ebf1b89365ebfa8ca6f8c96 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 41c7083a097982ac63dff26152de4c1d49857f2b - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 41c7083a097982ac63dff26152de4c1d49857f2b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2cc84ec852..611d1045a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,8 +21,8 @@ 7.0.0-rc.1.22402.10 7.0.0-rc.1.22402.10 - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 + 7.0.0-rc.1.22403.14 + 7.0.0-rc.1.22403.14 7.0.100-rc.1.22381.2 diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs index 4b6fd60137..ca1317cba6 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs @@ -322,9 +322,9 @@ public void EventCounterTriggerDropTest() [SkippableTheory, MemberData(nameof(Configurations))] public async Task EventCounterTriggerWithEventPipePipelineTest(TestConfiguration config) { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && config.RuntimeFrameworkVersionMajor < 5) + if (config.RuntimeFrameworkVersionMajor < 6) { - throw new SkipTestException("Unreliable on Linux .NET 3.1"); + throw new SkipTestException("Unreliable on .NET 3.1"); } EventCounterTriggerSettings settings = new() {