1
0
mirror of https://github.com/DarthAffe/OBD.NET.git synced 2025-12-12 16:58:30 +00:00

Compare commits

...

7 Commits

Author SHA1 Message Date
1c2794874b
Added nuget-links to readme 2021-11-21 21:42:44 +01:00
6f0ec9b4e1
Merge pull request #28 from DarthAffe/NamingFix
Fixed weird naming mistake in some projects (ODB instead of OBD)
2021-11-21 21:39:47 +01:00
97ad2a6a72 Fixed weird naming mistake in some projects (ODB instead of OBD) 2021-11-21 21:38:10 +01:00
2b4dadfd12
Merge pull request #27 from DarthAffe/derskythe/master
Added back .net 5 as additional target
2021-11-21 21:28:53 +01:00
68d34568bf
Merge pull request #26 from derskythe/master
Upgrade to .NET 6
2021-11-21 21:27:26 +01:00
c09f81a741 Added back .net 5 as additional target 2021-11-21 21:23:04 +01:00
DerSkythe
d39b447380 Upgrade to .NET 6 2021-11-18 19:11:13 +04:00
11 changed files with 30 additions and 18 deletions

View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0;netstandard1.4</TargetFrameworks> <TargetFrameworks>net5.0;net6.0;netstandard1.4</TargetFrameworks>
<Authors>Darth Affe / Roman Lumetsberger</Authors> <Authors>Darth Affe / Roman Lumetsberger</Authors>
<Company>-</Company> <Company>-</Company>
<Product>OBD.NET</Product> <Product>OBD.NET</Product>
<Description>C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter</Description> <Description>C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter</Description>
<Version>1.1.0</Version> <Version>1.2.0</Version>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<RepositoryType>Github</RepositoryType> <RepositoryType>Github</RepositoryType>
@ -25,6 +25,10 @@
<DefineConstants>NET5_0;NETFULL</DefineConstants> <DefineConstants>NET5_0;NETFULL</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<DefineConstants>NET6_0;NETFULL</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.4'"> <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
<DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD1_4</DefineConstants> <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD1_4</DefineConstants>
</PropertyGroup> </PropertyGroup>

View File

