Merge release/10.0 to main.

.github/dependabot.template.yml

@@ -8,6 +8,7 @@
 #! to the list of TFMs that the major version uses for build and test.
 #@ def getTfms():
 #@   return {
+#@     "10": [ "net10.0", "net9.0", "net8.0" ],
 #@     "9": [ "net9.0", "net8.0" ],
 #@     "8": [ "net8.0" ],
 #@   }
@@ -17,7 +18,8 @@
 #! target branch and which major version of .NET Monitor it builds.
 #@ def getBranches():
 #@   return [
-#@     struct.encode({"name": "main", "majorVersion": "9"}),
+#@     struct.encode({"name": "main", "majorVersion": "10"}),
+#@     struct.encode({"name": "release/10.0", "majorVersion": "10"}),
 #@     struct.encode({"name": "release/9.0", "majorVersion": "9"}),
 #@     struct.encode({"name": "release/8.x", "majorVersion": "8"}),
 #@   ]

.github/dependabot.yml

@@ -34,6 +34,23 @@ updates:
   target-branch: main
   commit-message:
     prefix: '[main] '
+- package-ecosystem: nuget
+  directory: /eng/dependabot/net10.0
+  schedule:
+    interval: daily
+  target-branch: main
+  ignore:
+  - dependency-name: '*'
+    update-types:
+    - version-update:semver-major
+  commit-message:
+    prefix: '[main] '
+  groups:
+    runtime-dependencies:
+      patterns:
+      - Microsoft.Extensions.*
+      - Microsoft.NETCore.DotNetHost
+      - System.Text.Json
 - package-ecosystem: nuget
   directory: /eng/dependabot/net9.0
   schedule:
@@ -68,6 +85,86 @@ updates:
       - Microsoft.Extensions.*
       - Microsoft.NETCore.DotNetHost
       - System.Text.Json
+- package-ecosystem: nuget
+  directory: /eng/dependabot/independent
+  schedule:
+    interval: daily
+  target-branch: release/10.0
+  ignore:
+  - dependency-name: Microsoft.Extensions.*
+    update-types:
+    - version-update:semver-major
+  - dependency-name: Moq
+  commit-message:
+    prefix: '[release/10.0] '
+  groups:
+    azure-sdk-dependencies:
+      patterns:
+      - Azure.Core
+      - Azure.Identity
+      - Azure.Storage.*
+    identity-dependencies:
+      patterns:
+      - Microsoft.Identity.*
+      - Microsoft.IdentityModel.*
+- package-ecosystem: nuget
+  directory: /eng/dependabot/nuget.org
+  schedule:
+    interval: daily
+  target-branch: release/10.0
+  commit-message:
+    prefix: '[release/10.0] '
+- package-ecosystem: nuget
+  directory: /eng/dependabot/net10.0
+  schedule:
+    interval: daily
+  target-branch: release/10.0
+  ignore:
+  - dependency-name: '*'
+    update-types:
+    - version-update:semver-major
+  commit-message:
+    prefix: '[release/10.0] '
+  groups:
+    runtime-dependencies:
+      patterns:
+      - Microsoft.Extensions.*
+      - Microsoft.NETCore.DotNetHost
+      - System.Text.Json
+- package-ecosystem: nuget
+  directory: /eng/dependabot/net9.0
+  schedule:
+    interval: daily
+  target-branch: release/10.0
+  ignore:
+  - dependency-name: '*'
+    update-types:
+    - version-update:semver-major
+  commit-message:
+    prefix: '[release/10.0] '
+  groups:
+    runtime-dependencies:
+      patterns:
+      - Microsoft.Extensions.*
+      - Microsoft.NETCore.DotNetHost
+      - System.Text.Json
+- package-ecosystem: nuget
+  directory: /eng/dependabot/net8.0
+  schedule:
+    interval: daily
+  target-branch: release/10.0
+  ignore:
+  - dependency-name: '*'
+    update-types:
+    - version-update:semver-major
+  commit-message:
+    prefix: '[release/10.0] '
+  groups:
+    runtime-dependencies:
+      patterns:
+      - Microsoft.Extensions.*
+      - Microsoft.NETCore.DotNetHost
+      - System.Text.Json
 - package-ecosystem: nuget
   directory: /eng/dependabot/independent
   schedule:

.vscode/launch.json

@@ -14,7 +14,7 @@
             "args": {
                 "fileName": "${workspaceFolder}/eng/branch-vscode-config",
                 "key": "TFM",
-                "default": "net9.0"
+                "default": "net10.0"
             }
         }
     ],

Directory.Packages.props

