From 3922f0e4b62f0728c6cadebb753165574ed80748 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Thu, 28 May 2020 19:30:16 +0200 Subject: [PATCH] Update GitVersion.ToolThis removes the incompatibility with the netcoreapp31 runtime. --- .travis.yml | 4 ++-- appveyor.yml | 2 +- build/travis.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79bd18dd..f7a7c59f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,11 @@ mono: none matrix: include: - name: "Linux Qt 5.12.0" - dotnet: 3.1.300 + dotnet: 3.1 os: linux dist: xenial - name: "OSX Qt 5.12.0" - dotnet: 3.1.300 + dotnet: 3.1 os: osx osx_image: xcode9.4 if: tag IS blank diff --git a/appveyor.yml b/appveyor.yml index 42b0cb8a..cace4a27 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ before_build: - cmd: 7z x C:\qmlnet-qt.tar.gz -oC:\ - cmd: 7z x C:\qmlnet-qt.tar -oC:\qmlnet-qt - cmd: rm -r C:\Tools\GitVersion\ - - cmd: dotnet tool install -g GitVersion.Tool --version 4.0.1-beta1-58 + - cmd: dotnet tool install -g GitVersion.Tool --version 5.3.4 - cmd: dotnet gitversion > version.json - cmd: git submodule update --init build_script: diff --git a/build/travis.sh b/build/travis.sh index f5ce4d02..5f93f9bf 100755 --- a/build/travis.sh +++ b/build/travis.sh @@ -4,7 +4,7 @@ set -e SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # Before we run the build, get gitversion and generate a version.json. -dotnet tool install -g GitVersion.Tool --version 4.0.1-beta1-58 +dotnet tool install -g GitVersion.Tool --version 5.3.4 export PATH="$PATH:$HOME/.dotnet/tools" dotnet gitversion > version.json