This is an automated email from the ASF dual-hosted git repository. florianhockmann pushed a commit to branch TINKERPOP-2335-update-to-net-core-31 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 634d75328f4783ecfae049943b5d688c8f94e216 Author: Florian Hockmann <[email protected]> AuthorDate: Wed Mar 11 17:05:24 2020 +0100 TINKERPOP-2335 Update to .NET Core 3.1 --- .travis.yml | 2 +- docker/Dockerfile | 2 +- docs/src/dev/developer/development-environment.asciidoc | 2 +- gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj | 3 +-- .../Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 5 +---- .../Gremlin.Net.Template.IntegrationTest.csproj | 4 +--- gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 5 +---- 7 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff66f97..4817bc9 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 a826df8..3fd2c39 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 mono-devel +RUN apt-get install -y --force-yes dotnet-sdk-3.1 mono-devel # python3 on xenial install 3.5.2 which is insufficient for newer versions of python/typing#259 so # custom build and install 3.5.3 and upgrade pip along the way. this could be resolved by using bionic diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc index 7636ebc..9a7afdb 100644 --- a/docs/src/dev/developer/development-environment.asciidoc +++ b/docs/src/dev/developer/development-environment.asciidoc @@ -160,7 +160,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/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj index b70e02c..c6fd1e5 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/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>
