diff --git a/.travis.yml b/.travis.yml index 03d62a7f..8e19771f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,16 @@ language: csharp mono: 5.12.0 +dotnet: 2.2 matrix: include: - name: "Linux Qt 5.11.1" os: linux - dist: trusty + dist: xenial sudo: required services: docker - name: "OSX Qt 5.11.1" os: osx osx_image: xcode9.4 - dotnet: 2.1.302 cache: directories: - build/Qt diff --git a/samples/PhotoFrame/PhotoFrame.App/PhotoFrame.App.csproj b/samples/PhotoFrame/PhotoFrame.App/PhotoFrame.App.csproj index e7b03645..e2c89481 100644 --- a/samples/PhotoFrame/PhotoFrame.App/PhotoFrame.App.csproj +++ b/samples/PhotoFrame/PhotoFrame.App/PhotoFrame.App.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 diff --git a/samples/PhotoFrame/PhotoFrame.Logic.Tests/PhotoFrame.Logic.Tests.csproj b/samples/PhotoFrame/PhotoFrame.Logic.Tests/PhotoFrame.Logic.Tests.csproj index 362e212b..60fc23e4 100644 --- a/samples/PhotoFrame/PhotoFrame.Logic.Tests/PhotoFrame.Logic.Tests.csproj +++ b/samples/PhotoFrame/PhotoFrame.Logic.Tests/PhotoFrame.Logic.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + netcoreapp2.2 false diff --git a/samples/hosting/net/NetHost.csproj b/samples/hosting/net/NetHost.csproj index 690a6b45..2aeba9c9 100644 --- a/samples/hosting/net/NetHost.csproj +++ b/samples/hosting/net/NetHost.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + netcoreapp2.2 $(MSBuildProjectDirectory)/../net-output diff --git a/src/native/QmlNet/QmlNet.user b/src/native/QmlNet/QmlNet.user index b1478ecc..603f0f3d 100644 --- a/src/native/QmlNet/QmlNet.user +++ b/src/native/QmlNet/QmlNet.user @@ -302,7 +302,7 @@ 2 - /Users/pknopf/git/net-core-qml/src/net/Qt.NetCore.Sandbox/bin/Debug/netcoreapp2.1/Qt.NetCore.Sandbox.dll + /Users/pknopf/git/net-core-qml/src/net/Qt.NetCore.Sandbox/bin/Debug/netcoreapp2.2/Qt.NetCore.Sandbox.dll /usr/local/share/dotnet/dotnet /Users/pknopf/git/net-core-qml/src/net/Qt.NetCore.Sandbox Run /usr/local/share/dotnet/dotnet diff --git a/src/net/Qml.Net.Benchmarks/Qml.Net.Benchmarks.csproj b/src/net/Qml.Net.Benchmarks/Qml.Net.Benchmarks.csproj index b93a7e07..8beacea5 100644 --- a/src/net/Qml.Net.Benchmarks/Qml.Net.Benchmarks.csproj +++ b/src/net/Qml.Net.Benchmarks/Qml.Net.Benchmarks.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 false diff --git a/src/net/Qml.Net.Sandbox/Qml.Net.Sandbox.csproj b/src/net/Qml.Net.Sandbox/Qml.Net.Sandbox.csproj index f8932cec..08392c04 100644 --- a/src/net/Qml.Net.Sandbox/Qml.Net.Sandbox.csproj +++ b/src/net/Qml.Net.Sandbox/Qml.Net.Sandbox.csproj @@ -1,7 +1,7 @@  Exe - netcoreapp2.1 + netcoreapp2.2 7.1 false $(MSBuildProjectDirectory) diff --git a/src/net/Qml.Net.Tests/Qml.Net.Tests.csproj b/src/net/Qml.Net.Tests/Qml.Net.Tests.csproj index a17399cb..40829b56 100644 --- a/src/net/Qml.Net.Tests/Qml.Net.Tests.csproj +++ b/src/net/Qml.Net.Tests/Qml.Net.Tests.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + netcoreapp2.2 false