Skip to content

Commit 9697712

Browse files
jander-msftjander-msft
committed
Merge branch 'main' of https://github.com/dotnet/dotnet-monitor into merge-main-to-9.x
2 parents a330097 + 5baeadb commit 9697712

File tree

108 files changed

+833
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+833
-823
lines changed

‎.github/workflows/spellcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
with:
1818
persist-credentials: false
1919

20-
- uses: streetsidesoftware/cspell-action@357d91b7153520efd453f404d76424cff0a29797
20+
- uses: streetsidesoftware/cspell-action@e464ae97d348eb3beb0c5a6296dc4388ad4484d9
2121
name: Documentation spellcheck
2222
if: ${{ !cancelled() }}
2323
with:
2424
files: '**/*.md'
2525
inline: error
2626
incremental_files_only: true
2727

28-
- uses: streetsidesoftware/cspell-action@357d91b7153520efd453f404d76424cff0a29797
28+
- uses: streetsidesoftware/cspell-action@e464ae97d348eb3beb0c5a6296dc4388ad4484d9
2929
name: Resx spellcheck
3030
if: ${{ !cancelled() }}
3131
with:
3232
files: 'src/**/*.resx'
3333
inline: error
3434
incremental_files_only: true
3535

36-
- uses: streetsidesoftware/cspell-action@357d91b7153520efd453f404d76424cff0a29797
36+
- uses: streetsidesoftware/cspell-action@e464ae97d348eb3beb0c5a6296dc4388ad4484d9
3737
name: Source code spellcheck
3838
if: ${{ !cancelled() }}
3939
with:

‎NuGet.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
<!-- Begin: Package sources from dotnet-runtime -->
1515
<!-- End: Package sources from dotnet-runtime -->
1616
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
17-
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
18-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
19-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
2017
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
2118
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
2219
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />

‎cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"hresult",
5656
"Hsts",
5757
"Impls",
58+
"inproc",
5859
"JITID",
5960
"JWTs",
6061
"LCID",
@@ -107,6 +108,7 @@
107108
"ukwn",
108109
"uninitialize",
109110
"Uninstallation",
111+
"uninstrumented",
110112
"uniquifier",
111113
"Unlocalized",
112114
"Unredacted",

‎documentation/schema.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,6 +1123,14 @@
11231123
"$ref": "#/definitions/ExceptionsConfiguration"
11241124
}
11251125
]
1126+
},
1127+
"CollectOnStartup": {
1128+
"type": [
1129+
"boolean",
1130+
"null"
1131+
],
1132+
"description": "[Experimental] Determines if exception collection should begin immediately",
1133+
"default": true
11261134
}
11271135
}
11281136
},

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
55
<Sha>4442a188f9200a57635373dcd640893c0e8dcc78</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
7+
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25255.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
9-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
9+
<Sha>8a951ade8ae70e5fc47345958cf716cc8e9cffe5</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25155.1">
11+
<Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="9.0.0-preview.25255.1">
1212
<Uri>https://github.com/dotnet/diagnostics</Uri>
13-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
13+
<Sha>8a951ade8ae70e5fc47345958cf716cc8e9cffe5</Sha>
1414
</Dependency>
15-
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25170.1">
15+
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25256.1">
1616
<Uri>https://github.com/dotnet/command-line-api</Uri>
17-
<Sha>931bc0d178882c11daf9e38ae88858691e2df2b9</Sha>
17+
<Sha>493a1d270887d7c51372fd17f774ea44b0c3101a</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
2121
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25076.3">
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25225.6">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.3">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
27+
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25225.6">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25255.3">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
31+
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25225.6">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25255.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
35+
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25225.6">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25255.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
39+
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25225.6">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25255.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
43+
<Sha>dba26274ff5a0906a1880443fc3c0466d1a298ae</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
45+
<Dependency Name="Microsoft.FileFormats" Version="1.0.625501">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
47-
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
47+
<Sha>8a951ade8ae70e5fc47345958cf716cc8e9cffe5</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
5050
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RepositoryUrl>https://github.com/dotnet/dotnet-monitor</RepositoryUrl>
66
<VersionPrefix>9.1.0</VersionPrefix>
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
8-
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
8+
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
99
<!-- Disable final version kind until merged into release branch. -->
1010
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
1111
<!--
@@ -27,9 +27,9 @@
2727
<!-- The TFMs of the dotnet-monitor tool. -->
2828
<ToolTargetFrameworks>$(LatestTargetFramework)</ToolTargetFrameworks>
2929
<!-- The TFMs of that the dotnet-monitor tool supports diagnosing. -->
30-
<TestTargetFrameworks>net6.0;net7.0;net8.0;$(LatestTargetFramework)</TestTargetFrameworks>
30+
<TestTargetFrameworks>net8.0;$(LatestTargetFramework)</TestTargetFrameworks>
3131
<!-- The TFM for generating schema.json and OpenAPI docs. -->
32-
<SchemaTargetFramework>net9.0</SchemaTargetFramework>
32+
<SchemaTargetFramework>$(LatestTargetFramework)</SchemaTargetFramework>
3333
</PropertyGroup>
3434
<PropertyGroup Label="Arcade">
3535
<UsingToolXliff>false</UsingToolXliff>
@@ -48,17 +48,17 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25225.6</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25225.6</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25255.3</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25255.3</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25255.3</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.1-rtm.24610.9</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
5757
<!-- dotnet/command-line-api references -->
58-
<SystemCommandLineVersion>2.0.0-beta5.25170.1</SystemCommandLineVersion>
58+
<SystemCommandLineVersion>2.0.0-beta5.25256.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
60-
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringVersion>
61-
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25155.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
60+
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25255.1</MicrosoftDiagnosticsMonitoringVersion>
61+
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25255.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
@@ -67,14 +67,9 @@
6767
<!-- dotnet/sdk references -->
6868
<VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.200-rtm.25073.13</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
6969
<!-- dotnet/symstore references -->
70-
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
70+
<MicrosoftFileFormatsVersion>1.0.625501</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>
7272
<PropertyGroup Label="Runtime Versions">
73-
<MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
74-
<MicrosoftNETCoreApp50Version>5.0.17</MicrosoftNETCoreApp50Version>
75-
<MicrosoftAspNetCoreApp50Version>$(MicrosoftNETCoreApp50Version)</MicrosoftAspNetCoreApp50Version>
76-
<MicrosoftAspNetCoreApp60Version>$(MicrosoftNETCoreApp60Version)</MicrosoftAspNetCoreApp60Version>
77-
<MicrosoftAspNetCoreApp70Version>$(MicrosoftNETCoreApp70Version)</MicrosoftAspNetCoreApp70Version>
7873
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>
7974
<MicrosoftAspNetCoreApp90Version>$(MicrosoftNETCoreApp90Version)</MicrosoftAspNetCoreApp90Version>
8075
</PropertyGroup>
@@ -88,23 +83,6 @@
8883
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
8984
<MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
9085
</PropertyGroup>
91-
<PropertyGroup Label=".NET 6 Dependent" Condition=" '$(TargetFramework)' == 'net6.0' ">
92-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp60Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
93-
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp60Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>
94-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions60Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
95-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging60Version)</MicrosoftExtensionsLoggingVersion>
96-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions60Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
97-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole60Version)</MicrosoftExtensionsLoggingConsoleVersion>
98-
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
99-
</PropertyGroup>
100-
<PropertyGroup Label=".NET 7 Dependent" Condition=" '$(TargetFramework)' == 'net7.0' ">
101-
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp70Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
102-
<MicrosoftExtensionsConfigurationAbstractionsVersion>$(MicrosoftExtensionsConfigurationAbstractions70Version)</MicrosoftExtensionsConfigurationAbstractionsVersion>
103-
<MicrosoftExtensionsLoggingVersion>$(MicrosoftExtensionsLogging70Version)</MicrosoftExtensionsLoggingVersion>
104-
<MicrosoftExtensionsLoggingAbstractionsVersion>$(MicrosoftExtensionsLoggingAbstractions70Version)</MicrosoftExtensionsLoggingAbstractionsVersion>
105-
<MicrosoftExtensionsLoggingConsoleVersion>$(MicrosoftExtensionsLoggingConsole70Version)</MicrosoftExtensionsLoggingConsoleVersion>
106-
<SystemTextJsonVersion>$(SystemTextJson80Version)</SystemTextJsonVersion>
107-
</PropertyGroup>
10886
<PropertyGroup Label=".NET 8 Dependent" Condition=" '$(TargetFramework)' == 'net8.0' ">
10987
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
11088
<MicrosoftAspNetCoreAuthenticationNegotiateVersion>$(MicrosoftAspNetCoreApp80Version)</MicrosoftAspNetCoreAuthenticationNegotiateVersion>

