Skip to content

Commit

Permalink
Update package dependencies (#5218)
Browse files Browse the repository at this point in the history
  • Loading branch information
joperezr authored Jun 17, 2024
1 parent af04b7a commit 5e67eba
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 10 deletions.
14 changes: 7 additions & 7 deletions eng/packages/General.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageVersion Include="ICSharpCode.Decompiler" Version="8.0.0.7345" />
<PackageVersion Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="$(MicrosoftBclTimeProviderVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
Expand Down Expand Up @@ -29,7 +29,7 @@
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsVersion)" />
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Polly" Version="8.4.0" />
<PackageVersion Include="Polly.Core" Version="8.4.0" />
<PackageVersion Include="Polly.Extensions" Version="8.4.0" />
Expand All @@ -47,22 +47,22 @@
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="YamlDotNet" Version="12.0.0" />
<PackageVersion Include="YamlDotNet" Version="12.3.1" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48" />
<PackageVersion Include="ReferenceTrimmer" Version="3.3.1" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="8.52.0.60960" />
<PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.507" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="8.56.0.67649" />
<PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageVersion Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
<PackageVersion Include="System.IO.Pipelines" Version="4.5.1" />
<PackageVersion Include="System.IO.Pipelines" Version="4.7.5" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="4.7.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Microsoft.Gen.Logging.Model;

[DebuggerDisplay("{Name}")]
[DebuggerDisplay("{PropertyName}")]
internal sealed class LoggingProperty
{
public string PropertyName = string.Empty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ public Task WaitForMeasurementsAsync(int minCount, CancellationToken cancellatio
});
}

#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks
return w.TaskSource.Task;
#pragma warning restore VSTHRD003 // Avoid awaiting foreign Tasks
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public ValueTask<TOptions> CreateAsync<TContext>(string name, in TContext contex
}
}

return ConfigureOptions(context);
return ConfigureOptionsAsync(context);

async ValueTask<TOptions> ConfigureOptions(TContext context)
async ValueTask<TOptions> ConfigureOptionsAsync(TContext context)
{
var loadTasks = ArrayPool<ValueTask<IConfigureContextualOptions<TOptions>>>.Shared.Rent(_loaders.Length);
var tasksCreated = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ public void TestConversionOperators()
DateTime time = DateTime.Now;
Assert.NotEqual(time, JsonValue.Null);
Assert.Equal(time.ToString("o", CultureInfo.InvariantCulture), ((JsonValue)time).AsString);
#pragma warning disable S3655 // Empty nullable value should not be accessed
Assert.Equal(default(DateTime?), JsonValue.Null);
#pragma warning restore S3655 // Empty nullable value should not be accessed

// (int)(JsonValue)
Assert.Equal(0, (int)new JsonValue(uint.MaxValue));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public async Task GettingAsyncContextReturnsNullAsyncContextIfSetToNull()

checkAsyncFlowTcs.SetResult(null!);

#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks
await waitForNullTcs.Task;
#pragma warning restore VSTHRD003 // Avoid awaiting foreign Tasks

try
{
Expand Down Expand Up @@ -103,7 +105,9 @@ public async Task GettingAsyncContextReturnsNullAsyncContextIfChanged()

checkAsyncFlowTcs.SetResult(null!);

#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks
await waitForNullTcs.Task;
#pragma warning restore VSTHRD003 // Avoid awaiting foreign Tasks

try
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ public async Task CreateSource()
await Assert.ThrowsAsync<TaskCanceledException>(() => timeProvider.Delay(TimeSpan.FromTicks(1), cts.Token));
}

#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks
[Fact]
public async Task WaitAsync()
{
Expand All @@ -298,6 +299,7 @@ public async Task WaitAsync()
Assert.False(t.IsFaulted);
Assert.False(t.IsCanceled);
}
#pragma warning restore VSTHRD003 // Avoid awaiting foreign Tasks

[Fact]
public async Task WaitAsync_InfiniteTimeout()
Expand Down

0 comments on commit 5e67eba

Please sign in to comment.