Skip to content
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

Jump to bottom

[main] Update dependencies from dotnet/aspnetcore #3329

Merged
merged 3 commits into from
Aug 30, 2022
Merged

[main] Update dependencies from dotnet/aspnetcore #3329

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
09b7591
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Aug 30, 2022
0e1a171
Disable EventLogsPipelineUnitTests on Windows. Issue #2541
mikem8361 Aug 30, 2022
d12410e
Fix where the skip exception is thrown
mikem8361 Aug 30, 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 @@ -32,13 +32,13 @@
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>2d1a4de6b2da59647a9538bf9cc4e252847e6231</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.2.22429.3">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.2.22429.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4fc34ae0bc15a854661711b0fd5e0dd99d323dbc</Sha>
<Sha>437fd5a8b7bb1ea4ff167b556953da61804ae156</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.2.22429.3">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.2.22429.7">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4fc34ae0bc15a854661711b0fd5e0dd99d323dbc</Sha>
<Sha>437fd5a8b7bb1ea4ff167b556953da61804ae156</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.2.22428.3">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
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 @@ -21,8 +21,8 @@
<VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rc.2.22428.3</VSRedistCommonNetCoreSharedFrameworkx6470Version>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.2.22428.3</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rc.2.22429.3</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>7.0.0-rc.2.22429.3</MicrosoftAspNetCoreAppRefVersion>
<MicrosoftAspNetCoreAppRefInternalVersion>7.0.0-rc.2.22429.7</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>7.0.0-rc.2.22429.7</MicrosoftAspNetCoreAppRefVersion>
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
<MicrosoftDotnetSdkInternalVersion>7.0.100-rc.2.22426.5</MicrosoftDotnetSdkInternalVersion>
</PropertyGroup>
Expand Down
30 changes: 30 additions & 0 deletions 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 @@ -41,6 +41,11 @@ public EventLogsPipelineUnitTests(ITestOutputHelper output)
[SkippableTheory, MemberData(nameof(Configurations))]
public async Task TestLogsAllCategoriesAllLevels(TestConfiguration config)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
}

using Stream outputStream = await GetLogsAsync(config, settings =>
{
settings.UseAppFilters = false;
Expand All @@ -65,6 +70,11 @@ public async Task TestLogsAllCategoriesAllLevels(TestConfiguration config)
[SkippableTheory, MemberData(nameof(Configurations))]
public async Task TestLogsAllCategoriesDefaultLevel(TestConfiguration config)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
}

using Stream outputStream = await GetLogsAsync(config, settings =>
{
settings.UseAppFilters = false;
Expand All @@ -88,6 +98,11 @@ public async Task TestLogsAllCategoriesDefaultLevel(TestConfiguration config)
[SkippableTheory(Skip = "Unreliable test https://github.com/dotnet/diagnostics/issues/3143"), MemberData(nameof(Configurations))]
public async Task TestLogsAllCategoriesDefaultLevelFallback(TestConfiguration config)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
}

using Stream outputStream = await GetLogsAsync(config, settings =>
{
settings.UseAppFilters = false;
Expand Down Expand Up @@ -135,6 +150,11 @@ public async Task TestLogsAllCategoriesDefaultLevelNoneNotSupported(TestConfigur
[SkippableTheory, MemberData(nameof(Configurations))]
public async Task TestLogsUseAppFilters(TestConfiguration config)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
}

using Stream outputStream = await GetLogsAsync(config);

Assert.True(outputStream.Length > 0, "No data written by logging process.");
Expand All @@ -154,6 +174,11 @@ public async Task TestLogsUseAppFilters(TestConfiguration config)
[SkippableTheory, MemberData(nameof(Configurations))]
public async Task TestLogsUseAppFiltersAndFilterSpecs(TestConfiguration config)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
}

using Stream outputStream = await GetLogsAsync(config, settings =>
{
settings.FilterSpecs = new Dictionary<string, LogLevel?>()
Expand All @@ -179,6 +204,11 @@ public async Task TestLogsUseAppFiltersAndFilterSpecs(TestConfiguration config)
[SkippableTheory, MemberData(nameof(Configurations))]
public async Task TestLogsWildcardCategory(TestConfiguration config)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
throw new SkipTestException("https://github.com/dotnet/diagnostics/issues/2541");
}

using Stream outputStream = await GetLogsAsync(config, settings =>
{
settings.UseAppFilters = false;
Expand Down