Merge pull request #705 from jander-msft/dev/jander/m2t

dotnet · Aug 11, 2021 · f6c07d5 · f6c07d5
2 parents 00db128 + c657b85
commit f6c07d5
Show file tree

Hide file tree

Showing 20 changed files with 170 additions and 178 deletions.
diff --git a/documentation/schema.json b/documentation/schema.json
@@ -850,15 +850,14 @@
       }
     },
     "JsonConsoleFormatterOptions": {
-      "title": "JsonConsoleFormatterOptions",
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "JsonWriterOptions": {
           "description": "Gets or sets JsonWriterOptions.",
           "oneOf": [
             {
-              "$ref": "#/definitions/JsonConsoleFormatterOptions/definitions/JsonWriterOptions"
+              "$ref": "#/definitions/JsonWriterOptions"
             }
           ]
         },
@@ -878,59 +877,56 @@
           "description": "Gets or sets whether or not UTC timezone should be used for timestamps in logging messages. Defaults to false.",
           "default": false
         }
-      },
-      "definitions": {
-        "JsonWriterOptions": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "Encoder": {
-              "oneOf": [
-                {
-                  "type": "null"
-                },
-                {
-                  "$ref": "#/definitions/JsonConsoleFormatterOptions/definitions/JavaScriptEncoder"
-                }
-              ]
-            },
-            "Indented": {
-              "type": "boolean"
-            },
-            "SkipValidation": {
-              "type": "boolean"
-            }
-          }
-        },
-        "JavaScriptEncoder": {
-          "allOf": [
+      }
+    },
+    "JsonWriterOptions": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "Encoder": {
+          "oneOf": [
             {
-              "$ref": "#/definitions/JsonConsoleFormatterOptions/definitions/TextEncoder"
+              "type": "null"
             },
             {
-              "type": "object",
-              "x-abstract": true,
-              "additionalProperties": false
+              "$ref": "#/definitions/JavaScriptEncoder"
             }
           ]
         },
-        "TextEncoder": {
+        "Indented": {
+          "type": "boolean"
+        },
+        "SkipValidation": {
+          "type": "boolean"
+        }
+      }
+    },
+    "JavaScriptEncoder": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/TextEncoder"
+        },
+        {
           "type": "object",
           "x-abstract": true,
           "additionalProperties": false
         }
-      }
+      ]
+    },
+    "TextEncoder": {
+      "type": "object",
+      "x-abstract": true,
+      "additionalProperties": false
     },
     "SimpleConsoleFormatterOptions": {
-      "title": "SimpleConsoleFormatterOptions",
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "ColorBehavior": {
           "description": "Determines when to use color when logging messages.",
           "oneOf": [
             {
-              "$ref": "#/definitions/SimpleConsoleFormatterOptions/definitions/LoggerColorBehavior"
+              "$ref": "#/definitions/LoggerColorBehavior"
             }
           ]
         },
@@ -954,26 +950,23 @@
           "description": "Gets or sets whether or not UTC timezone should be used for timestamps in logging messages. Defaults to false.",
           "default": false
         }
-      },
-      "definitions": {
-        "LoggerColorBehavior": {
-          "type": "string",
-          "description": "",
-          "x-enumNames": [
-            "Default",
-            "Enabled",
-            "Disabled"
-          ],
-          "enum": [
-            "Default",
-            "Enabled",
-            "Disabled"
-          ]
-        }
       }
     },
+    "LoggerColorBehavior": {
+      "type": "string",
+      "description": "",
+      "x-enumNames": [
+        "Default",
+        "Enabled",
+        "Disabled"
+      ],
+      "enum": [
+        "Default",
+        "Enabled",
+        "Disabled"
+      ]
+    },
     "ConsoleFormatterOptions": {
-      "title": "ConsoleFormatterOptions",
       "type": "object",
       "additionalProperties": false,
       "properties": {

diff --git a/eng/Version.Details.xml b/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.21406.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="5.0.0-preview.21409.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>3f15cc67105068c47743e8719c0e131dac9abb83</Sha>
+      <Sha>7cb03dbd4b93564f1d45c9f04ac8bf8961e01cc7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21406.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="5.0.0-preview.21409.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>3f15cc67105068c47743e8719c0e131dac9abb83</Sha>
+      <Sha>7cb03dbd4b93564f1d45c9f04ac8bf8961e01cc7</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
@@ -22,13 +22,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>382667fff0b58c362855a42c3529ba294fd0514c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.240201">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.240901">
       <Uri>https://github.com/dotnet/symstore</Uri>
-      <Sha>a2ecfd399a548818cd6e596fa401aae42d01c77e</Sha>
+      <Sha>d8e2990b89c53632653d7d67f3481cc72773f25c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21408.1">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21410.1">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>9b6afb49f6981de4e242e4781a88caf3804e83e9</Sha>
+      <Sha>3535cfb61dd955a7fa6c31bdf72a3eba5353f1ce</Sha>
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21406.5">
       <Uri>https://github.com/dotnet/runtime</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -29,14 +29,14 @@
     <!-- dotnet/arcade references -->
     <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21406.6</MicrosoftDotNetXUnitExtensionsVersion>
     <!-- dotnet/aspnetcore references -->
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21408.1</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21410.1</VSRedistCommonAspNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21406.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21406.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>5.0.0-preview.21409.1</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>5.0.0-preview.21409.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/runtime references -->
     <VSRedistCommonNetCoreSharedFrameworkx6460Version>6.0.0-rc.1.21406.5</VSRedistCommonNetCoreSharedFrameworkx6460Version>
     <!-- dotnet/symstore references -->
-    <MicrosoftFileFormatsVersion>1.0.240201</MicrosoftFileFormatsVersion>
+    <MicrosoftFileFormatsVersion>1.0.240901</MicrosoftFileFormatsVersion>
   </PropertyGroup>
   <PropertyGroup Label="Runtime Versions">
     <MicrosoftNETCoreApp31Version>3.1.15</MicrosoftNETCoreApp31Version>

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/DotnetMonitorInfo.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/DotnetMonitorInfo.cs
@@ -4,13 +4,7 @@
 
 using System.Text.Json.Serialization;
 
-#if UNITTEST
-using Microsoft.Diagnostics.Monitoring.WebApi;
-
-namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
-#else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
-#endif
 {
     public class DotnetMonitorInfo
     {

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/DumpType.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/DumpType.cs
@@ -2,11 +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.
 
-#if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
-#else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
-#endif
 {
     public enum DumpType
     {

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/EgressOperationStatus.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/EgressOperationStatus.cs
@@ -3,16 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 
-#if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
-#else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
-#endif
 {
     /// <summary>
     /// Represents a partial model when enumerating all operations.

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/LogsConfiguration.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/LogsConfiguration.cs
@@ -7,11 +7,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-#if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
-#else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
-#endif
 {
     public class LogsConfiguration
     {

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/ProcessIdentifier.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/ProcessIdentifier.cs
@@ -5,11 +5,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-#if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
-#else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
-#endif
 {
     public class ProcessIdentifier
     {

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/ProcessInfo.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/ProcessInfo.cs
@@ -5,11 +5,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-#if UNITTEST
-namespace Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.Models
-#else
 namespace Microsoft.Diagnostics.Monitoring.WebApi.Models
-#endif
 {
     public class ProcessInfo
     {