Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Basic Changes and Move to .NET Standard 2.0 / Framework 4.6.1 #52

Merged
nblumhardt merged 3 commits into from
Mar 8, 2018
Merged

Basic Changes and Move to .NET Standard 2.0 / Framework 4.6.1 #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adf53b6
Basic Changes and Move to .NET STandard 2.0 / Framework 4.6.1
bnayae Feb 27, 2018
fe041d7
remove duplicate code into base class
bnayae Mar 7, 2018
bbda82d
Removing conditions from the project xml level
bnayae Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Removing conditions from the project xml level
  • Loading branch information
@bnayae
bnayae committed Mar 7, 2018
commit bbda82dcebc0892693e9cc1654e757f176506021
6 changes: 0 additions & 6 deletions src/InfluxDB.Collector/InfluxDB.Collector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@

<ItemGroup>
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\InfluxDB.LineProtocol\InfluxDB.LineProtocol.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
Expand Down
5 changes: 1 addition & 4 deletions src/InfluxDB.LineProtocol/InfluxDB.LineProtocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,12 @@
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<ItemGroup>
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<PackageReference Include="System.Globalization" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion test/InfluxDB.LineProtocol.Tests/InfluxDB.LineProtocol.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<AssemblyName>InfluxDB.LineProtocol.Tests</AssemblyName>
<PackageId>InfluxDB.LineProtocol.Tests</PackageId>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
Expand Down