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:41 UTC
[1/9] tinkerpop git commit: Add .NET Standard 2.0 target
TINKERPOP-2012
Repository: tinkerpop
Updated Branches:
refs/heads/master fe3863fee -> dc48a7298
refs/heads/tp32 00cb9a81a -> 1b993236e
refs/heads/tp33 a050b6ed6 -> 0bf76acd5
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/master
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" />
[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by fl...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bf76acd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bf76acd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bf76acd
Branch: refs/heads/tp33
Commit: 0bf76acd551fd900e7869e9e5aada8aaeaa34b56
Parents: a050b6e 1b99323
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat Aug 11 13:40:16 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat Aug 11 13:40:16 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/0bf76acd/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
[6/9] tinkerpop git commit: Merge branch 'TINKERPOP-2012' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-2012' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b993236
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b993236
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b993236
Branch: refs/heads/master
Commit: 1b993236ece39620a434187e050cfbd2eeeb6768
Parents: 00cb9a8 d309b7a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat Aug 11 13:38:56 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat Aug 11 13:38:56 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(-)
----------------------------------------------------------------------
[4/9] tinkerpop git commit: Merge branch 'TINKERPOP-2012' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-2012' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b993236
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b993236
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b993236
Branch: refs/heads/tp33
Commit: 1b993236ece39620a434187e050cfbd2eeeb6768
Parents: 00cb9a8 d309b7a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat Aug 11 13:38:56 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat Aug 11 13:38:56 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(-)
----------------------------------------------------------------------
[7/9] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by fl...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bf76acd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bf76acd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bf76acd
Branch: refs/heads/master
Commit: 0bf76acd551fd900e7869e9e5aada8aaeaa34b56
Parents: a050b6e 1b99323
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat Aug 11 13:40:16 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat Aug 11 13:40:16 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/0bf76acd/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
[3/9] tinkerpop git commit: Add .NET Standard 2.0 target
TINKERPOP-2012
Posted by fl...@apache.org.
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/tp33
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" />
[9/9] tinkerpop git commit: Merge branch 'tp33'
Posted by fl...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dc48a729
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dc48a729
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dc48a729
Branch: refs/heads/master
Commit: dc48a72982dbe609eb98312baf7f6c146c6de034
Parents: fe3863f 0bf76ac
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat Aug 11 13:52:08 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat Aug 11 13:52:08 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/dc48a729/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
[5/9] tinkerpop git commit: Merge branch 'TINKERPOP-2012' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-2012' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b993236
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b993236
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b993236
Branch: refs/heads/tp32
Commit: 1b993236ece39620a434187e050cfbd2eeeb6768
Parents: 00cb9a8 d309b7a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat Aug 11 13:38:56 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat Aug 11 13:38:56 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(-)
----------------------------------------------------------------------
[2/9] tinkerpop git commit: Add .NET Standard 2.0 target
TINKERPOP-2012
Posted by fl...@apache.org.
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" />