Skip to content

Commit 3109634

Browse files
sbomersbomer
committed
Merge remote-tracking branch 'origin/feature/10.0' into validation
2 parents c454bf0 + d0fdc6f commit 3109634

File tree

6 files changed

+42
-33
lines changed

6 files changed

+42
-33
lines changed

‎.github/workflows/check-markdown-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020

2121
- name: Check markdown links
22-
uses: gaurav-nelson/github-action-markdown-link-check@1b916f2cf6c36510a6059943104e3c42ce6c16bc
22+
uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
2323
with:
2424
config-file: .github/linters/check-markdown-links-config.json
2525
use-quiet-mode: 'yes'

‎documentation/releaseNotes/releaseNotes.v9.1.0-preview.2.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes:
2+
3+
- Add `ManagedEntryPointAssemblyName` to process info and collection rule filters ([#7984](https://github.com/dotnet/dotnet-monitor/pull/7984))
4+
- Add `Capabilities` to `/info` route. ([#7977](https://github.com/dotnet/dotnet-monitor/pull/7977))
5+
- 🔬 Added `ModuleVersionId` and `MethodToken` Fields to Parameter Capture Output ([#7974](https://github.com/dotnet/dotnet-monitor/pull/7974))
6+
7+
\*🔬 **_indicates an experimental feature_**
8+
9+
If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn).

‎eng/Version.Details.xml

Lines changed: 20 additions & 20 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.4.25174.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25207.5" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
44
<Uri>https://github.com/dotnet/aspnetcore</Uri>
5-
<Sha>de35e2b0a0d8d5d1e307907983a6838da1092898</Sha>
5+
<Sha>8491a278ab03850dbbe3f93a6f304852751c9980</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -22,45 +22,45 @@
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25202.1">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25208.5">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
27+
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25202.1">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25208.5">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
31+
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25202.1">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25208.5">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
35+
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25202.1">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25208.5">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
39+
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25202.1">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25208.5">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
43+
<Sha>d33398b1de7f4fa61602fdf339f2f64e7b159326</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25174.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25207.7" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
5050
<Uri>https://github.com/dotnet/runtime</Uri>
51-
<Sha>0a33e18a0bccc10a0c4646dbf5b0fc70cbb3aa44</Sha>
51+
<Sha>9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25174.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25207.5" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
5454
<Uri>https://github.com/dotnet/aspnetcore</Uri>
55-
<Sha>de35e2b0a0d8d5d1e307907983a6838da1092898</Sha>
55+
<Sha>8491a278ab03850dbbe3f93a6f304852751c9980</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.3.25201.16">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.4.25208.22">
5858
<Uri>https://github.com/dotnet/sdk</Uri>
59-
<Sha>9dee3cf508254bc3859d9cd2fe96aeb2ad1b9751</Sha>
59+
<Sha>e20d672fcf93502f8a1b88b491488753d069b6ad</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.34.25174.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25207.7" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
6262
<Uri>https://github.com/dotnet/runtime</Uri>
63-
<Sha>0a33e18a0bccc10a0c4646dbf5b0fc70cbb3aa44</Sha>
63+
<Sha>9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25202.1</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25202.1</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25202.1</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25208.5</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25208.5</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25208.5</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
55-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25181.4</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25181.4</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
55+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25207.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
56+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25207.5</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
5757
<!-- dotnet/command-line-api references -->
5858
<SystemCommandLineVersion>2.0.0-beta5.25170.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
@@ -62,10 +62,10 @@
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25076.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
65-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25174.9</MicrosoftNETCoreAppRuntimewinx64Version>
66-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.3.25174.9</VSRedistCommonNetCoreSharedFrameworkx64100Version>
65+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25207.7</MicrosoftNETCoreAppRuntimewinx64Version>
66+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25207.7</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6767
<!-- dotnet/sdk references -->
68-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.3.25201.16</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
68+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.4.25208.22</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
6969
<!-- dotnet/symstore references -->
7070
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>

‎eng/dependabot/net10.0/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<MicrosoftExtensionsLoggingConsole100Version>$(MicrosoftNETCoreApp100Version)</MicrosoftExtensionsLoggingConsole100Version>
1313
<!-- System.Text.Json -->
1414
<SystemTextJson100Version>$(MicrosoftNETCoreApp100Version)</SystemTextJson100Version>
15-
<!-- Microsoft.Extensions.Loggincg.Abstractions -->
16-
<MicrosoftExtensionsLoggingAbstractions100Version>10.0.0-preview.4.25180.1</MicrosoftExtensionsLoggingAbstractions100Version>
15+
<!-- Microsoft.Extensions.Logging.Abstractions -->
16+
<MicrosoftExtensionsLoggingAbstractions100Version>10.0.0-preview.4.25207.7</MicrosoftExtensionsLoggingAbstractions100Version>
1717
</PropertyGroup>
1818
</Project>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"msbuild-sdks": {
3636
"Microsoft.Build.NoTargets": "3.7.0",
37-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25202.1",
38-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25202.1"
37+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25208.5",
38+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25208.5"
3939
}
4040
}

0 commit comments

Comments
 (0)