From 6b827cd0a3e97d4ae33c950dc0bad02630abc8ec Mon Sep 17 00:00:00 2001
From: Patrick Grawehr <pgrawehr@hotmail.com>
Date: Thu, 16 Nov 2023 16:19:31 +0100
Subject: [PATCH] Update external dependencies (#2128)
* Update external dependencies
* Minor issues with new Analyzers
* Fix obsolete functions
---------
Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
---
eng/Analyzers.props | 2 +-
eng/StyleCop.Analyzers.ruleset | 2 +-
eng/Versions.external.props | 11 ++++++-----
src/System.Device.Gpio.Tests/GpioPinTests.cs | 2 +-
src/devices/Ags01db/Ags01db.csproj | 2 +-
src/devices/Ags01db/Register.cs | 2 +-
src/devices/Button/tests/Button.tests.csproj | 13 -------------
src/devices/Card/Ndef/tests/Ndef.Tests.csproj | 4 ----
src/devices/HardwareMonitor/OpenHardwareMonitor.cs | 2 +-
src/devices/Nmea0183/tests/Ais/AisTargetTests.cs | 8 ++++----
src/devices/Nmea0183/tests/Nmea0183.Tests.csproj | 3 ---
src/devices/Nmea0183/tests/SentenceTests.cs | 2 +-
tools/ArduinoCsCompiler/ArduinoCsCompiler.csproj | 2 +-
tools/ArduinoCsCompiler/Frontend/CompilerRun.cs | 2 +-
14 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/eng/Analyzers.props b/eng/Analyzers.props
index 34d309fe3d..7eebe03023 100644
--- a/eng/Analyzers.props
+++ b/eng/Analyzers.props
@@ -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.333">
+ <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/eng/StyleCop.Analyzers.ruleset b/eng/StyleCop.Analyzers.ruleset
index d4884f02b1..379337e8e4 100644
--- a/eng/StyleCop.Analyzers.ruleset
+++ b/eng/StyleCop.Analyzers.ruleset
@@ -136,7 +136,7 @@
<Rule Id="SA1515" Action="None" /> <!-- Single-line comment should be preceded by blank line -->
<Rule Id="SA1516" Action="None" /> <!-- Elements should be separated by blank line -->
<Rule Id="SA1517" Action="Error" />
- <Rule Id="SA1518" Action="Error" />
+ <Rule Id="SA1518" Action="None" /> <!-- Files must end with exactly one newline -->
<Rule Id="SA1519" Action="Error" />
<Rule Id="SA1520" Action="Error" />
<Rule Id="SA1600" Action="None" /> <!-- Elements should be documented -->
diff --git a/eng/Versions.external.props b/eng/Versions.external.props
index 042510516d..53e020f6eb 100644
--- a/eng/Versions.external.props
+++ b/eng/Versions.external.props
@@ -1,18 +1,19 @@
<Project>
<!-- These references to third-party libraries are included in all projects except System.Device.Gpio and the build wrapper project -->
<ItemGroup Condition="'$(MSBuildProjectName)' != 'System.Device.Gpio' And '$(MSBuildProjectName)' != 'build'">
- <PackageReference Include="UnitsNet" Version="5.1.0" />
+ <PackageReference Include="UnitsNet" Version="5.31.0" />
</ItemGroup>
<!-- 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.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+ <PackageReference Include="xunit" Version="2.5.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="xunit.runner.utility" Version="2.4.1" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+ <PackageReference Include="xunit.runner.utility" Version="2.5.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+ <PackageReference Include="Shouldly" Version="4.2.1" />
</ItemGroup>
</Project>
diff --git a/src/System.Device.Gpio.Tests/GpioPinTests.cs b/src/System.Device.Gpio.Tests/GpioPinTests.cs
index 1746551a0d..beeabda5c0 100644
--- a/src/System.Device.Gpio.Tests/GpioPinTests.cs
+++ b/src/System.Device.Gpio.Tests/GpioPinTests.cs
@@ -37,7 +37,7 @@ public void TestOpenPin()
// Act
GpioPin pin = ctrl.OpenPin(PinNumber, PinMode.Input);
// Assert
- Assert.Equal(pin.PinNumber, PinNumber);
+ Assert.Equal(PinNumber, pin.PinNumber);
Assert.Equal(PinMode.Input, pin.GetPinMode());
}
diff --git a/src/devices/Ags01db/Ags01db.csproj b/src/devices/Ags01db/Ags01db.csproj
index 09915b8d2e..ea1b688b14 100644
--- a/src/devices/Ags01db/Ags01db.csproj
+++ b/src/devices/Ags01db/Ags01db.csproj
@@ -11,4 +11,4 @@
<None Remove="README.md" />
<None Remove="sensor.jpg" />
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/devices/Ags01db/Register.cs b/src/devices/Ags01db/Register.cs
index 1e6b647574..3757e259ce 100644
--- a/src/devices/Ags01db/Register.cs
+++ b/src/devices/Ags01db/Register.cs
@@ -10,4 +10,4 @@ internal enum Register : byte
ASG_VERSION_MSB = 0x0A,
ASG_VERSION_LSB = 0x01
}
-}
\ No newline at end of file
+}
diff --git a/src/devices/Button/tests/Button.tests.csproj b/src/devices/Button/tests/Button.tests.csproj
index 74d2065be0..6852f81b22 100644
--- a/src/devices/Button/tests/Button.tests.csproj
+++ b/src/devices/Button/tests/Button.tests.csproj
@@ -8,19 +8,6 @@
<RootNamespace>Iot.Device.Button.Tests</RootNamespace>
</PropertyGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
- <PackageReference Include="xunit" Version="2.4.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
- <PackageReference Include="coverlet.collector" Version="3.0.2">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\Button.csproj" />
</ItemGroup>
diff --git a/src/devices/Card/Ndef/tests/Ndef.Tests.csproj b/src/devices/Card/Ndef/tests/Ndef.Tests.csproj
index 707d88ae43..f7e48ad0f5 100644
--- a/src/devices/Card/Ndef/tests/Ndef.Tests.csproj
+++ b/src/devices/Card/Ndef/tests/Ndef.Tests.csproj
@@ -5,10 +5,6 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
- <ItemGroup>
- <PackageReference Include="coverlet.collector" Version="1.2.0" />
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\Ndef.csproj" />
</ItemGroup>
diff --git a/src/devices/HardwareMonitor/OpenHardwareMonitor.cs b/src/devices/HardwareMonitor/OpenHardwareMonitor.cs
index 3458947987..68b15c98ca 100644
--- a/src/devices/HardwareMonitor/OpenHardwareMonitor.cs
+++ b/src/devices/HardwareMonitor/OpenHardwareMonitor.cs
@@ -593,7 +593,7 @@ private void MonitorThread()
/// <exception cref="ArgumentOutOfRangeException"><paramref name="monitoringInterval"/> is less than 0.</exception>
public void EnableDerivedSensors(Area cpuDieSize = default, TimeSpan monitoringInterval = default)
{
- if (cpuDieSize.Equals(Area.Zero, 0, ComparisonType.Absolute))
+ if (cpuDieSize.Equals(Area.Zero, Area.Zero))
{
// Values for some recent intel chips (coffee lake)
if (LogicalProcessors <= 4)
diff --git a/src/devices/Nmea0183/tests/Ais/AisTargetTests.cs b/src/devices/Nmea0183/tests/Ais/AisTargetTests.cs
index 4eb9a656e6..26c9ad597b 100644
--- a/src/devices/Nmea0183/tests/Ais/AisTargetTests.cs
+++ b/src/devices/Nmea0183/tests/Ais/AisTargetTests.cs
@@ -48,8 +48,8 @@ public void ExtrapolatePositionWithRotation()
ship.RateOfTurn = RotationalSpeed.FromDegreesPerMinute(10);
ship2 = ship.EstimatePosition(TimeSpan.FromMinutes(10), TimeSpan.FromSeconds(20));
Assert.Equal(Angle.FromDegrees(100).Value, ship2.CourseOverGround.Value, 3);
- Assert.Equal(45.015124163, ship2.Position.Latitude, 9);
- Assert.Equal(9.026965951, ship2.Position.Longitude, 9);
+ Assert.Equal(45.015124163, ship2.Position.Latitude, 7);
+ Assert.Equal(9.026965951, ship2.Position.Longitude, 7);
}
[Fact]
@@ -81,8 +81,8 @@ public void ExtrapolatePositionWithRotationAndGivenTime()
var ship2 = ship.EstimatePosition(t + TimeSpan.FromMinutes(10), TimeSpan.FromSeconds(20));
Assert.Equal(t + TimeSpan.FromMinutes(10), ship2.LastSeen);
Assert.Equal(Angle.FromDegrees(100).Value, ship2.CourseOverGround.Value, 3);
- Assert.Equal(45.015124163, ship2.Position.Latitude, 9);
- Assert.Equal(9.026965951, ship2.Position.Longitude, 9);
+ Assert.Equal(45.015124163, ship2.Position.Latitude, 7);
+ Assert.Equal(9.026965951, ship2.Position.Longitude, 7);
}
}
}
diff --git a/src/devices/Nmea0183/tests/Nmea0183.Tests.csproj b/src/devices/Nmea0183/tests/Nmea0183.Tests.csproj
index 57ae639990..0bf220e244 100644
--- a/src/devices/Nmea0183/tests/Nmea0183.Tests.csproj
+++ b/src/devices/Nmea0183/tests/Nmea0183.Tests.csproj
@@ -38,8 +38,5 @@
<ItemGroup>
<ProjectReference Include="..\Nmea0183.csproj" />
</ItemGroup>
- <ItemGroup>
- <PackageReference Include="Shouldly" Version="4.0.3" />
- </ItemGroup>
</Project>
diff --git a/src/devices/Nmea0183/tests/SentenceTests.cs b/src/devices/Nmea0183/tests/SentenceTests.cs
index 378c428214..8cc6099f9c 100644
--- a/src/devices/Nmea0183/tests/SentenceTests.cs
+++ b/src/devices/Nmea0183/tests/SentenceTests.cs
@@ -285,7 +285,7 @@ public void XteDecode()
CrossTrackError xte = (CrossTrackError)decoded!.TryGetTypedValue(ref _lastPacketTime)!;
Assert.True(xte.Valid);
- Assert.True(xte.Distance.Equals(Length.Zero, 0, ComparisonType.Absolute));
+ Assert.True(xte.Distance.Equals(Length.Zero, Length.Zero));
}
[Fact]
diff --git a/tools/ArduinoCsCompiler/ArduinoCsCompiler.csproj b/tools/ArduinoCsCompiler/ArduinoCsCompiler.csproj
index 940ab9fc08..5caa70b10c 100644
--- a/tools/ArduinoCsCompiler/ArduinoCsCompiler.csproj
+++ b/tools/ArduinoCsCompiler/ArduinoCsCompiler.csproj
@@ -24,7 +24,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.10.0" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />
<ProjectReference Include="..\..\src\devices\Arduino\Arduino.csproj" />
<ProjectReference Include="..\..\src\System.Device.Gpio\System.Device.Gpio.csproj" />
</ItemGroup>
diff --git a/tools/ArduinoCsCompiler/Frontend/CompilerRun.cs b/tools/ArduinoCsCompiler/Frontend/CompilerRun.cs
index 2e0dd27c01..c8303e8918 100644
--- a/tools/ArduinoCsCompiler/Frontend/CompilerRun.cs
+++ b/tools/ArduinoCsCompiler/Frontend/CompilerRun.cs
@@ -67,7 +67,7 @@ public override bool RunCommand()
Logger.LogInformation($"Recommended minimum values are 512 kB of flash and 100 kB of RAM. Some microcontrollers (e.g. ESP32) may allow configuration of the amount of flash " +
$"available for code.");
- if (!caps.IntSize.Equals(Information.FromBytes(4), 0, ComparisonType.Absolute) || !caps.PointerSize.Equals(Information.FromBytes(4), 0, ComparisonType.Absolute))
+ if (!caps.IntSize.Equals(Information.FromBytes(4), Information.Zero) || !caps.PointerSize.Equals(Information.FromBytes(4), Information.Zero))
{
Logger.LogWarning("Board pointer and/or integer size is not 32 bits. This is untested and may lead to unpredictable behavior.");
}