‎eng/dependabot/Versions.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project>
22
<Import Project="independent/Versions.props" />
33
<Import Project="nuget.org/Versions.props" />
4-
<Import Project="net6.0/Versions.props" />
5-
<Import Project="net7.0/Versions.props" />
64
<Import Project="net8.0/Versions.props" />
75
<Import Project="net9.0/Versions.props" />
8-
<Import Project="netcoreapp3.1/Versions.props" />
96
</Project>

‎eng/dependabot/independent/Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<!-- Third-party references -->
1818
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
1919
<PackageReference Include="NJsonSchema" Version="$(NJsonSchemaVersion)" />
20-
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleAspNetCoreVersion)" />
2120
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2221
<PackageReference Include="AWSSDK.S3" Version="$(AwsSdkS3Version)" />
2322
<PackageReference Include="AWSSDK.SecurityToken" Version="$(AwsSdkSecurityTokenVersion)" />

‎eng/dependabot/independent/Versions.props

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
<!-- Import references updated by Dependabot. -->
33

44
<PropertyGroup>
5-
<AzureCoreVersion>1.44.1</AzureCoreVersion>
5+
<AzureCoreVersion>1.45.0</AzureCoreVersion>
66
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
7-
<AzureStorageBlobsVersion>12.23.0</AzureStorageBlobsVersion>
8-
<AzureStorageQueuesVersion>12.21.0</AzureStorageQueuesVersion>
9-
<MicrosoftIdentityWebVersion>3.6.2</MicrosoftIdentityWebVersion>
10-
<MicrosoftOpenApiReadersVersion>1.6.23</MicrosoftOpenApiReadersVersion>
7+
<AzureStorageBlobsVersion>12.24.0</AzureStorageBlobsVersion>
8+
<AzureStorageQueuesVersion>12.22.0</AzureStorageQueuesVersion>
9+
<MicrosoftIdentityWebVersion>3.8.4</MicrosoftIdentityWebVersion>
10+
<MicrosoftOpenApiReadersVersion>1.6.24</MicrosoftOpenApiReadersVersion>
1111
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
1212
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
1313

1414
<!-- Third-party references -->
1515
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
1616
<NJsonSchemaVersion>11.0.0</NJsonSchemaVersion>
17-
<SwashbuckleAspNetCoreVersion>7.2.0</SwashbuckleAspNetCoreVersion>
1817
<AwsSdkS3Version>3.7.305.7</AwsSdkS3Version>
1918
<AwsSdkSecurityTokenVersion>3.7.300.33</AwsSdkSecurityTokenVersion>
2019

‎eng/dependabot/independent/dependabot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- This isn't a real project, but Dependabot requires a project. -->
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66
</Project>

0 commit comments

Comments
 (0)