This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 61858dcea7dba315553ff1a0344e2bbd85c8856d
Merge: 2c5c3e6 a6cdd42
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jun 1 16:28:55 2020 -0400
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 24 ++++++++++++++++++++++-
docs/src/upgrade/release-3.4.x.asciidoc | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
3 files changed, 25 insertions(+), 3 deletions(-)
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 9eedc40,a525690..6665594
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -61,8 -61,8 +61,8 @@@ NOTE that versions suffixed with "-rc"
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"
PrivateAssets="All" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"
PrivateAssets="All"/>
- <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
++ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"
PrivateAssets="All" />
+ <PackageReference Include="System.Text.Json" Version="4.7.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
</ItemGroup>
