Support .NET Framework 4.5 and .NET Standard 2.0

Author: richardschneider

.gitignore

@@ -194,3 +194,7 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+
+# VS 2017 creates this
+src/Ipfs.Api.xml
+

.nuget/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="coveralls.net" version="0.6.0" />
-  <package id="OpenCover" version="4.6.210-rc" />
+  <package id="OpenCover" version="4.6.519" />
   <package id="msdn.4.5.2" version="0.1.0-alpha-1611021200" />
 </packages>

IpfsApi.sln

@@ -1,12 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IpfsApi", "src\IpfsApi.csproj", "{429C5EB5-63BF-4421-AD9B-300F3361BDB4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IpfsApiTests", "test\IpfsApiTests.csproj", "{42449EFD-F537-4425-820A-C2FBF36A683A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6B9AA9C7-5E90-4D10-9DDE-A2AA5FE3ECA6}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
@@ -17,24 +13,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Documentation", "doc\Documentation.csproj", "{F3A32EA9-0B2F-46A3-B47A-33B4C04BD423}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IpfsApi", "src\IpfsApi.csproj", "{F3C81C57-C283-4E07-B765-DEABCFB22136}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IpfsApiTests", "test\IpfsApiTests.csproj", "{B459FBC7-4A28-4170-AD83-7348A403407F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{429C5EB5-63BF-4421-AD9B-300F3361BDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{429C5EB5-63BF-4421-AD9B-300F3361BDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{429C5EB5-63BF-4421-AD9B-300F3361BDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{429C5EB5-63BF-4421-AD9B-300F3361BDB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42449EFD-F537-4425-820A-C2FBF36A683A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42449EFD-F537-4425-820A-C2FBF36A683A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42449EFD-F537-4425-820A-C2FBF36A683A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42449EFD-F537-4425-820A-C2FBF36A683A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F3A32EA9-0B2F-46A3-B47A-33B4C04BD423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3A32EA9-0B2F-46A3-B47A-33B4C04BD423}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3C81C57-C283-4E07-B765-DEABCFB22136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3C81C57-C283-4E07-B765-DEABCFB22136}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3C81C57-C283-4E07-B765-DEABCFB22136}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3C81C57-C283-4E07-B765-DEABCFB22136}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B459FBC7-4A28-4170-AD83-7348A403407F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B459FBC7-4A28-4170-AD83-7348A403407F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B459FBC7-4A28-4170-AD83-7348A403407F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B459FBC7-4A28-4170-AD83-7348A403407F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {36ED5AA7-8F41-4F7D-A665-230635EF64A1}
+	EndGlobalSection
 EndGlobal

README.md

@@ -5,7 +5,11 @@
 [![Version](https://img.shields.io/nuget/v/Ipfs.Api.svg)](https://www.nuget.org/packages/Ipfs.Api)
 [![docs](https://cdn.rawgit.com/richardschneider/net-ipfs-core/master/doc/images/docs-latest-green.svg)](https://richardschneider.github.io/net-ipfs-api)
 
-Provides access to the [Inter Planetary File System API](https://ipfs.io/docs/api/) for .Net (C#, VB, F# ...)
+Provides access to the [Inter Planetary File System API](https://ipfs.io/docs/api/) for .Net (C#, VB, F# ...). It supports the following runtimes
+
+- .NET Framework 4.5
+- .NET Standard 2.0
+
 
 A .Net client library for the IPFS HTTP API, implemented in C#. This client library implements the [interface-ipfs-core](https://github.com/ipfs/interface-ipfs-core). 
 More information, including the Class Reference, is on the [Project](https://richardschneider.github.io/net-ipfs-api/) web site.
@@ -22,6 +26,6 @@ Published releases of IPFS API are available on [NuGet](https://www.nuget.org/pa
 For the latest build or older non-released builds see [Continuous Integration](https://github.com/richardschneider/net-ipfs-core/wiki/Continuous-Integration).
 
 # License
-Copyright © 2015-2016 Richard Schneider ([email protected])
+Copyright © 2015-2017 Richard Schneider ([email protected])
 
 The IPFS API library is licensed under the [MIT](http://www.opensource.org/licenses/mit-license.php "Read more about the MIT license form") license. Refere to the [LICENSE](https://github.com/richardschneider/net-ipfs-api/blob/master/LICENSE) file for more information.

appveyor.yml

@@ -1,8 +1,14 @@
 # gitversion will change the version number
 version: x-{build}
 
+# branches to build
+branches:
+  # blacklist
+  except:
+    - gh-pages
+
 configuration: Release
-os: Visual Studio 2015
+os: Visual Studio 2017
 
 init:
   - git config --global core.autocrlf input
@@ -25,7 +31,8 @@ environment:
 # tools we need for bulding/testing/deploying
 install:
   - choco install gitversion.portable -pre -y
-  - npm install gh-pages -g
+  - nuget update -self
+  #- npm install gh-pages -g
 
 #  - nuget install secure-file -ExcludeVersion
 #  - if defined snk_secret secure-file\tools\secure-file -decrypt src\ipfs.ci.snk.enc -secret %snk_secret% -out src\ipfs.dev.snk
@@ -36,30 +43,37 @@ install:
 # gitversion will change the assembly info
 pull_requests:
   do_not_increment_build_number: true
-assembly_info:
-  patch: false
 
 before_build:
   - nuget restore
   - ps: gitversion /output buildserver /updateAssemblyInfo >gitversion.log
 
-build:
-  project: IpfsApi.sln
-  publish_nuget: false
-  verbosity: minimal
+build_script:
+  - dotnet build -c %CONFIGURATION% -p:Version=%GitVersion_MajorMinorPatch% -p:AssemblyVersion=%GitVersion_MajorMinorPatch%
+  - dotnet pack -c %CONFIGURATION% --no-build --no-restore -p:Version=%GitVersion_MajorMinorPatch% -p:AssemblyVersion=%GitVersion_MajorMinorPatch%
 
 after_build:
+  - cmd: appveyor PushArtifact "src\bin\%CONFIGURATION%\Ipfs.Api.%GitVersion_MajorMinorPatch%.nupkg"
 # Build documentation in doc\_site
-  - tools\docfx\docfx doc\docfx.json
-  - if defined git_token gh-pages -d doc\_site -m "new docs %GitVersion_FullSemVer%"
-# Build the nuget package
-  - nuget pack src\IpfsApi.nuspec -version "%GitVersion_NuGetVersion%" -prop "target=%CONFIGURATION%"
-  - appveyor PushArtifact "Ipfs.Api.%GitVersion_NuGetVersion%.nupkg"
+#  - tools\docfx\docfx doc\docfx.json
+#  - if defined git_token gh-pages -d doc\_site -m "new docs %GitVersion_FullSemVer%"
+
+test_script:
+  - dotnet test -c %CONFIGURATION% --no-build --no-restore test
 
 after_test: 
 # Generate coverage report
-    - packages\OpenCover.4.6.210-rc\tools\OpenCover.Console.exe -register:user -filter:"+[Ipfs.Api*]* -[*Tests]*" -target:"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\MSTest.exe" -targetargs:"/testcontainer:test//bin/Release/Ipfs.Api.Tests.dll" -output:coverage.xml
-    - if defined COVERALLS_REPO_TOKEN packages\coveralls.net.0.6.0\tools\csmacnz.coveralls.exe --opencover -i ./coverage.xml --serviceName appveyor --jobId %APPVEYOR_BUILD_NUMBER%
+    - packages\OpenCover.4.6.519\tools\OpenCover.Console.exe 
+        -register:user -filter:"+[Ipfs.Api*]* -[*Tests]*" 
+        -target:"c:\Program Files\dotnet\dotnet.exe" 
+        -targetargs:"test -c Release --no-build --no-restore test" 
+        -output:coverage.xml  
+        -mergeoutput 
+        -hideskipped:File 
+        -oldStyle 
+    - if defined COVERALLS_REPO_TOKEN 
+        packages\coveralls.net.0.6.0\tools\csmacnz.coveralls.exe 
+        --opencover -i ./coverage.xml --useRelativePaths --serviceName appveyor --jobId %APPVEYOR_BUILD_NUMBER%
 
 # publish NuGet package on tag build
 nuget:

src/CoreApi/FileSystemApi.cs

@@ -34,11 +34,13 @@ internal FileSystemApi(IpfsClient ipfs)
         ///   Add a file to the interplanetary file system.
         /// </summary>
         /// <param name="path"></param>
-        public Task<FileSystemNode> AddFileAsync(string path)
+        public async Task<FileSystemNode> AddFileAsync(string path)
         {
-            return AddAsync(
-                new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read),
-                Path.GetFileName(path));
+            using (var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
+            {
+                var node = await AddAsync(stream, Path.GetFileName(path));
+                return node;
+            }
         }
 
         /// <summary>

src/IpfsApi.csproj

@@ -1,121 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{429C5EB5-63BF-4421-AD9B-300F3361BDB4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Ipfs.Api</RootNamespace>
+    <TargetFrameworks>netstandard2;net45</TargetFrameworks>
     <AssemblyName>Ipfs.Api</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+    <RootNamespace>Ipfs.Api</RootNamespace>
+    <DocumentationFile>Ipfs.Api.xml</DocumentationFile>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Debug\Ipfs.Api.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DocumentationFile>bin\Release\Ipfs.Api.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    
+    <!-- developer build is always 0.42 -->
+    <AssemblyVersion>0.42</AssemblyVersion>
+    <Version>0.42</Version>
+    
+    <!-- Nuget specs -->
+    <PackageId>Ipfs.Api</PackageId>
+    <Authors>Richard Schneider</Authors>
+    <Title>IPFS API</Title>
+    <Description> Provides .Net client access to the InterPlanetary File System.</Description>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes></PackageReleaseNotes>
+    <Copyright>© 2015-2017 Richard Schneider</Copyright>
+    <PackageTags>ipfs peer-to-peer distributed file-system</PackageTags>
+    <IncludeSymbols>True</IncludeSymbols>
+    <PackageLicenseUrl>https://github.com/richardschneider/net-ipfs-api/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/richardschneider/net-ipfs-api</PackageProjectUrl>
+    <PackageIconUrl>https://github.com/ipfs/logo/blob/master/platform-icons/osx-menu-bar.png</PackageIconUrl>
+
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Albireo.Base32, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Albireo.Base32.1.0.1.0\lib\portable-net40+sl50+wp80+win\Albireo.Base32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Base58Check, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Base58Check.0.2.0\lib\Net40\Base58Check.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Google.Protobuf, Version=3.1.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.1.0\lib\net45\Google.Protobuf.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Ipfs.Core, Version=0.6.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ipfs.Core.0.6.3\lib\net45\Ipfs.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SHA3, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SHA3.0.9.2\lib\net40\SHA3.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SHA3Managed, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SHA3.0.9.2\lib\net40\SHA3Managed.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Block.cs" />
-    <Compile Include="CoreApi\FileSystemApi.cs" />
-    <Compile Include="FileSystemLink.cs" />
-    <Compile Include="FileSystemNode.cs" />
-    <Compile Include="CoreApi\ObjectApi.cs" />
-    <Compile Include="CoreApi\DagApi.cs" />
-    <Compile Include="CoreApi\SwarmApi.cs" />
-    <Compile Include="CoreApi\DhtApi.cs" />
-    <Compile Include="CoreApi\PinApi.cs" />
-    <Compile Include="CoreApi\ConfigApi.cs" />
-    <Compile Include="CoreApi\BlockApi.cs" />
-    <Compile Include="ConnectedPeer.cs" />
-    <Compile Include="MerkleNode.cs" />
-    <Compile Include="PinMode.cs" />
-    <Compile Include="PinnedObject.cs" />
-    <Compile Include="PinnedCollection .cs" />
-    <Compile Include="TrustedPeerCollection.cs" />
-    <Compile Include="CoreApi\GenericApi.cs" />
-    <Compile Include="PeerNode.cs" />
-    <Compile Include="IpfsClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="IpfsApi.nuspec">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <PackageReference Include="Ipfs.Core" Version="0.7.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="System.Net.Http" Version="4.3.3" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+ 
+
+</Project>