Skip to content

Commit e763ca1

Browse files
jander-msftjander-msft
authored
[feature/10.0] .NET 10 build and OpenAPI generation update (#8035)
1 parent 95a0515 commit e763ca1

File tree

35 files changed

+384
-233
lines changed

35 files changed

+384
-233
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
2222
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
2323
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
24+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
2425
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
2526
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
2627
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />

‎documentation/openapi.json

Lines changed: 85 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "dotnet-monitor",
55
"version": "1.0"
@@ -187,14 +187,7 @@
187187
"in": "query",
188188
"description": "The type of dump to capture.",
189189
"schema": {
190-
"enum": [
191-
"Full",
192-
"Mini",
193-
"WithHeap",
194-
"Triage"
195-
],
196-
"type": "string",
197-
"default": "WithHeap"
190+
"$ref": "#/components/schemas/DumpType"
198191
}
199192
},
200193
{
@@ -358,15 +351,7 @@
358351
"in": "query",
359352
"description": "The profiles enabled for the trace session.",
360353
"schema": {
361-
"enum": [
362-
"Cpu",
363-
"Http",
364-
"Logs",
365-
"Metrics",
366-
"GcCollect"
367-
],
368-
"type": "string",
369-
"default": "Cpu, Http, Metrics, GcCollect"
354+
"$ref": "#/components/schemas/TraceProfile"
370355
}
371356
},
372357
{
@@ -1666,8 +1651,8 @@
16661651
"maximum": 2147483647,
16671652
"minimum": 1,
16681653
"type": "integer",
1669-
"format": "int32",
1670-
"nullable": true
1654+
"nullable": true,
1655+
"format": "int32"
16711656
}
16721657
},
16731658
"additionalProperties": false
@@ -1680,8 +1665,8 @@
16801665
},
16811666
"stateReason": {
16821667
"type": "string",
1683-
"description": "Human-readable explanation for the current state of the collection rule.",
1684-
"nullable": true
1668+
"nullable": true,
1669+
"description": "Human-readable explanation for the current state of the collection rule."
16851670
}
16861671
},
16871672
"additionalProperties": false
@@ -1706,32 +1691,32 @@
17061691
},
17071692
"actionCountSlidingWindowDurationLimit": {
17081693
"type": "string",
1694+
"nullable": true,
17091695
"description": "The sliding window duration in which the actionCountLimit is the maximum number of occurrences (as defined by Limits).",
17101696
"format": "time-span",
1711-
"nullable": true,
17121697
"example": "00:00:30"
17131698
},
17141699
"slidingWindowDurationCountdown": {
17151700
"type": "string",
1701+
"nullable": true,
17161702
"description": "The amount of time that needs to pass before the slidingWindowOccurrences drops below the actionCountLimit",
17171703
"format": "time-span",
1718-
"nullable": true,
17191704
"example": "00:00:30"
17201705
},
17211706
"ruleFinishedCountdown": {
17221707
"type": "string",
1708+
"nullable": true,
17231709
"description": "The amount of time that needs to pass before the rule is finished",
17241710
"format": "time-span",
1725-
"nullable": true,
17261711
"example": "00:00:30"
17271712
},
17281713
"state": {
17291714
"$ref": "#/components/schemas/CollectionRuleState"
17301715
},
17311716
"stateReason": {
17321717
"type": "string",
1733-
"description": "Human-readable explanation for the current state of the collection rule.",
1734-
"nullable": true
1718+
"nullable": true,
1719+
"description": "Human-readable explanation for the current state of the collection rule."
17351720
}
17361721
},
17371722
"additionalProperties": false
@@ -1760,33 +1745,43 @@
17601745
"properties": {
17611746
"version": {
17621747
"type": "string",
1763-
"description": "The dotnet monitor version.",
1764-
"nullable": true
1748+
"nullable": true,
1749+
"description": "The dotnet monitor version."
17651750
},
17661751
"runtimeVersion": {
17671752
"type": "string",
1768-
"description": "The dotnet runtime version.",
1769-
"nullable": true
1753+
"nullable": true,
1754+
"description": "The dotnet runtime version."
17701755
},
17711756
"diagnosticPortMode": {
17721757
"$ref": "#/components/schemas/DiagnosticPortConnectionMode"
17731758
},
17741759
"diagnosticPortName": {
17751760
"type": "string",
1776-
"description": "The name of the named pipe or unix domain socket to use for connecting to the diagnostic server.",
1777-
"nullable": true
1761+
"nullable": true,
1762+
"description": "The name of the named pipe or unix domain socket to use for connecting to the diagnostic server."
17781763
},
17791764
"capabilities": {
17801765
"type": "array",
1766+
"nullable": true,
17811767
"items": {
17821768
"$ref": "#/components/schemas/MonitorCapability"
17831769
},
1784-
"description": "The capabilities provided by dotnet-monitor.",
1785-
"nullable": true
1770+
"description": "The capabilities provided by dotnet-monitor."
17861771
}
17871772
},
17881773
"additionalProperties": false
17891774
},
1775+
"DumpType": {
1776+
"enum": [
1777+
"Full",
1778+
"Mini",
1779+
"WithHeap",
1780+
"Triage"
1781+
],
1782+
"type": "string",
1783+
"default": "WithHeap"
1784+
},
17901785
"EventLevel": {
17911786
"enum": [
17921787
"LogAlways",
@@ -1806,17 +1801,17 @@
18061801
},
18071802
"providers": {
18081803
"type": "array",
1804+
"nullable": true,
18091805
"items": {
18101806
"$ref": "#/components/schemas/EventMetricsProvider"
1811-
},
1812-
"nullable": true
1807+
}
18131808
},
18141809
"meters": {
18151810
"type": "array",
1811+
"nullable": true,
18161812
"items": {
18171813
"$ref": "#/components/schemas/EventMetricsMeter"
1818-
},
1819-
"nullable": true
1814+
}
18201815
}
18211816
},
18221817
"additionalProperties": false
@@ -1833,10 +1828,10 @@
18331828
},
18341829
"instrumentNames": {
18351830
"type": "array",
1831+
"nullable": true,
18361832
"items": {
18371833
"type": "string"
1838-
},
1839-
"nullable": true
1834+
}
18401835
}
18411836
},
18421837
"additionalProperties": false
@@ -1853,10 +1848,10 @@
18531848
},
18541849
"counterNames": {
18551850
"type": "array",
1851+
"nullable": true,
18561852
"items": {
18571853
"type": "string"
1858-
},
1859-
"nullable": true
1854+
}
18601855
}
18611856
},
18621857
"additionalProperties": false
@@ -1905,10 +1900,10 @@
19051900
},
19061901
"arguments": {
19071902
"type": "object",
1903+
"nullable": true,
19081904
"additionalProperties": {
19091905
"type": "string"
1910-
},
1911-
"nullable": true
1906+
}
19121907
}
19131908
},
19141909
"additionalProperties": false
@@ -1940,17 +1935,17 @@
19401935
"properties": {
19411936
"include": {
19421937
"type": "array",
1938+
"nullable": true,
19431939
"items": {
19441940
"$ref": "#/components/schemas/ExceptionFilter"
1945-
},
1946-
"nullable": true
1941+
}
19471942
},
19481943
"exclude": {
19491944
"type": "array",
1945+
"nullable": true,
19501946
"items": {
19511947
"$ref": "#/components/schemas/ExceptionFilter"
1952-
},
1953-
"nullable": true
1948+
}
19541949
}
19551950
},
19561951
"additionalProperties": false
@@ -1978,11 +1973,11 @@
19781973
},
19791974
"filterSpecs": {
19801975
"type": "object",
1976+
"nullable": true,
19811977
"additionalProperties": {
1982-
"$ref": "#/components/schemas/LogLevel"
1978+
"$ref": "#/components/schemas/NullableOfLogLevel"
19831979
},
1984-
"description": "The logger categories and levels at which logs are collected. Setting the log level to null will have logs collected from the corresponding category at the level set in the LogLevel property.",
1985-
"nullable": true
1980+
"description": "The logger categories and levels at which logs are collected. Setting the log level to null will have logs collected from the corresponding category at the level set in the LogLevel property."
19861981
},
19871982
"useAppFilters": {
19881983
"type": "boolean",
@@ -2031,8 +2026,22 @@
20312026
},
20322027
"additionalProperties": false
20332028
},
2029+
"NullableOfLogLevel": {
2030+
"enum": [
2031+
"Trace",
2032+
"Debug",
2033+
"Information",
2034+
"Warning",
2035+
"Error",
2036+
"Critical",
2037+
"None"
2038+
],
2039+
"type": "string",
2040+
"nullable": true
2041+
},
20342042
"OperationError": {
20352043
"type": "object",
2044+
"nullable": true,
20362045
"properties": {
20372046
"code": {
20382047
"type": "string",
@@ -2043,11 +2052,11 @@
20432052
"nullable": true
20442053
}
20452054
},
2046-
"additionalProperties": false,
2047-
"nullable": true
2055+
"additionalProperties": false
20482056
},
20492057
"OperationProcessInfo": {
20502058
"type": "object",
2059+
"nullable": true,
20512060
"properties": {
20522061
"pid": {
20532062
"type": "integer",
@@ -2063,8 +2072,7 @@
20632072
}
20642073
},
20652074
"additionalProperties": false,
2066-
"description": "Represents the details of a given process used in an operation.",
2067-
"nullable": true
2075+
"description": "Represents the details of a given process used in an operation."
20682076
},
20692077
"OperationState": {
20702078
"enum": [
@@ -2111,10 +2119,10 @@
21112119
"tags": {
21122120
"uniqueItems": true,
21132121
"type": "array",
2122+
"nullable": true,
21142123
"items": {
21152124
"type": "string"
2116-
},
2117-
"nullable": true
2125+
}
21182126
}
21192127
},
21202128
"additionalProperties": false,
@@ -2147,10 +2155,10 @@
21472155
"tags": {
21482156
"uniqueItems": true,
21492157
"type": "array",
2158+
"nullable": true,
21502159
"items": {
21512160
"type": "string"
2152-
},
2153-
"nullable": true
2161+
}
21542162
}
21552163
},
21562164
"additionalProperties": false,
@@ -2169,8 +2177,8 @@
21692177
},
21702178
"status": {
21712179
"type": "integer",
2172-
"format": "int32",
2173-
"nullable": true
2180+
"nullable": true,
2181+
"format": "int32"
21742182
},
21752183
"detail": {
21762184
"type": "string",
@@ -2238,6 +2246,17 @@
22382246
},
22392247
"additionalProperties": false
22402248
},
2249+
"TraceProfile": {
2250+
"enum": [
2251+
"Cpu",
2252+
"Http",
2253+
"Logs",
2254+
"Metrics",
2255+
"GcCollect"
2256+
],
2257+
"type": "string",
2258+
"default": "Cpu, Http, Metrics, GcCollect"
2259+
},
22412260
"ValidationProblemDetails": {
22422261
"type": "object",
22432262
"properties": {
@@ -2251,8 +2270,8 @@
22512270
},
22522271
"status": {
22532272
"type": "integer",
2254-
"format": "int32",
2255-
"nullable": true
2273+
"nullable": true,
2274+
"format": "int32"
22562275
},
22572276
"detail": {
22582277
"type": "string",
@@ -2264,13 +2283,13 @@
22642283
},
22652284
"errors": {
22662285
"type": "object",
2286+
"nullable": true,
22672287
"additionalProperties": {
22682288
"type": "array",
22692289
"items": {
22702290
"type": "string"
22712291
}
2272-
},
2273-
"nullable": true
2292+
}
22742293
}
22752294
},
22762295
"additionalProperties": { }

‎eng/Common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<!-- These properties are shared among the Arcade build infrastructure as well as individual project build. -->
33
<PropertyGroup>
4-
<LatestTargetFramework>net9.0</LatestTargetFramework>
4+
<LatestTargetFramework>net10.0</LatestTargetFramework>
55
<LatestToolTargetFramework>$(LatestTargetFramework)</LatestToolTargetFramework>
66
<ArtifactsNonShippingBundlesDir>$(ArtifactsDir)bundles\$(Configuration)\NonShipping\</ArtifactsNonShippingBundlesDir>
77
</PropertyGroup>
8-
</Project>
8+
</Project>

0 commit comments

Comments
 (0)