This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch TINKERPOP-3030
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 3e1c2da4972584ffb5af4b390f669ee3c730ce45
Author: Florian Hockmann <f...@florian-hockmann.de>
AuthorDate: Wed Jan 17 16:09:49 2024 +0100
TINKERPOP-3030 Update to .NET 8
I've also noticed that the examples used camel casing for some method
names which I switched to pascal casing to stay idiomatic in C#.
---
.github/workflows/build-test.yml | 4 ++--
docker/Dockerfile | 2 +-
docs/src/dev/developer/development-environment.asciidoc | 4 ++--
gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.csproj | 2 +-
gremlin-dotnet/Examples/Connections/Connections.cs | 12 ++++++------
gremlin-dotnet/Examples/Connections/Connections.csproj | 2 +-
.../Examples/ModernTraversals/ModernTraversals.csproj | 2 +-
gremlin-dotnet/docker-compose.yml | 2 +-
.../src/Gremlin.Net.Template/Gremlin.Net.Template.csproj | 2 +-
.../Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj | 2 +-
.../Gremlin.Net.IntegrationTest.csproj | 2 +-
.../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
.../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 2 +-
13 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index ef18acddab..30e291a09a 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -264,10 +264,10 @@ jobs:
with:
java-version: '11'
distribution: 'temurin'
- - name: Set up .NET 6.0.x
+ - name: Set up .NET 8.0.x
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '6.0.x'
+ dotnet-version: '8.0.x'
- name: Get Cached Server Base Image
uses: actions/cache@v3
id: gremlin-server-test-docker-image
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e12cc0f962..134f85c365 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-6.0 mono-devel
+RUN apt-get install -y --force-yes dotnet-sdk-8.0 mono-devel
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get install -y python3 python3.8 python3-dev python3.8-dev python3-pip
build-essential checkinstall zlib1g-dev libreadline-gplv2-dev \
diff --git a/docs/src/dev/developer/development-environment.asciidoc
b/docs/src/dev/developer/development-environment.asciidoc
index 251ac7f58a..eb53fc1183 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -57,7 +57,7 @@ NOTE: For those using Windows, efforts have been made to keep
the build OS indep
that TinkerPop's build system will only allow for a minimum build at best. +
+
Refer to <<building-on-windows>> section for more details.
-
+
[[groovy-environment]]
=== Groovy Environment
@@ -267,7 +267,7 @@ See the <<release-environment,Release Environment>> section
for more information
[[dotnet-environment]]
=== DotNet Environment
-The build optionally requires link:https://dotnet.microsoft.com/download[.NET
SDK] (>=6.0) to work with the
+The build optionally requires link:https://dotnet.microsoft.com/download[.NET
SDK] (>=8.0) to work with the
`gremlin-dotnet` module. If .NET SDK is not installed, TinkerPop will still
build with Maven, but .NET projects
will be skipped.
diff --git a/gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.csproj
b/gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.csproj
index 6fe7a3b633..3dcaf373ca 100644
--- a/gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.csproj
+++ b/gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.csproj
@@ -19,7 +19,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/gremlin-dotnet/Examples/Connections/Connections.cs
b/gremlin-dotnet/Examples/Connections/Connections.cs
index 26490f750b..940cc05990 100644
--- a/gremlin-dotnet/Examples/Connections/Connections.cs
+++ b/gremlin-dotnet/Examples/Connections/Connections.cs
@@ -26,13 +26,13 @@ public class ConnectionExample
{
static void Main()
{
- withRemote();
- withConf();
- withSerializer();
+ WithRemote();
+ WithConf();
+ WithSerializer();
}
// Connecting to the server
- static void withRemote()
+ static void WithRemote()
{
var server = new GremlinServer("localhost", 8182);
using var remoteConnection = new DriverRemoteConnection(new
GremlinClient(server), "g");
@@ -48,7 +48,7 @@ public class ConnectionExample
}
// Connecting to the server with customized configurations
- static void withConf()
+ static void WithConf()
{
using var remoteConnection = new DriverRemoteConnection(new
GremlinClient(
new GremlinServer(hostname: "localhost", port: 8182, enableSsl: false,
username: "", password: "")), "g");
@@ -60,7 +60,7 @@ public class ConnectionExample
}
// Specifying a serializer
- static void withSerializer()
+ static void WithSerializer()
{
var server = new GremlinServer("localhost", 8182);
var client = new GremlinClient(server, new
GraphSON3MessageSerializer());
diff --git a/gremlin-dotnet/Examples/Connections/Connections.csproj
b/gremlin-dotnet/Examples/Connections/Connections.csproj
index 6fe7a3b633..3dcaf373ca 100644
--- a/gremlin-dotnet/Examples/Connections/Connections.csproj
+++ b/gremlin-dotnet/Examples/Connections/Connections.csproj
@@ -19,7 +19,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/gremlin-dotnet/Examples/ModernTraversals/ModernTraversals.csproj
b/gremlin-dotnet/Examples/ModernTraversals/ModernTraversals.csproj
index 31dd192896..4ba70d7098 100644
--- a/gremlin-dotnet/Examples/ModernTraversals/ModernTraversals.csproj
+++ b/gremlin-dotnet/Examples/ModernTraversals/ModernTraversals.csproj
@@ -19,7 +19,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/gremlin-dotnet/docker-compose.yml
b/gremlin-dotnet/docker-compose.yml
index 99464d942e..c85369fea3 100644
--- a/gremlin-dotnet/docker-compose.yml
+++ b/gremlin-dotnet/docker-compose.yml
@@ -45,7 +45,7 @@ services:
gremlin-dotnet-integration-tests:
container_name: gremlin-dotnet-integration-tests
- image: mcr.microsoft.com/dotnet/sdk:6.0
+ image: mcr.microsoft.com/dotnet/sdk:8.0
volumes:
- .:/gremlin-dotnet
-
../gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features:/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features
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 7e0f0d67f3..c31f3d69a4 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@ -19,7 +19,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git
a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
b/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
index 18d9ed53eb..af2f34b890 100644
--- a/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.Benchmarks/Gremlin.Net.Benchmarks.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</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 9d6ebf4650..cfce8352f8 100644
---
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</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 dd4616224a..b8eca918fd 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,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</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 9cceb5a084..3fc90c42cc 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
