Merge pull request #4 from bug-fix-response-types

Upgrades and Bug fix
DerekGn · Mar 6, 2024 · 6c8eef3 · 6c8eef3
2 parents 7b67371 + a475f12
commit 6c8eef3
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 113 deletions.
diff --git a/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj b/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
 
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Moq" Version="4.20.70" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="Moq" Version="4.18.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MCP2221IO\MCP2221IO.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MCP2221IO\MCP2221IO.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/MCP2221IO/Device.cs b/MCP2221IO/Device.cs
@@ -594,7 +594,7 @@ private IList<byte> SmBusReadCommand(I2cAddress address, byte command, ushort le
                 {
                     List<byte> writeData = new List<byte>() { command };
 
-                    I2cWriteData<I2cWriteDataNoStopResponse>(CommandCodes.WriteI2cData, address, writeData);
+                    I2cWriteData<I2cWriteDataNoStopResponse>(CommandCodes.WriteI2cDataNoStop, address, writeData);
 
                     var result = I2cReadData<I2cReadDataRepeatedStarteResponse>(CommandCodes.ReadI2cDataRepeatedStart, address, length);
 
@@ -621,7 +621,7 @@ private void SmBusWriteCommand(I2cAddress address, byte command, bool pec, param
                         writeData.Add(Crc8.ComputeChecksum(writeData));
                     }
 
-                    I2cWriteData<I2cWriteDataResponse>(CommandCodes.WriteI2cDataNoStop, address, writeData);
+                    I2cWriteData<I2cWriteDataResponse>(CommandCodes.WriteI2cData, address, writeData);
                 });
         }
 

diff --git a/MCP2221IO/MCP2221IO.csproj b/MCP2221IO/MCP2221IO.csproj
@@ -1,24 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>1.0.5</Version>
-    <PackageReleaseNotes>1.0.0 Initial Version</PackageReleaseNotes>
-    <Company>Derek Goslin</Company>
-    <Authors>Derek Goslin</Authors>
-    <Copyright>Copyright © Derek Goslin 2022</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/DerekGn/MCP2221IO</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/DerekGn/MCP2221IO</PackageProjectUrl>
-    <Description>A .Net Core library for interacting with an MCP2221 HID Usb device.
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <Version>2.0.0</Version>
+        <PackageReleaseNotes>
+            1.0.0 Initial Version
+            2.0.0 Upgraded to .net 7
+        </PackageReleaseNotes>
+        <Company>Derek Goslin</Company>
+        <Authors>Derek Goslin</Authors>
+        <Copyright>Copyright © Derek Goslin 2022</Copyright>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <RepositoryUrl>https://github.com/DerekGn/MCP2221IO</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/DerekGn/MCP2221IO</PackageProjectUrl>
+        <Description>A .Net Core library for interacting with an MCP2221 HID Usb device. Supports all function of the MCP2221 device.</Description>
+    </PropertyGroup>
 
-Supports all function of the MCP2221 device.</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="HidSharp" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="HidSharp" Version="2.1.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    </ItemGroup>
 
 </Project>
diff --git a/MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs b/MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs
@@ -29,9 +29,9 @@
 
 namespace MCP2221IOConsole.Commands.Flash
 {
-    internal abstract class BaseWriteGpSetingsCommand : BaseCommand
+    internal abstract class BaseWriteGpSettingsCommand : BaseCommand
     {
-        protected BaseWriteGpSetingsCommand(IServiceProvider serviceProvider) : base(serviceProvider)
+        protected BaseWriteGpSettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider)
         {
         }
 

diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs
@@ -29,7 +29,7 @@
 namespace MCP2221IOConsole.Commands.Flash
 {
     [Command(Description = "Write GP0 power up settings")]
-    internal class WriteGp0SettingsCommand : BaseWriteGpSetingsCommand
+    internal class WriteGp0SettingsCommand : BaseWriteGpSettingsCommand
     {
         public WriteGp0SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider)
         {

diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs
@@ -29,7 +29,7 @@
 namespace MCP2221IOConsole.Commands.Flash
 {
     [Command(Description = "Write GP1 power up settings")]
-    internal class WriteGp1SettingsCommand : BaseWriteGpSetingsCommand
+    internal class WriteGp1SettingsCommand : BaseWriteGpSettingsCommand
     {
         public WriteGp1SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider)
         {

diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs
@@ -29,7 +29,7 @@
 namespace MCP2221IOConsole.Commands.Flash
 {
     [Command(Description = "Write GP2 power up settings")]
-    internal class WriteGp2SettingsCommand : BaseWriteGpSetingsCommand
+    internal class WriteGp2SettingsCommand : BaseWriteGpSettingsCommand
     {
         public WriteGp2SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider)
         {

diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs
@@ -6,7 +6,7 @@
 namespace MCP2221IOConsole.Commands.Flash
 {
     [Command(Description = "Write GP3 power up settings")]
-    internal class WriteGp3SettingsCommand : BaseWriteGpSetingsCommand
+    internal class WriteGp3SettingsCommand : BaseWriteGpSettingsCommand
     {
         public WriteGp3SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider)
         {

diff --git a/MCP2221IOConsole/MCP2221IOConsole.csproj b/MCP2221IOConsole/MCP2221IOConsole.csproj
@@ -1,44 +1,48 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>MCP2221IOConsole</RootNamespace>
-    <PackageId>MCP2221IO.Console</PackageId>
-    <Authors>Derek Goslin</Authors>
-    <Product>MCP2221IO.Console</Product>
-    <Description>A .Net Core console application for interacting with a connected MCP2221 HID device</Description>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/DerekGn/MCP2221IO</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/DerekGn/MCP2221IO</RepositoryUrl>
-    <PackageReleaseNotes>1.0.0 Initial Version</PackageReleaseNotes>
-    <Version>1.0.5</Version>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <RootNamespace>MCP2221IOConsole</RootNamespace>
+        <PackageId>MCP2221IO.Console</PackageId>
+        <Authors>Derek Goslin</Authors>
+        <Product>MCP2221IO.Console</Product>
+        <Description>A .Net Core console application for interacting with a connected MCP2221 HID device</Description>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/DerekGn/MCP2221IO</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/DerekGn/MCP2221IO</RepositoryUrl>
+        <PackageReleaseNotes>
+            1.0.0 Initial Version
+            2.0.0 Upgraded to .net 7
+        </PackageReleaseNotes>
+        <Version>2.0.0</Version>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="HidSharp" Version="2.1.0" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="HidSharp" Version="2.1.0" />
+        <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Serilog" Version="3.1.1" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MCP2221IO\MCP2221IO.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MCP2221IO\MCP2221IO.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+    <ItemGroup>
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
 
 </Project>
diff --git a/PModAqs/PModAqs.csproj b/PModAqs/PModAqs.csproj
@@ -1,34 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-	<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-	<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-	<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Serilog" Version="3.1.1" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MCP2221IO\MCP2221IO.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MCP2221IO\MCP2221IO.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+    <ItemGroup>
+        <None Update="appsettings.json">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
 
 </Project>