Skip to content

Commit

Permalink
Bulk update of all of outdated package dependencies (#2228)
Browse files Browse the repository at this point in the history
* Bulk update of all of outdated package dependencies

* Fix some new analyzer warnings due to potential deadlocks in tests
  • Loading branch information
joperezr authored Dec 7, 2023
1 parent ab0f4f5 commit 86f39f6
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 40 deletions.
2 changes: 1 addition & 1 deletion eng/Analyzers.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ file which is not marked as such, making StyleCop fail. -->
</PropertyGroup>
<ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.external.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<!-- Automatically include these assemblies in all test projects -->
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Tests'))">
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.utility" Version="2.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit.runner.utility" Version="2.6.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<SystemRuntimeInteropServicesWindowsRuntimePackageVersion>4.3.0</SystemRuntimeInteropServicesWindowsRuntimePackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>7.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>7.0.0</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>7.0.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<SystemTextJsonPackageVersion>6.0.1</SystemTextJsonPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>7.0.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<SystemTextJsonPackageVersion>6.0.9</SystemTextJsonPackageVersion>
<SystemIOPipelinesVersion>7.0.0</SystemIOPipelinesVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions samples/M5StackRemoteDisplay/M5StackRemoteDisplay.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Iot.Device.Bindings" Version="3.0.0" />
<PackageReference Include="System.Device.Gpio" Version="3.0.0" />
<PackageReference Include="Iot.Device.Bindings.SkiaSharpAdapter" Version="3.0.0" />
<PackageReference Include="Iot.Device.Bindings" Version="3.1.0" />
<PackageReference Include="System.Device.Gpio" Version="3.1.0" />
<PackageReference Include="Iot.Device.Bindings.SkiaSharpAdapter" Version="3.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Iot.Device.Bindings" Version="1.5.0-prerelease.21212.1" />
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.38.0" />
<PackageReference Include="System.Device.Gpio" Version="1.5.0-prerelease.21212.1" />
<PackageReference Include="Iot.Device.Bindings" Version="3.1.0" />
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.42.0" />
<PackageReference Include="System.Device.Gpio" Version="3.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/led-animate/led-animate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Device.Gpio" Version="1.4.0" />
<PackageReference Include="Iot.Device.Bindings" Version="1.4.0" />
<PackageReference Include="System.Device.Gpio" Version="3.1.0" />
<PackageReference Include="Iot.Device.Bindings" Version="3.1.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/led-blink-multiple/led-blink-multiple.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Device.Gpio" Version="1.4.0" />
<PackageReference Include="System.Device.Gpio" Version="3.1.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions samples/led-shift-register/led-shift-register.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Device.Gpio" Version="1.4.0" />
<PackageReference Include="Iot.Device.Bindings" Version="1.4.0" />
<PackageReference Include="System.Device.Gpio" Version="3.1.0" />
<PackageReference Include="Iot.Device.Bindings" Version="3.1.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<PackageReference Include="SkiaSharp" Version="2.88.6" />
<!-- The NativeAssets packages for Windows and MacOS are included in the above by default -->
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
</ItemGroup>


Expand Down
9 changes: 5 additions & 4 deletions src/System.Device.Gpio.Tests/GpioControllerSoftwareTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Threading;
using System.Threading.Tasks;
using Moq;
using Xunit;

Expand Down Expand Up @@ -235,7 +236,7 @@ public void ReadSpan()
}

[Fact]
public void WaitForEventAsyncFail()
public async Task WaitForEventAsyncFail()
{
var ctrl = new GpioController(PinNumberingScheme.Logical, _mockedGpioDriver.Object);
_mockedGpioDriver.Setup(x => x.OpenPinEx(1));
Expand All @@ -249,11 +250,11 @@ public void WaitForEventAsyncFail()
ctrl.OpenPin(1, PinMode.Input);

var task = ctrl.WaitForEventAsync(1, PinEventTypes.Falling | PinEventTypes.Rising, TimeSpan.FromSeconds(0.01)).AsTask();
task.Wait(CancellationToken.None);
var result = await task.WaitAsync(CancellationToken.None);
Assert.True(task.IsCompleted);
Assert.Null(task.Exception);
Assert.True(task.Result.TimedOut);
Assert.Equal(PinEventTypes.None, task.Result.EventTypes);
Assert.True(result.TimedOut);
Assert.Equal(PinEventTypes.None, result.EventTypes);
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/System.Device.Gpio.Tests/GpioControllerTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ public void WaitForEventFallingEdgeTest()
}

[Fact]
public void WaitForEventBothEdgesTest()
public async Task WaitForEventBothEdgesTest()
{
using (GpioController controller = new GpioController(GetTestNumberingScheme(), GetTestDriver()))
{
Expand Down Expand Up @@ -529,7 +529,7 @@ public void WaitForEventBothEdgesTest()
result = controller.WaitForEvent(InputPin, PinEventTypes.Falling | PinEventTypes.Rising, tokenSource.Token);
Assert.False(result.TimedOut);
Assert.Equal(PinEventTypes.Rising, result.EventTypes);
Assert.True(task.Wait(TimeSpan.FromSeconds(30))); // Should end long before that
await task.WaitAsync(TimeSpan.FromSeconds(30)); // Should end long before that
tokenSource.Dispose();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions src/devices/Camera/tests/TestCamera/TestCamera.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="3.2.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.26.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.5" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.42.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.32" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.32" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.32" />
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
<PackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion tools/ArduinoCsCompiler/ArduinoCsCompiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
<ProjectReference Include="..\..\src\devices\Arduino\Arduino.csproj" />
<ProjectReference Include="..\..\src\System.Device.Gpio\System.Device.Gpio.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/ArduinoCsCompiler/Frontend/Frontend.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Compile Include="*.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\devices\Arduino\Arduino.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions tools/DevicesApiTester/DeviceApiTester.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
<ProjectReference Include="$(MainLibraryPath)System.Device.Gpio.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion tools/GenerateDocFxStructure/GenerateDocFxStructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
</ItemGroup>

</Project>

0 comments on commit 86f39f6

Please sign in to comment.