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 2022/01/05 14:52:26 UTC
[tinkerpop] branch TINKERPOP-2651 updated (95334a5 -> 233d866)
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a change to branch TINKERPOP-2651
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
discard 95334a5 TINKERPOP-2651 Update to .NET 6
new 233d866 TINKERPOP-2651 Update to .NET 6
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (95334a5)
\
N -- N -- N refs/heads/TINKERPOP-2651 (233d866)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 01/01: TINKERPOP-2651 Update to .NET 6
Posted by fl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch TINKERPOP-2651
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 233d8662df1641684c8a20518729bc09a66e2c16
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Thu Nov 18 15:31:03 2021 +0100
TINKERPOP-2651 Update to .NET 6
---
.github/workflows/build-test.yml | 4 ++--
docker/Dockerfile | 2 +-
docs/src/dev/developer/development-environment.asciidoc | 4 ++--
gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template | 2 +-
gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj | 2 +-
gremlin-dotnet/src/pom.xml | 2 +-
.../test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs | 2 +-
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 +-
.../Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj | 2 +-
.../Gremlin.Net.Template.IntegrationTest.csproj | 2 +-
gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index ec0b2e3..765be6e 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -149,10 +149,10 @@ jobs:
with:
java-version: '8'
distribution: 'temurin'
- - name: Set up .NET 3.1.x
+ - name: Set up .NET 6.0.x
uses: actions/setup-dotnet@v1
with:
- dotnet-version: '3.1.x'
+ dotnet-version: '6.0.x'
- name: Build with Maven
run: |
touch gremlin-dotnet/src/.glv
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f4a7297..7e3406d 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-3.1 mono-devel
+RUN apt-get install -y --force-yes dotnet-sdk-6.0 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.6.9 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 647b952..1fdf220 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -172,8 +172,8 @@ 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] (>=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
+The build optionally requires link:https://dotnet.microsoft.com/download[.NET SDK] (>=6.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.
`gremlin-dotnet` can be built and tested from the command line with:
diff --git a/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template
index 3f694f6..199a415 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.Template.csproj.template
@@ -20,7 +20,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
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 a0a30f3..e67b77e 100644
--- a/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj
@@ -20,7 +20,7 @@ limitations under the License.
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 5907f3b..eb2ab18 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -67,7 +67,7 @@ limitations under the License.
<packaging.type>pom</packaging.type>
</properties>
</profile>
- <!-- activates the building of .NET components and requires that the .NET Core SDK be installed on the system -->
+ <!-- activates the building of .NET components and requires that the .NET SDK be installed on the system -->
<profile>
<id>gremlin-dotnet</id>
<activation>
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs
index e2c6ef6..afbcd22 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs
@@ -301,7 +301,7 @@ namespace Gremlin.Net.IntegrationTest.Driver
await gremlinClient.SubmitAsync<int>("x");
Assert.True(false, "The 'x' variable should not exist after session close");
}
- catch (Exception ignored)
+ catch (Exception)
{
// do nothing
}
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 59fd11e..55ab52b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -362,7 +362,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private string GetRootPath()
{
- var codeBaseUrl = new Uri(GetType().GetTypeInfo().Assembly.CodeBase);
+ var codeBaseUrl = new Uri(GetType().GetTypeInfo().Assembly.Location);
var codeBasePath = Uri.UnescapeDataString(codeBaseUrl.AbsolutePath);
DirectoryInfo rootDir = null;
for (var dir = Directory.GetParent(Path.GetDirectoryName(codeBasePath));
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 7decef8..a218bc3 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>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.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 1ae5dc6..839639f 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>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.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 84f0df9..6d81941 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>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index d9ec076..b30ae21 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -70,7 +70,7 @@ limitations under the License.
<packaging.type>pom</packaging.type>
</properties>
</profile>
- <!-- activates the building of .NET components and requires that the .NET Core SDK be installed on the system -->
+ <!-- activates the building of .NET components and requires that the .NET SDK be installed on the system -->
<profile>
<id>gremlin-dotnet</id>
<activation>