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 2020/03/09 14:19:42 UTC
[tinkerpop] 01/01: TINKERPOP-2335 Drop support for .NET Standard
<2.0
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch TINKERPOP-2335-netstandard2
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit d58c0abe86b9dfbfb3886568cde63d2f89202932
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Fri Mar 6 15:18:51 2020 +0100
TINKERPOP-2335 Drop support for .NET Standard <2.0
---
.travis.yml | 2 +-
docker/Dockerfile | 2 +-
docs/src/dev/developer/development-environment.asciidoc | 2 +-
docs/src/upgrade/release-3.5.x.asciidoc | 7 +++++++
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 8 +-------
.../src/Gremlin.Net.Template/Gremlin.Net.Template.csproj | 3 +--
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 8 +-------
.../Gremlin.Net.IntegrationTest.csproj | 5 +----
.../Gremlin.Net.Template.IntegrationTest.csproj | 4 +---
.../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 5 +----
10 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 7d21e8e..13cf933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
- sudo apt update
- sudo apt install apt-transport-https
- sudo apt update
- - sudo apt install dotnet-sdk-2.2
+ - sudo apt install dotnet-sdk-3.1
- sudo apt install python3.6
- sudo rm /usr/bin/python3
- sudo ln -s python3.6 /usr/bin/python3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 349c80e..767fa6c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,7 +32,7 @@ RUN apt-get update
# include both java 8/11 so that we can use the same docker image for future builds on that version of the jdk as we do
# for the older release branches. the java version to use is just controlled by JAVA_HOME hardcoded below
RUN apt-get install -y openjdk-8-jdk openjdk-11-jdk gawk git maven openssh-server subversion zip
-RUN apt-get install -y --force-yes dotnet-sdk-2.2 python python-dev python3-dev python-pip build-essential mono-devel
+RUN apt-get install -y --force-yes dotnet-sdk-3.1 python python-dev python3-dev python-pip build-essential mono-devel
RUN pip install --upgrade pip
RUN pip install virtualenv virtualenvwrapper
RUN rm -rf /var/lib/apt/lists/* /var/cache/openjdk-8-jdk
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 97e1a20..ab5ab63 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -163,7 +163,7 @@ See the <<release-environment,Release Environment>> section for more information
[[dotnet-environment]]
=== DotNet Environment
-The build optionally requires link:https://www.microsoft.com/net/core[.NET Core SDK] (>=2.1.300) to work with the
+The build optionally requires link:https://www.microsoft.com/net/core[.NET Core SDK] (>=3.1) to work with the
`gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects
will be skipped.
diff --git a/docs/src/upgrade/release-3.5.x.asciidoc b/docs/src/upgrade/release-3.5.x.asciidoc
index 5c163ce..12765e7 100644
--- a/docs/src/upgrade/release-3.5.x.asciidoc
+++ b/docs/src/upgrade/release-3.5.x.asciidoc
@@ -211,6 +211,13 @@ All lambdas should be written using `gremlin-groovy` if they are needed.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-2317[TINKERPOP-2317]
+==== .NET Standard 2.0 Only
+
+Gremlin.NET no longer targets .NET Standard 1.3, but only .NET Standard 2.0. Since .NET Core 2.0 and .NET Framework
+4.6.1 already support this .NET Standard version, most users should not be impacted by this.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2335[TINKERPOP-2335]
+
==== Neo4j Changes
There were two key changes to the neo4j-gremlin module:
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index f66676e..bbd820c 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">
- <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+ <TargetFramework>netstandard2.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
@@ -65,12 +65,6 @@ NOTE that versions suffixed with "-rc" are considered release candidates (i.e. p
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
</ItemGroup>
- <ItemGroup Condition="'\$(TargetFramework)' == 'netstandard1.3'">
- <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
- <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
- <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
- </ItemGroup>
-
<ItemGroup>
<None Include="../../LICENSE" Pack="true" PackagePath=""/>
<None Include="../../NOTICE" Pack="true" PackagePath=""/>
diff --git a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
index 564c51d..df33aa5 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@ -20,8 +20,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.0</TargetFramework>
- <IsPackable>false</IsPackable>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index fa52f46..cec4401 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">
- <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+ <TargetFramework>netstandard2.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
@@ -65,12 +65,6 @@ NOTE that versions suffixed with "-rc" are considered release candidates (i.e. p
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
- <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
- <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
- <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
- </ItemGroup>
-
<ItemGroup>
<None Include="../../LICENSE" Pack="true" PackagePath=""/>
<None Include="../../NOTICE" Pack="true" PackagePath=""/>
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
index 953529b..afbaf8e 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
- <DebugType>portable</DebugType>
- <AssemblyName>Gremlin.Net.IntegrationTest</AssemblyName>
- <PackageId>Gremlin.Net.IntegrationTest</PackageId>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<None Update="appsettings.json">
diff --git a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
index 3607e68..ceb3c97 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.Template.IntegrationTest/Gremlin.Net.Template.IntegrationTest.csproj
@@ -1,9 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
-
- <IsPackable>false</IsPackable>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
index 0b44e57..415072f 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
- <DebugType>portable</DebugType>
- <AssemblyName>Gremlin.Net.UnitTest</AssemblyName>
- <PackageId>Gremlin.Net.UnitTest</PackageId>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>