@@ -28,7 +28,6 @@
     <PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="$(NJsonSchemaVersion)" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
-    <PackageVersion Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
     <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
   </ItemGroup>
 </Project>

NuGet.config

@@ -9,15 +9,20 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-int-dotnet-dotnet-b0f34d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51-1/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -26,6 +31,9 @@
   <disabledPackageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <add key="darc-int-dotnet-dotnet-b0f34d5-1" value="true" />
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->

cspell.json

@@ -62,6 +62,7 @@
         "Ldstr",
         "libc",
         "livemetrics",
+        "Microbuild",
         "minidump",
         "minio",
         "mitigations",

documentation/openapi.json

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "dotnet-monitor",
     "version": "1.0"
@@ -187,14 +187,7 @@
             "in": "query",
             "description": "The type of dump to capture.",
             "schema": {
-              "enum": [
-                "Full",
-                "Mini",
-                "WithHeap",
-                "Triage"
-              ],
-              "type": "string",
-              "default": "WithHeap"
+              "$ref": "#/components/schemas/DumpType"
             }
           },
           {
@@ -358,15 +351,7 @@
             "in": "query",
             "description": "The profiles enabled for the trace session.",
             "schema": {
-              "enum": [
-                "Cpu",
-                "Http",
-                "Logs",
-                "Metrics",
-                "GcCollect"
-              ],
-              "type": "string",
-              "default": "Cpu, Http, Metrics, GcCollect"
+              "$ref": "#/components/schemas/TraceProfile"
             }
           },
           {
@@ -1787,6 +1772,16 @@
         },
         "additionalProperties": false
       },
+      "DumpType": {
+        "enum": [
+          "Full",
+          "Mini",
+          "WithHeap",
+          "Triage"
+        ],
+        "type": "string",
+        "default": "WithHeap"
+      },
       "EventLevel": {
         "enum": [
           "LogAlways",
@@ -1965,7 +1960,8 @@
           "Critical",
           "None"
         ],
-        "type": "string"
+        "type": "string",
+        "nullable": true
       },
       "LogsConfiguration": {
         "required": [
@@ -2043,8 +2039,7 @@
             "nullable": true
           }
         },
-        "additionalProperties": false,
-        "nullable": true
+        "additionalProperties": false
       },
       "OperationProcessInfo": {
         "type": "object",
@@ -2063,8 +2058,7 @@
           }
         },
         "additionalProperties": false,
-        "description": "Represents the details of a given process used in an operation.",
-        "nullable": true
+        "description": "Represents the details of a given process used in an operation."
       },
       "OperationState": {
         "enum": [
@@ -2085,7 +2079,14 @@
             "nullable": true
           },
           "error": {
-            "$ref": "#/components/schemas/OperationError"
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/OperationError"
+              }
+            ]
           },
           "operationId": {
             "type": "string",
@@ -2099,7 +2100,14 @@
             "$ref": "#/components/schemas/OperationState"
           },
           "process": {
-            "$ref": "#/components/schemas/OperationProcessInfo"
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/OperationProcessInfo"
+              }
+            ]
           },
           "egressProviderName": {
             "type": "string",
@@ -2135,7 +2143,14 @@
             "$ref": "#/components/schemas/OperationState"
           },
           "process": {
-            "$ref": "#/components/schemas/OperationProcessInfo"
+            "oneOf": [
+              {
+                "nullable": true
+              },
+              {
+                "$ref": "#/components/schemas/OperationProcessInfo"
+              }
+            ]
           },
           "egressProviderName": {
             "type": "string",
@@ -2238,6 +2253,17 @@
         },
         "additionalProperties": false
       },
+      "TraceProfile": {
+        "enum": [
+          "Cpu",
+          "Http",
+          "Logs",
+          "Metrics",
+          "GcCollect"
+        ],
+        "type": "string",
+        "default": "Cpu, Http, Metrics, GcCollect"
+      },
       "ValidationProblemDetails": {
         "type": "object",
         "properties": {

eng/Common.props

@@ -1,8 +1,8 @@
 <Project>
   <!-- These properties are shared among the Arcade build infrastructure as well as individual project build. -->
   <PropertyGroup>
-    <LatestTargetFramework>net9.0</LatestTargetFramework>
+    <LatestTargetFramework>net10.0</LatestTargetFramework>
     <LatestToolTargetFramework>$(LatestTargetFramework)</LatestToolTargetFramework>
     <ArtifactsNonShippingBundlesDir>$(ArtifactsDir)bundles\$(Configuration)\NonShipping\</ArtifactsNonShippingBundlesDir>
   </PropertyGroup>
-</Project>
+</Project>