You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/08/11 12:02:42 UTC
[2/9] tinkerpop git commit: Add .NET Standard 2.0 target
TINKERPOP-2012
Add .NET Standard 2.0 target TINKERPOP-2012
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d309b7a9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d309b7a9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d309b7a9
Branch: refs/heads/tp32
Commit: d309b7a987f821c2536e57d386808976ccb5bde1
Parents: fc36be1
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Jul 22 16:55:15 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sun Jul 22 16:55:15 2018 +0200
----------------------------------------------------------------------
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 7 +++++--
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d309b7a9/gremlin-dotnet/glv/Gremlin.Net.csproj.template
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index 5357e14..0770178 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@ -19,7 +19,7 @@ limitations under the License.
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Build">
- <TargetFramework>netstandard1.3</TargetFramework>
+ <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
@@ -47,8 +47,11 @@ Please see the reference documentation at Apache TinkerPop for more information
<RepositoryUrl>https://github.com/apache/tinkerpop</RepositoryUrl>
</PropertyGroup>
- <ItemGroup Label="Package References">
+ <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'\$(TargetFramework)' == 'netstandard1.3'">
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d309b7a9/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 7aa5ba0..df4150a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -19,7 +19,7 @@ limitations under the License.
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Build">
- <TargetFramework>netstandard1.3</TargetFramework>
+ <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
@@ -47,8 +47,11 @@ Please see the reference documentation at Apache TinkerPop for more information
<RepositoryUrl>https://github.com/apache/tinkerpop</RepositoryUrl>
</PropertyGroup>
- <ItemGroup Label="Package References">
+ <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
<PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />