Merge main to feature/triggers

dotnet-monitor.sln

@@ -24,15 +24,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests\Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests.csproj", "{FCEC25E0-9EE1-416E-A7C4-2898E5640157}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.Tool.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj", "{04427BC9-8F54-4633-9BBB-6661715BD271}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests", "src\Tests\Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests\Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj", "{04427BC9-8F54-4633-9BBB-6661715BD271}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.UnitTestApp", "src\Tests\Microsoft.Diagnostics.Monitoring.UnitTestApp\Microsoft.Diagnostics.Monitoring.UnitTestApp.csproj", "{DC672D2F-3A21-40BD-B495-660850EBC5F7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests\Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests.csproj", "{886D1FD5-125F-435B-934C-30DF2938E7F6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Monitoring.ConfigurationSchema", "src\Tests\Microsoft.Diagnostics.Monitoring.ConfigurationSchema\Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj", "{422ABBF6-6236-4042-AACA-09531DBDFBAA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.UnitTests\Microsoft.Diagnostics.Monitoring.UnitTests.csproj", "{3AD0A40B-C569-4712-9764-7A788B9CD811}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.WebApi.UnitTests", "src\Tests\Microsoft.Diagnostics.Monitoring.WebApi.UnitTests\Microsoft.Diagnostics.Monitoring.WebApi.UnitTests.csproj", "{3AD0A40B-C569-4712-9764-7A788B9CD811}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

eng/Version.Details.xml

@@ -4,13 +4,13 @@
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>166610c56ff732093f0145a2911d4f6c40b786da</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21379.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21380.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>30dc8118eac6d5a8aec58f8e6b1007ca9c6c31f0</Sha>
+      <Sha>6771e250058b81654a6d4fd8356a009436ab5061</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21379.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21380.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>30dc8118eac6d5a8aec58f8e6b1007ca9c6c31f0</Sha>
+      <Sha>6771e250058b81654a6d4fd8356a009436ab5061</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
@@ -26,13 +26,13 @@
       <Uri>https://github.com/dotnet/symstore</Uri>
       <Sha>3ed87724fe4e98c7ecc77617720591783ee2e676</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21379.10">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21381.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>a8cd18906ff92571ac5fc594215f5a9e52954154</Sha>
+      <Sha>85180121312ec21d6f33d99acb2723868586a3a2</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21380.1">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21401.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cb64fe6669826b9e1e17bb66c84c13ba76bdec8e</Sha>
+      <Sha>d90f6b6c86be7001dc839e147ab229dfd1c7d20d</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -29,12 +29,12 @@
     <!-- dotnet/arcade references -->
     <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21379.2</MicrosoftDotNetXUnitExtensionsVersion>
     <!-- dotnet/aspnetcore references -->
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21379.10</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21381.3</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21379.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21379.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21380.1</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21380.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/runtime references -->
-    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21380.1</VSRedistCommonNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21401.3</VSRedistCommonNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/symstore references -->
     <MicrosoftFileFormatsVersion>1.0.215101</MicrosoftFileFormatsVersion>
   </PropertyGroup>

eng/build.yml

@@ -116,7 +116,7 @@ jobs:
       displayName: Publish Test Results (Core 3.1)
       inputs:
         testResultsFormat: xUnit
-        testResultsFiles: '**/*UnitTests*netcoreapp3.1*.xml' 
+        testResultsFiles: '**/*Tests*netcoreapp3.1*.xml' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
         failTaskOnFailedTests: true
         testRunTitle: '${{ coalesce(parameters.displayName, parameters.name) }} Core 3.1'
@@ -130,7 +130,7 @@ jobs:
       displayName: Publish Test Results (NET 5.0)
       inputs:
         testResultsFormat: xUnit
-        testResultsFiles: '**/*UnitTests*net5.0*.xml' 
+        testResultsFiles: '**/*Tests*net5.0*.xml' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
         failTaskOnFailedTests: true
         testRunTitle: '${{ coalesce(parameters.displayName, parameters.name) }} NET 5.0'
@@ -144,7 +144,7 @@ jobs:
       displayName: Publish Test Results (NET 6.0)
       inputs:
         testResultsFormat: xUnit
-        testResultsFiles: '**/*UnitTests*net6.0*.xml' 
+        testResultsFiles: '**/*Tests*net6.0*.xml' 
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
         failTaskOnFailedTests: true
         testRunTitle: '${{ coalesce(parameters.displayName, parameters.name) }} NET 6.0'

src/Microsoft.Diagnostics.Monitoring.WebApi/CorsConfiguration.cs

@@ -7,7 +7,7 @@
 #if UNITTEST
 using Microsoft.Diagnostics.Monitoring.WebApi;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/DiagnosticPortConnectionMode.cs

@@ -5,7 +5,7 @@
 using System.Text.Json.Serialization;
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/DiagnosticPortOptions.cs

@@ -8,7 +8,7 @@
 #if UNITTEST
 using Microsoft.Diagnostics.Monitoring.WebApi;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/DiagnosticPortOptionsDefaults.cs

@@ -5,7 +5,7 @@
 #if UNITTEST
 using Microsoft.Diagnostics.Monitoring.WebApi;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/MetricsOptions.cs

@@ -9,7 +9,7 @@
 #if UNITTEST
 using Microsoft.Diagnostics.Monitoring.WebApi;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/MetricsOptionsDefaults.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/Microsoft.Diagnostics.Monitoring.WebApi.csproj

@@ -42,7 +42,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="dotnet-monitor" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.OpenApiGen" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi.UnitTests" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/DotnetMonitorInfo.cs

@@ -5,9 +5,9 @@
 using System.Text.Json.Serialization;
 
 #if UNITTEST
-using Microsoft.Diagnostics.Monitoring.UnitTests.Options;
+using Microsoft.Diagnostics.Monitoring.TestCommon.Options;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Models
+namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/DumpType.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Models
+namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/EgressOperationStatus.cs

@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Models
+namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/LogsConfiguration.cs

@@ -8,7 +8,7 @@
 using System.Text.Json.Serialization;
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Models
+namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/ProcessIdentifier.cs

@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Models
+namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/Models/ProcessInfo.cs

@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 
 #if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Models
+namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/ProcessFilterOptions.cs

@@ -10,7 +10,7 @@
 #if UNITTEST
 using Microsoft.Diagnostics.Monitoring.WebApi;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Microsoft.Diagnostics.Monitoring.WebApi/StorageOptions.cs

@@ -7,7 +7,7 @@
 #if UNITTEST
 using Microsoft.Diagnostics.Monitoring.WebApi;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Options
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Options
 #else
 namespace Microsoft.Diagnostics.Monitoring.WebApi
 #endif

src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs

@@ -2,16 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Xunit;
-using Xunit.Abstractions;
-using System.IO;
-using System.Threading.Tasks;
-using System.Collections.Generic;
+using Microsoft.Diagnostics.Monitoring.TestCommon.Runners;
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
-using Microsoft.Diagnostics.Monitoring.TestCommon;
 using System.Threading;
-using Microsoft.Diagnostics.Monitoring.UnitTests.Runners;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests
 {

src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj

@@ -10,7 +10,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Microsoft.Diagnostics.Monitoring.Tool.UnitTests\Microsoft.Diagnostics.Monitoring.Tool.UnitTests.csproj" />
+        <ProjectReference Include="..\Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests\Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj" />
     </ItemGroup>
 
 </Project>

src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/SchemaGenerator.cs

@@ -1,9 +1,8 @@
-using Microsoft.Diagnostics.Monitoring.UnitTests.Options;
+using Microsoft.Diagnostics.Monitoring.TestCommon.Options;
 using NJsonSchema;
 using NJsonSchema.Generation;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.Diagnostics.Monitoring.ConfigurationSchema
 {

src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs

@@ -2,8 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Monitoring.TestCommon;
-using Microsoft.Diagnostics.Monitoring.UnitTests.Runners;
+using Microsoft.Diagnostics.Monitoring.TestCommon.Runners;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/CommonTestTimeouts.cs

@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests
+namespace Microsoft.Diagnostics.Monitoring.TestCommon
 {
     public static class CommonTestTimeouts
     {

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/DiagnosticPortHelper.cs

@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Monitoring.UnitTests.Options;
+using Microsoft.Diagnostics.Monitoring.TestCommon.Options;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests
+namespace Microsoft.Diagnostics.Monitoring.TestCommon
 {
     public static class DiagnosticPortHelper
     {

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/AppRunner.cs

@@ -2,8 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Monitoring.TestCommon;
-using Microsoft.Diagnostics.Monitoring.UnitTests.Options;
+using Microsoft.Diagnostics.Monitoring.TestCommon.Options;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,7 +13,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Runners
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Runners
 {
     /// <summary>
     /// Runner for running the unit test application.

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/AppRunnerExtensions.cs

@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Runners
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Runners
 {
     public static class AppRunnerExtensions
     {

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/ConsoleLogEvent.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Runners
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Runners
 {
     // All log events have this structure (plus additional fields
     // not needed by the test runner for identifying events).

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/DotNetRunner.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-using Microsoft.Diagnostics.Monitoring.TestCommon;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -11,7 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Runners
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Runners
 {
     /// <summary>
     /// Runner for running dotnet processes.

src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/LoggingRunnerAdapter.cs

@@ -2,15 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Diagnostics.Monitoring.TestCommon;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 
-namespace Microsoft.Diagnostics.Monitoring.UnitTests.Runners
+namespace Microsoft.Diagnostics.Monitoring.TestCommon.Runners
 {
     public sealed class LoggingRunnerAdapter : IAsyncDisposable
     {