Merge branch 'devlead-feature/gh-20' into develop

cake-contrib · Feb 9, 2021 · 1fc5907 · 1fc5907
2 parents 9dba4ae + 24c62bc
commit 1fc5907
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,4 @@
-os: Visual Studio 2017
+os: Visual Studio 2019
 
 #---------------------------------#
 #  Build Script                   #

diff --git a/setup.cake b/setup.cake
@@ -1,4 +1,4 @@
-#load "nuget:?package=Cake.Recipe&version=1.0.0"
+#load "nuget:?package=Cake.Recipe&version=1.0.0"#load "nuget:?package=Cake.Recipe&version=1.1.2"
 
 Environment.SetVariableNames();
 
@@ -17,7 +17,9 @@ ToolSettings.SetToolSettings(context: Context,
                                 BuildParameters.RootDirectoryPath + "/src/Cake.Longpath.Module.Tests/**/*.cs" },
                             testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
-                            testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
+                            testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs",
+                            buildMSBuildToolVersion: MSBuildToolVersion.VS2019
+                            );
 
 Task("Integration-Tests")
     .IsDependentOn("Build")

diff --git a/src/Cake.LongPath.Module.sln b/src/Cake.LongPath.Module.sln
@@ -1,8 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 16
+VisualStudioVersion = 16.9.0.63002
+MinimumVisualStudioVersion = 16.0.0.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.LongPath.Module", "Cake.LongPath.Module\Cake.LongPath.Module.csproj", "{2B33108E-ABA1-49E5-B96E-7295088E629C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3580454D-AC5B-450C-B01B-DA8C74B525EF}"

diff --git a/src/Cake.LongPath.Module/Cake.LongPath.Module.csproj b/src/Cake.LongPath.Module/Cake.LongPath.Module.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,8 +34,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.33.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Core.0.33.0\lib\net46\Cake.Core.dll</HintPath>
+    <Reference Include="Cake.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cake.Core.1.0.0\lib\net46\Cake.Core.dll</HintPath>
     </Reference>
     <Reference Include="Pri.LongPath, Version=2.0.51.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Pri.LongPath.2.0.51\lib\net45\Pri.LongPath.dll</HintPath>

diff --git a/src/Cake.LongPath.Module/packages.config b/src/Cake.LongPath.Module/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Cake.Core" version="0.33.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Cake.Core" version="1.0.0" targetFramework="net46" developmentDependency="true" />
   <package id="Pri.LongPath" version="2.0.51" targetFramework="net46" />
 </packages>