Skip to content

[main] Update dependencies from dotnet/runtime #3257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 3 commits into from
Aug 4, 2022
Merged

[main] Update dependencies from dotnet/runtime #3257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3111df
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Aug 4, 2022
4e84010
Disable part of EventLogsPipelineUnitTests.TestLogsAllCategoriesDefau…
Aug 4, 2022
d2f7744
Disable EventLogsPipelineUnitTests.TestLogsAllCategoriesDefaultLevelF…
Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>846f0fd3cc4217582c00da10ad590704288190af</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22402.10">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22403.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a6c0d5c483273725a3626ddbbb355464f3753f09</Sha>
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22402.10">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22403.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a6c0d5c483273725a3626ddbbb355464f3753f09</Sha>
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<!-- Latest symstore version updated by darc -->
<MicrosoftSymbolStoreVersion>1.0.340101</MicrosoftSymbolStoreVersion>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rc.1.22402.10</VSRedistCommonNetCoreSharedFrameworkx6470Version>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22402.10</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rc.1.22403.8</VSRedistCommonNetCoreSharedFrameworkx6470Version>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rc.1.22403.3</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>7.0.0-rc.1.22403.3</MicrosoftAspNetCoreAppRefVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public async Task TestLogsAllCategoriesDefaultLevel(TestConfiguration config)
/// <summary>
/// Test that log events at the default level are collected for categories without a specified level.
/// </summary>
[SkippableTheory, MemberData(nameof(Configurations))]
[SkippableTheory(Skip = "Unreliable test https://github.com/dotnet/diagnostics/issues/3143"), MemberData(nameof(Configurations))]
public async Task TestLogsAllCategoriesDefaultLevelFallback(TestConfiguration config)
{
using Stream outputStream = await GetLogsAsync(config, settings =>
Expand Down