From 78cc747b338ec0fcc285a1038db39cd3fdedc525 Mon Sep 17 00:00:00 2001
From: Ulrich Buchgraber <ulrich.b@gmx.at>
Date: Fri, 10 Mar 2017 22:04:38 +0100
Subject: [PATCH] Switch to VS/MSBuild 15.0

---
 Build/Build.ps1                | 2 +-
 ImplicitNullability.Sample.sln | 4 ++--
 ImplicitNullability.sln        | 4 ++--
 appveyor.yml                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Build/Build.ps1 b/Build/Build.ps1
index 728e5c7..8e9261a 100644
--- a/Build/Build.ps1
+++ b/Build/Build.ps1
@@ -15,7 +15,7 @@ Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference
 $BuildOutputPath = "Build\Output"
 $SolutionFilePath = "ImplicitNullability.sln"
 $AssemblyVersionFilePath = "Src\ImplicitNullability.Plugin\Properties\AssemblyInfo.cs"
-$MSBuildPath = "${env:ProgramFiles(x86)}\MSBuild\14.0\Bin\MSBuild.exe"
+$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\*\MSBuild\15.0\Bin\MSBuild.exe").FullName
 $NUnitAdditionalArgs = "--x86 --labels=All --agents=1"
 $NUnitTestAssemblyPaths = @(
     "Src\ImplicitNullability.Plugin.Tests\bin\R20162\$Configuration\ImplicitNullability.Plugin.Tests.R20162.dll"
diff --git a/ImplicitNullability.Sample.sln b/ImplicitNullability.Sample.sln
index 810adf2..fbd7e93 100644
--- a/ImplicitNullability.Sample.sln
+++ b/ImplicitNullability.Sample.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples.CodeWithIN.Internal", "Src\ImplicitNullability.Samples.CodeWithIN\ImplicitNullability.Samples.CodeWithIN.Internal.csproj", "{4AF4FFEC-2FAC-426A-B8B2-06F4D9F52392}"
 EndProject
diff --git a/ImplicitNullability.sln b/ImplicitNullability.sln
index cffa5b0..8792f6a 100644
--- a/ImplicitNullability.sln
+++ b/ImplicitNullability.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples.CodeWithIN.Internal", "Src\ImplicitNullability.Samples.CodeWithIN\ImplicitNullability.Samples.CodeWithIN.Internal.csproj", "{4AF4FFEC-2FAC-426A-B8B2-06F4D9F52392}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/appveyor.yml b/appveyor.yml
index 26558a9..8dd6cc0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,7 @@
 version: 3.5.0.{build}
 branches:
   except: [/spike.*/]
+image: Visual Studio 2017
 environment:
   NugetPushKey:
     secure: Fr6Et35ii82/P5ZjfsKoIomda8gim+SKJkklwChGm5Jm2+wd/5uyQYbwAP4M7UTv
@@ -8,7 +9,6 @@ environment:
     secure: /NFXyIKW45Q39yQFvB+0aJ1xGynLzg2bdJYDCyhhLH1l718N0vB1qt42hVxdv4GCGleHV4wHy1Efj1xNdNANpKlxPP/yrJrKtBLCYuEciAU=
 cache:
   - packages -> **\packages.config
-  - Src\ImplicitNullability.Plugin.Tests\Packages
 artifacts:
   - path: Build\Output\TestCoverage
   - path: Build\Output\TestCoverage\Summary.mht