You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/08/03 14:11:34 UTC
[tinkerpop] 01/01: Merge branch '3.4-dev'
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 421f29bfd1b2774fae0427caf9aa513c4494ed5b
Merge: ecbe15b 7f19a99
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Aug 3 10:11:07 2020 -0400
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 15 ++++++++++++++-
docs/src/upgrade/release-3.4.x.asciidoc | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 687f6ca,8166bd8..3acc7a4
--- 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" />
<PackageReference Include="Polly" Version="7.2.0" />
</ItemGroup>