Skip to content

Commit

Permalink
Implemented support for .Net Core 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Beatlegger committed Jan 18, 2018
1 parent 968a9eb commit 4e69304
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,6 @@ $RECYCLE.BIN/
# Mac desktop service store files
.DS_Store
/packages/Newtonsoft.Json.8.0.2

# VS Files
/.vs/Transmission.API/v15/Server/sqlite3
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: csharp
dist: trusty
sudo: required
mono: none
dotnet: 1.0.1
dotnet: 2.0.0
script:
- ./build.sh --quiet verify

2 changes: 1 addition & 1 deletion Transmission.API.RPC.Test/Transmission.API.RPC.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
14 changes: 4 additions & 10 deletions Transmission.API.RPC/Transmission.API.RPC.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.4</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.4' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
<Reference Include="System.Collections.Concurrent" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="System.Net.Http" Version="4.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
<PackageReference Include="Nito.AsyncEx.Tasks">
<Version>1.1.0</Version>
</PackageReference>
</ItemGroup>

</Project>

0 comments on commit 4e69304

Please sign in to comment.