mirror of
https://github.com/DarthAffe/OBD.NET.git
synced 2025-12-13 01:08:30 +00:00
Merge pull request #27 from DarthAffe/derskythe/master
Added back .net 5 as additional target
This commit is contained in:
commit
2b4dadfd12
@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>net6.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>
|
||||||
@ -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>
|
||||||
@ -43,12 +47,4 @@
|
|||||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>net6.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>
|
||||||
@ -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,7 +51,7 @@
|
|||||||
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
|
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
|
||||||
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
|
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user