@ -54,9 +54,9 @@
<Project>{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}</Project> <Project>{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}</Project>
<Name>OBD.NET.Common</Name> <Name>OBD.NET.Common</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\ODB.NET.Desktop\ODB.NET.Desktop.csproj"> <ProjectReference Include="..\OBD.NET.Desktop\OBD.NET.Desktop.csproj">
<Project>{14CB98E1-95DE-4923-8896-FDF5171AA49E}</Project> <Project>{14CB98E1-95DE-4923-8896-FDF5171AA49E}</Project>
<Name>ODB.NET.Desktop</Name> <Name>OBD.NET.Desktop</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@ -5,10 +5,10 @@ using OBD.NET.Common.Devices;
using OBD.NET.Common.Extensions; using OBD.NET.Common.Extensions;
using OBD.NET.Common.Logging; using OBD.NET.Common.Logging;
using OBD.NET.Common.OBDData; using OBD.NET.Common.OBDData;
using ODB.NET.Desktop.Communication; using OBD.NET.Desktop.Communication;
using ODB.NET.Desktop.Logging; using OBD.NET.Desktop.Logging;
namespace ODB.NET.ConsoleClient namespace OBD.NET.ConsoleClient
{ {
public class Program public class Program
{ {

View File

@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("ODB.NET.ConsoleClient")] [assembly: AssemblyTitle("OBD.NET.ConsoleClient")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ODB.NET.ConsoleClient")] [assembly: AssemblyProduct("OBD.NET.ConsoleClient")]
[assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

View File

@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
// Source: http://antanas.veiverys.com/mono-serialport-datareceived-event-workaround-using-a-derived-class/ // Source: http://antanas.veiverys.com/mono-serialport-datareceived-event-workaround-using-a-derived-class/
namespace ODB.NET.Desktop.Communication namespace OBD.NET.Desktop.Communication
{ {
[DesignerCategory("Code")] [DesignerCategory("Code")]
public class EnhancedSerialPort : SerialPort public class EnhancedSerialPort : SerialPort

View File

@ -6,7 +6,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using OBD.NET.Common.Communication; using OBD.NET.Common.Communication;
namespace ODB.NET.Desktop.Communication namespace OBD.NET.Desktop.Communication
{ {
public class SerialConnection : ISerialConnection public class SerialConnection : ISerialConnection
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using OBD.NET.Common.Logging; using OBD.NET.Common.Logging;
namespace ODB.NET.Desktop.Logging namespace OBD.NET.Desktop.Logging
{ {
/// <summary> /// <summary>
/// Simple console logger /// Simple console logger

View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net5.0;net461</TargetFrameworks> <TargetFrameworks>net5.0;net6.0;net461</TargetFrameworks>
<Authors>Darth Affe / Roman Lumetsberger</Authors> <Authors>Darth Affe / Roman Lumetsberger</Authors>
<Company>-</Company> <Company>-</Company>
<Product>OBD.NET</Product> <Product>OBD.NET</Product>
<Description>C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter</Description> <Description>C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter</Description>
<Version>1.1.0</Version> <Version>1.2.0</Version>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<RepositoryType>Github</RepositoryType> <RepositoryType>Github</RepositoryType>
@ -25,6 +25,10 @@
<DefineConstants>NET5_0;NETFULL</DefineConstants> <DefineConstants>NET5_0;NETFULL</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<DefineConstants>NET6_0;NETFULL</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'"> <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<DefineConstants>NET461;NETFULL</DefineConstants> <DefineConstants>NET461;NETFULL</DefineConstants>
</PropertyGroup> </PropertyGroup>
@ -47,6 +51,10 @@
<PackageReference Include="System.IO.Ports" Version="5.0.1" /> <PackageReference Include="System.IO.Ports" Version="5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OBD.NET.Common\OBD.NET.Common.csproj" /> <ProjectReference Include="..\OBD.NET.Common\OBD.NET.Common.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -5,11 +5,11 @@ VisualStudioVersion = 15.0.26403.7
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OBD.NET.Common", "OBD.NET.Common\OBD.NET.Common.csproj", "{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OBD.NET.Common", "OBD.NET.Common\OBD.NET.Common.csproj", "{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODB.NET.Desktop", "ODB.NET.Desktop\ODB.NET.Desktop.csproj", "{14CB98E1-95DE-4923-8896-FDF5171AA49E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.Desktop", "OBD.NET.Desktop\OBD.NET.Desktop.csproj", "{14CB98E1-95DE-4923-8896-FDF5171AA49E}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.Universal", "OBD.NET.Universal\OBD.NET.Universal.csproj", "{E0EAFF82-C514-4827-8F49-F1928EBA8E73}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.Universal", "OBD.NET.Universal\OBD.NET.Universal.csproj", "{E0EAFF82-C514-4827-8F49-F1928EBA8E73}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODB.NET.ConsoleClient", "ODB.NET.ConsoleClient\ODB.NET.ConsoleClient.csproj", "{8F8EC5D5-94BD-47CF-9714-CA8C0198BDDC}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.ConsoleClient", "OBD.NET.ConsoleClient\OBD.NET.ConsoleClient.csproj", "{8F8EC5D5-94BD-47CF-9714-CA8C0198BDDC}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -2,8 +2,8 @@
C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter
## Projects ## Projects
* OBD.NET.Common - NetStandard 1.4 Library for platform independent stuff * [OBD.NET.Common](https://www.nuget.org/packages/OBD.NET.Common) - NetStandard 1.4 Library for platform independent stuff
* OBD.NET.Desktop - Implemenation of SerialConnection on full .NET Framework * [OBD.NET.Desktop](https://www.nuget.org/packages/OBD.NET.Desktop) - Implemenation of SerialConnection on full .NET Framework
* OBD.NET.Universal - Implementation of BluetoothSerialConnection for connecting to Bluetooth Adapter on UWP * OBD.NET.Universal - Implementation of BluetoothSerialConnection for connecting to Bluetooth Adapter on UWP
* OBD.NET.ConsoleClient - Example client application using SerialConnection on full .NET Framework * OBD.NET.ConsoleClient - Example client application using SerialConnection on full .NET Framework