Repository: tinkerpop Updated Branches: refs/heads/tp32 8a76583c9 -> fdac6531f
TINKERPOP-1880 Sign assembly on Linux and macOS Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fcc49a1b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fcc49a1b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fcc49a1b Branch: refs/heads/tp32 Commit: fcc49a1b4ea3b15b102b576bc81053ba73b2a18e Parents: bddc756 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> Authored: Thu Mar 22 13:21:03 2018 +0100 Committer: Jorge Bay Gondra <jorgebaygon...@gmail.com> Committed: Thu Mar 22 14:20:20 2018 +0100 ---------------------------------------------------------------------- .travis.yml | 8 +++++--- gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 - gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 - .../Gremlin.Net.IntegrationTest.csproj | 3 +-- .../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 336c055..96cfe6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,12 @@ install: - mvn -version before_install: - - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 + - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg + - sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + - sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list' + - sudo apt-get install apt-transport-https - sudo apt-get update - - sudo apt-get install dotnet-dev-1.0.4 + - sudo apt-get install dotnet-sdk-2.1.101 jobs: include: http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/glv/Gremlin.Net.csproj.template ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template index ce36e76..897ec94 100644 --- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template +++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template @@ -41,7 +41,6 @@ Please see the reference documentation at Apache TinkerPop for more information NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop project.</Description> <AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> - <PublicSign Condition="'\$(OS)' != 'Windows_NT'">true</PublicSign> <PackageId>Gremlin.Net</PackageId> <PackageTags>gremlin;tinkerpop;apache</PackageTags> <PackageProjectUrl>http://tinkerpop.apache.org</PackageProjectUrl> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj index 445a9bc..454bcac 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj +++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj @@ -41,7 +41,6 @@ Please see the reference documentation at Apache TinkerPop for more information NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop project.</Description> <AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> - <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> <PackageId>Gremlin.Net</PackageId> <PackageTags>gremlin;tinkerpop;apache</PackageTags> <PackageProjectUrl>http://tinkerpop.apache.org</PackageProjectUrl> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj ---------------------------------------------------------------------- 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 82727fd..953529b 100644 --- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj +++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj @@ -1,10 +1,9 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netcoreapp1.0</TargetFramework> + <TargetFramework>netcoreapp2.0</TargetFramework> <DebugType>portable</DebugType> <AssemblyName>Gremlin.Net.IntegrationTest</AssemblyName> <PackageId>Gremlin.Net.IntegrationTest</PackageId> - <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion> </PropertyGroup> <ItemGroup> <None Update="appsettings.json"> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj ---------------------------------------------------------------------- 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 eeb7c9f..d1d6372 100644 --- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj +++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj @@ -1,11 +1,10 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netcoreapp1.0</TargetFramework> + <TargetFramework>netcoreapp2.0</TargetFramework> <DebugType>portable</DebugType> <AssemblyName>Gremlin.Net.UnitTest</AssemblyName> <PackageId>Gremlin.Net.UnitTest</PackageId> - <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion> <AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
