Skip to content

Commit 5917b73

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[feature/10.0] Update dependencies from dotnet/dotnet (#8278)
[feature/10.0] Update dependencies from dotnet/dotnet - Fix build errors - Fix schema ordering - Fix listen mode test - Update temp file generation
1 parent 765da36 commit 5917b73

39 files changed

+857
-247
lines changed

‎documentation/openapi.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,8 +1651,8 @@
16511651
"maximum": 2147483647,
16521652
"minimum": 1,
16531653
"type": "integer",
1654-
"nullable": true,
1655-
"format": "int32"
1654+
"format": "int32",
1655+
"nullable": true
16561656
}
16571657
},
16581658
"additionalProperties": false
@@ -1665,8 +1665,8 @@
16651665
},
16661666
"stateReason": {
16671667
"type": "string",
1668-
"nullable": true,
1669-
"description": "Human-readable explanation for the current state of the collection rule."
1668+
"description": "Human-readable explanation for the current state of the collection rule.",
1669+
"nullable": true
16701670
}
16711671
},
16721672
"additionalProperties": false
@@ -1691,32 +1691,32 @@
16911691
},
16921692
"actionCountSlidingWindowDurationLimit": {
16931693
"type": "string",
1694-
"nullable": true,
16951694
"description": "The sliding window duration in which the actionCountLimit is the maximum number of occurrences (as defined by Limits).",
16961695
"format": "time-span",
1696+
"nullable": true,
16971697
"example": "00:00:30"
16981698
},
16991699
"slidingWindowDurationCountdown": {
17001700
"type": "string",
1701-
"nullable": true,
17021701
"description": "The amount of time that needs to pass before the slidingWindowOccurrences drops below the actionCountLimit",
17031702
"format": "time-span",
1703+
"nullable": true,
17041704
"example": "00:00:30"
17051705
},
17061706
"ruleFinishedCountdown": {
17071707
"type": "string",
1708-
"nullable": true,
17091708
"description": "The amount of time that needs to pass before the rule is finished",
17101709
"format": "time-span",
1710+
"nullable": true,
17111711
"example": "00:00:30"
17121712
},
17131713
"state": {
17141714
"$ref": "#/components/schemas/CollectionRuleState"
17151715
},
17161716
"stateReason": {
17171717
"type": "string",
1718-
"nullable": true,
1719-
"description": "Human-readable explanation for the current state of the collection rule."
1718+
"description": "Human-readable explanation for the current state of the collection rule.",
1719+
"nullable": true
17201720
}
17211721
},
17221722
"additionalProperties": false
@@ -1745,29 +1745,29 @@
17451745
"properties": {
17461746
"version": {
17471747
"type": "string",
1748-
"nullable": true,
1749-
"description": "The dotnet monitor version."
1748+
"description": "The dotnet monitor version.",
1749+
"nullable": true
17501750
},
17511751
"runtimeVersion": {
17521752
"type": "string",
1753-
"nullable": true,
1754-
"description": "The dotnet runtime version."
1753+
"description": "The dotnet runtime version.",
1754+
"nullable": true
17551755
},
17561756
"diagnosticPortMode": {
17571757
"$ref": "#/components/schemas/DiagnosticPortConnectionMode"
17581758
},
17591759
"diagnosticPortName": {
17601760
"type": "string",
1761-
"nullable": true,
1762-
"description": "The name of the named pipe or unix domain socket to use for connecting to the diagnostic server."
1761+
"description": "The name of the named pipe or unix domain socket to use for connecting to the diagnostic server.",
1762+
"nullable": true
17631763
},
17641764
"capabilities": {
17651765
"type": "array",
1766-
"nullable": true,
17671766
"items": {
17681767
"$ref": "#/components/schemas/MonitorCapability"
17691768
},
1770-
"description": "The capabilities provided by dotnet-monitor."
1769+
"description": "The capabilities provided by dotnet-monitor.",
1770+
"nullable": true
17711771
}
17721772
},
17731773
"additionalProperties": false
@@ -1801,17 +1801,17 @@
18011801
},
18021802
"providers": {
18031803
"type": "array",
1804-
"nullable": true,
18051804
"items": {
18061805
"$ref": "#/components/schemas/EventMetricsProvider"
1807-
}
1806+
},
1807+
"nullable": true
18081808
},
18091809
"meters": {
18101810
"type": "array",
1811-
"nullable": true,
18121811
"items": {
18131812
"$ref": "#/components/schemas/EventMetricsMeter"
1814-
}
1813+
},
1814+
"nullable": true
18151815
}
18161816
},
18171817
"additionalProperties": false
@@ -1828,10 +1828,10 @@
18281828
},
18291829
"instrumentNames": {
18301830
"type": "array",
1831-
"nullable": true,
18321831
"items": {
18331832
"type": "string"
1834-
}
1833+
},
1834+
"nullable": true
18351835
}
18361836
},
18371837
"additionalProperties": false
@@ -1848,10 +1848,10 @@
18481848
},
18491849
"counterNames": {
18501850
"type": "array",
1851-
"nullable": true,
18521851
"items": {
18531852
"type": "string"
1854-
}
1853+
},
1854+
"nullable": true
18551855
}
18561856
},
18571857
"additionalProperties": false
@@ -1900,10 +1900,10 @@
19001900
},
19011901
"arguments": {
19021902
"type": "object",
1903-
"nullable": true,
19041903
"additionalProperties": {
19051904
"type": "string"
1906-
}
1905+
},
1906+
"nullable": true
19071907
}
19081908
},
19091909
"additionalProperties": false
@@ -1935,17 +1935,17 @@
19351935
"properties": {
19361936
"include": {
19371937
"type": "array",
1938-
"nullable": true,
19391938
"items": {
19401939
"$ref": "#/components/schemas/ExceptionFilter"
1941-
}
1940+
},
1941+
"nullable": true
19421942
},
19431943
"exclude": {
19441944
"type": "array",
1945-
"nullable": true,
19461945
"items": {
19471946
"$ref": "#/components/schemas/ExceptionFilter"
1948-
}
1947+
},
1948+
"nullable": true
19491949
}
19501950
},
19511951
"additionalProperties": false
@@ -1973,11 +1973,11 @@
19731973
},
19741974
"filterSpecs": {
19751975
"type": "object",
1976-
"nullable": true,
19771976
"additionalProperties": {
19781977
"$ref": "#/components/schemas/NullableOfLogLevel"
19791978
},
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."
1979+
"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.",
1980+
"nullable": true
19811981
},
19821982
"useAppFilters": {
19831983
"type": "boolean",
@@ -2041,7 +2041,6 @@
20412041
},
20422042
"OperationError": {
20432043
"type": "object",
2044-
"nullable": true,
20452044
"properties": {
20462045
"code": {
20472046
"type": "string",
@@ -2052,11 +2051,11 @@
20522051
"nullable": true
20532052
}
20542053
},
2055-
"additionalProperties": false
2054+
"additionalProperties": false,
2055+
"nullable": true
20562056
},
20572057
"OperationProcessInfo": {
20582058
"type": "object",
2059-
"nullable": true,
20602059
"properties": {
20612060
"pid": {
20622061
"type": "integer",
@@ -2072,7 +2071,8 @@
20722071
}
20732072
},
20742073
"additionalProperties": false,
2075-
"description": "Represents the details of a given process used in an operation."
2074+
"description": "Represents the details of a given process used in an operation.",
2075+
"nullable": true
20762076
},
20772077
"OperationState": {
20782078
"enum": [
@@ -2119,10 +2119,10 @@
21192119
"tags": {
21202120
"uniqueItems": true,
21212121
"type": "array",
2122-
"nullable": true,
21232122
"items": {
21242123
"type": "string"
2125-
}
2124+
},
2125+
"nullable": true
21262126
}
21272127
},
21282128
"additionalProperties": false,
@@ -2155,10 +2155,10 @@
21552155
"tags": {
21562156
"uniqueItems": true,
21572157
"type": "array",
2158-
"nullable": true,
21592158
"items": {
21602159
"type": "string"
2161-
}
2160+
},
2161+
"nullable": true
21622162
}
21632163
},
21642164
"additionalProperties": false,
@@ -2177,8 +2177,8 @@
21772177
},
21782178
"status": {
21792179
"type": "integer",
2180-
"nullable": true,
2181-
"format": "int32"
2180+
"format": "int32",
2181+
"nullable": true
21822182
},
21832183
"detail": {
21842184
"type": "string",
@@ -2270,8 +2270,8 @@
22702270
},
22712271
"status": {
22722272
"type": "integer",
2273-
"nullable": true,
2274-
"format": "int32"
2273+
"format": "int32",
2274+
"nullable": true
22752275
},
22762276
"detail": {
22772277
"type": "string",
@@ -2283,13 +2283,13 @@
22832283
},
22842284
"errors": {
22852285
"type": "object",
2286-
"nullable": true,
22872286
"additionalProperties": {
22882287
"type": "array",
22892288
"items": {
22902289
"type": "string"
22912290
}
2292-
}
2291+
},
2292+
"nullable": true
22932293
}
22942294
},
22952295
"additionalProperties": { }

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25267.102">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-rc.1.25376.102">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
5+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25374.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -12,55 +12,55 @@
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
1313
<Sha>d7d850097b755b343851f9c5b93325aacb8323aa</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25267.102">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25376.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
17+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25267.102">
21+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25376.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
23+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25267.102">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25376.102">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
27+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25267.102">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25376.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
31+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25267.102">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25376.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
35+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25267.102">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25376.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
39+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25267.102">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25376.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
43+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.637401">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>d7d850097b755b343851f9c5b93325aacb8323aa</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25267.102">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.7.25376.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
51+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25267.102">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-rc.1.25376.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
55+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25267.102">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.7.25376.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
59+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25267.102">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.7.25376.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
63+
<Sha>03fb78540de4e5b3c8874da30e60b58321956993</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

0 commit comments

Comments
 (0)