(GH-13) Update to latest Cake

cake-contrib · Feb 2, 2017 · ab5c909 · ab5c909
1 parent cc13ca2
commit ab5c909
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 36 deletions.
diff --git a/setup.cake b/setup.cake
@@ -15,7 +15,7 @@ BuildParameters.PrintParamters(Context);
 ToolSettings.SetToolSettings(context: Context,
                             dupFinderExcludePattern: new string[] { 
                                 BuildParameters.RootDirectoryPath + "/src/Cake.Chutzpah.Tests/*.cs" },
-                            testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
+                            testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[FluentAssertions]* -[FluentAssertions.*]*",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 

diff --git a/src/Cake.Chutzpah.Tests/Cake.Chutzpah.Tests.csproj b/src/Cake.Chutzpah.Tests/Cake.Chutzpah.Tests.csproj
@@ -34,12 +34,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.15.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Core.0.15.2\lib\net45\Cake.Core.dll</HintPath>
+    <Reference Include="Cake.Core, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cake.Core.0.17.0\lib\net45\Cake.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Cake.Testing, Version=0.15.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Testing.0.15.2\lib\net45\Cake.Testing.dll</HintPath>
+    <Reference Include="Cake.Testing, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cake.Testing.0.17.1\lib\net45\Cake.Testing.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
@@ -109,9 +109,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\packages\gep13.xUnitRunner.0.1.2\build\gep13.xUnitRunner.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gep13.xUnitRunner.0.1.2\build\gep13.xUnitRunner.targets'))" />
   </Target>
-  <Import Project="..\packages\gep13.xUnitRunner.0.1.2\build\gep13.xUnitRunner.targets" Condition="Exists('..\packages\gep13.xUnitRunner.0.1.2\build\gep13.xUnitRunner.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/Cake.Chutzpah.Tests/ChutzpahRunnerTests.cs b/src/Cake.Chutzpah.Tests/ChutzpahRunnerTests.cs
@@ -75,21 +75,6 @@ public class TheEmptyRunMethod
                     .WithMessage("Chutzpah: Process returned an error (exit code 3).");
             }
 
-            [Theory, CustomAutoData]
-            public void ShouldThrowIfChutzpahExecutableNotFound(
-                [Frozen] ICakeEnvironment environment, [Frozen] IFileSystem fileSystem,
-                ChutzpahRunner sut)
-            {
-                environment.WorkingDirectory.Returns("/Working");
-                fileSystem.Exist(
-                    Arg.Is<FilePath>(a => a.FullPath.Contains("chutzpah.console.exe")))
-                    .Returns(false);
-
-                sut.Invoking(x => x.Run())
-                    .ShouldThrow<CakeException>()
-                    .WithMessage("Chutzpah: Could not locate executable.");
-            }
-
             [Theory, CustomAutoData]
             public void ShouldBuildEmptyCommand([Frozen] IProcess process,
                 [Frozen] IProcessRunner processRunner,

diff --git a/src/Cake.Chutzpah.Tests/packages.config b/src/Cake.Chutzpah.Tests/packages.config
@@ -3,10 +3,9 @@
   <package id="AutoFixture" version="3.50.2" targetFramework="net45" />
   <package id="AutoFixture.AutoNSubstitute" version="3.50.2" targetFramework="net45" />
   <package id="AutoFixture.Xunit2" version="3.50.2" targetFramework="net45" />
-  <package id="Cake.Core" version="0.15.2" targetFramework="net45" />
-  <package id="Cake.Testing" version="0.15.2" targetFramework="net45" />
+  <package id="Cake.Core" version="0.17.0" targetFramework="net45" />
+  <package id="Cake.Testing" version="0.17.1" targetFramework="net45" />
   <package id="FluentAssertions" version="4.18.0" targetFramework="net45" />
-  <package id="gep13.xUnitRunner" version="0.1.2" targetFramework="net45" />
   <package id="NSubstitute" version="1.5.0.0" targetFramework="net45" />
   <package id="xunit" version="2.0.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

diff --git a/src/Cake.Chutzpah/Cake.Chutzpah.csproj b/src/Cake.Chutzpah/Cake.Chutzpah.csproj
@@ -40,8 +40,8 @@
     <CodeAnalysisRuleSet>Cake.Chutzpah.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cake.Core, Version=0.15.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cake.Core.0.15.2\lib\net45\Cake.Core.dll</HintPath>
+    <Reference Include="Cake.Core, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Cake.Core.0.17.0\lib\net45\Cake.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -67,13 +67,6 @@
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets" Condition="Exists('..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/Cake.Chutzpah/packages.config b/src/Cake.Chutzpah/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Cake.Core" version="0.15.2" targetFramework="net45" />
-  <package id="gep13.ApplicationRunner" version="0.1.2" targetFramework="net45" />
+  <package id="Cake.Core" version="0.17.0" targetFramework="net45" />
   <package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
 </packages>