From 8b5e52c8e0ca0d468b0e3525988093ac7abb70dd Mon Sep 17 00:00:00 2001
From: Daan Boerlage <dboerlage@cimpress.com>
Date: Fri, 1 Jun 2018 18:10:22 +0200
Subject: [PATCH] Actually upgrade to dotnet 2.1

---
 .gitlab-ci.yml                   | 2 +-
 Geekbot.net/Geekbot.net.csproj   | 8 +++-----
 Tests/Tests.csproj               | 2 +-
 WikipediaApi/WikipediaApi.csproj | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98eb9ba..b40a5e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ before_script:
 
 build:
   stage: build
-  image: microsoft/dotnet:2.0.3-sdk-stretch
+  image: microsoft/dotnet:2.1.300-sdk-stretch
   variables:
     NUGET_PACKAGES: "${CI_PROJECT_DIR}/.nugetcache"
   cache:
diff --git a/Geekbot.net/Geekbot.net.csproj b/Geekbot.net/Geekbot.net.csproj
index 336787a..9019d87 100755
--- a/Geekbot.net/Geekbot.net.csproj
+++ b/Geekbot.net/Geekbot.net.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     <ApplicationIcon>derp.ico</ApplicationIcon>
     <Version>4.0.0</Version>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
@@ -42,7 +43,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NLog" Version="4.5.6" />
     <PackageReference Include="NLog.Config" Version="4.5.6" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" />
     <PackageReference Include="PokeApi.NET" Version="1.1.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
@@ -57,9 +58,6 @@
     </PackageReference>
     <PackageReference Include="Utf8Json" Version="1.3.7" />
   </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
-  </ItemGroup>
   <ItemGroup>
     <None Update="Storage\checkEmPics">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 4713b2b..96c170b 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
diff --git a/WikipediaApi/WikipediaApi.csproj b/WikipediaApi/WikipediaApi.csproj
index f182d90..9a86577 100644
--- a/WikipediaApi/WikipediaApi.csproj
+++ b/WikipediaApi/WikipediaApi.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />