Skip to content

Commit

Permalink
Added .NET Core support. DalSoft.RestClient now supports net451 and n…
Browse files Browse the repository at this point in the history
…etcoreapp1.0
  • Loading branch information
DalSoft committed Oct 28, 2016
1 parent d8b2370 commit fb5261e
Show file tree
Hide file tree
Showing 20 changed files with 7,021 additions and 442 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Expand Up @@ -5,9 +5,13 @@
*.Publish.xml
App_Data
packages

# Visual Studio 2015
.vs

# .NET Core
*.lock.json

# merge
*.orig
*.REMOTE.*
Expand All @@ -27,4 +31,7 @@ _ReSharper.*
*.nupkg

# NCrunch
*.ncrunch*
*.ncrunch*

# NUNIT
TestResult.xml
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

Binary file removed .nuget/NuGet.exe
Binary file not shown.
144 changes: 0 additions & 144 deletions .nuget/NuGet.targets

This file was deleted.

This file was deleted.

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>efcbfb2d-8d64-4a83-8dd5-c362dc6642a6</ProjectGuid>
<RootNamespace>DalSoft.RestClient.Test.Integration</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
5 changes: 0 additions & 5 deletions DalSoft.RestClient.Test.Integration/packages.config

This file was deleted.

29 changes: 29 additions & 0 deletions DalSoft.RestClient.Test.Integration/project.json
@@ -0,0 +1,29 @@
{
"version": "1.0.0-*",

"testRunner": "nunit",

"runtimes": {
"win7-x64": {},
"win8-x64": {},
"win10-x64": {}
},

"dependencies": {
"NUnit": "3.4.1",
"dotnet-test-nunit": "3.4.0-beta-2",
"DalSoft.RestClient": "2.0.0-*"
},

"frameworks": {
"net451": {
},

"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"portable-net45+win8"
]
}
}
}

0 comments on commit fb5261e

Please sign in to comment.