Merge pull request #26 from gitfool/bump-cake

Bump dependencies

.gitignore

@@ -2,7 +2,8 @@ bin/
 obj/
 packages/
 Components/
-tools/
+tools/**
+!tools/packages.config
 nupkg/
 *.userprefs
 *.suo

src/Cake.Xamarin.Tests/Cake.Xamarin.Tests.csproj

@@ -1,26 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Remove="TestProjects\**" />
     <EmbeddedResource Remove="TestProjects\**" />
     <None Remove="TestProjects\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.26.1" />
-    <PackageReference Include="Cake.Testing" Version="0.26.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="Cake.Common" Version="0.26.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Cake.Xamarin\Cake.Xamarin.csproj" />
-  </ItemGroup>
-
-</Project>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Cake.Common" Version="0.33.0" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" />
+    <PackageReference Include="Cake.Testing" Version="0.33.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="NSubstitute" Version="4.0.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Cake.Xamarin\Cake.Xamarin.csproj" />
+  </ItemGroup>
+
+</Project>

src/Cake.Xamarin.Tests/Fakes/FakeCakeContext.cs

@@ -1,9 +1,9 @@
 using System;
-using Cake.Core.IO;
 using Cake.Core;
-using System.Collections.Generic;
+using Cake.Core.IO;
 using Cake.Core.Tooling;
 using Cake.Testing;
+using NSubstitute;
 
 namespace Cake.Xamarin.Fakes
 {
@@ -22,13 +22,14 @@ public FakeCakeContext()
 			var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime(), log);
 			var globber = new Globber(fileSystem, environment);
 			var args = new FakeCakeArguments();
-			var processRunner = new ProcessRunner(environment, log);
 			var registry = new WindowsRegistry();
 			var toolRepo = new ToolRepository(environment);
-			var config = new Core.Configuration.CakeConfigurationProvider(fileSystem, environment).CreateConfiguration(testsDir, new Dictionary<string, string>());
+			var config = new FakeConfiguration();
 			var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config);
 			var toolLocator = new ToolLocator(environment, toolRepo, toolResolutionStrategy);
-			context = new CakeContext(fileSystem, environment, globber, log, args, processRunner, registry, toolLocator);
+			var processRunner = new ProcessRunner(fileSystem, environment, log, toolLocator, config);
+			var data = Substitute.For<ICakeDataService>();
+			context = new CakeContext(fileSystem, environment, globber, log, args, processRunner, registry, toolLocator, data, config);
 			context.Environment.WorkingDirectory = testsDir;
 		}
 

src/Cake.Xamarin/Aliases.cs

@@ -251,7 +251,7 @@ public static FilePath BuildAndroidApk(this ICakeContext context, FilePath proje
         /// <param name="context">The context.</param>
         /// <param name="projectFile">The .CSPROJ file to build from.</param>
         /// <param name="configuration">The MSBuild /p:Configuration to use (default is Release).</param>
-        /// <param name="configuration">The MSBuild /p:Platform to build with configuration to use (default is iPhone).</param>
+        /// <param name="platform">The MSBuild /p:Platform to build with configuration to use (default is iPhone).</param>
         /// <param name="settings">The MSBuild settings.</param>
         [CakeMethodAlias]
         public static FilePath BuildiOSIpa(this ICakeContext context, FilePath projectFile, string configuration = "Release", string platform = "iPhone", Action<MSBuildSettings> settings = null)

src/Cake.Xamarin/Cake.Xamarin.csproj

@@ -14,16 +14,13 @@
     <Authors>Redth</Authors>
     <Owners>Redth</Owners>
     <PackageProjectUrl>https://github.com/redth/Cake.Xamarin</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/redth/Cake.Xamarin/master/icon.png</PackageIconUrl>
+    <PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/redth/Cake.Xamarin/master/LICENSE.md</PackageLicenseUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.26.1" />
-    <PackageReference Include="Cake.Common" Version="0.26.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Util.cs" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="0.33.0" PrivateAssets="All" />
   </ItemGroup>
+
 </Project>

tools/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Cake" version="0.32.1" />
+</packages>