Merge branch 'release/0.12.0' into main

.gitignore

@@ -16,6 +16,7 @@ tools/xunit.runner.console/
 tools/nuget.exe
 tools/gitreleasemanager/
 tools/GitVersion.CommandLine/
+tools/Addins/
 
 # mstest test results
 TestResults

README.md

@@ -1,4 +1,4 @@
-#Cake 
+#Cake
 
 [![NuGet](https://img.shields.io/nuget/v/Cake.svg)](https://www.nuget.org/packages/Cake) [![MyGet](https://img.shields.io/myget/cake/v/Cake.svg?label=myget)](https://www.myget.org/gallery/cake) [![Chocolatey](https://img.shields.io/chocolatey/v/Cake.portable.svg)](https://chocolatey.org/packages/cake.portable)
 [![homebrew](https://img.shields.io/homebrew/v/cake.svg)](http://braumeister.org/formula/cake)
@@ -50,19 +50,19 @@ build script.
 ##### Windows
 
 ```powershell
-Invoke-WebRequest http://cakebuild.net/bootstrapper/windows -OutFile build.ps1
+Invoke-WebRequest http://cakebuild.net/download/bootstrapper/windows -OutFile build.ps1
 ```
 
 ##### Linux
 
 ```console
-curl -Lsfo build.sh http://cakebuild.net/bootstrapper/linux
+curl -Lsfo build.sh http://cakebuild.net/download/bootstrapper/linux
 ```
 
 ##### OS X
 
 ```console
-curl -Lsfo build.sh http://cakebuild.net/bootstrapper/osx
+curl -Lsfo build.sh http://cakebuild.net/download/bootstrapper/osx
 ```
 
 ### 2. Create a Cake script

ReleaseNotes.md

@@ -1,29 +1,58 @@
+### New on 0.12.0 (Released 2016/05/25)
+
+* Fix globalization & white space issue
+* New Setup(Action<ICakeContext>)  fails on mono
+* Cake.pdb is missing in artifacts
+* Tool path is wrong when calling cake file in sub directory
+* Add support for .NET Core CLI
+* Add pre-processor directive which injects Debugger.Break()
+* Add an EnsureDirectoryExists Alias to CreateDirectory and not fail if it exists
+* Debugging support
+* Added additional missing variables for GitVersion
+* Add missing GitVersion return values
+* Add missing GitVersion return values
+* Consider adding developmentDependency to nuspec for Cake.Common
+* Specify culture for Roslyn debug string formats
+* Add cake-build build.cake NuGet restore retry handling
+* During the publishing cycle, continue with each step, and error at end if there is a problem
+* Add all artifacts to AppVeyor during publishing cycle
+* Add register and ReturnTargetCodeOffset option in opencover
+* Unified tool resolution
+* Drop DNU/DNX support in favor of dotnet CLI
+* Corrected resource download urls
+* Docs: Typos in XBuild docs
+* -Mono parameter is not documented in Program.cs output
+* How to get ILRepack executable?
+
+
 ### New on 0.11.0 (Released 2016/05/01)
-Regression: ProcessArgumentListExtensions was renamed
-DNU usage of multi arguments changed
-MSTest tool resolution fail if Visual Studio isn't in default location
-Fix issue with final build step
-Actual type of RepositoryUrl is String not Uri
-Add configuration file for Cake.
-Add Text Transform support
-Add FileSize alias
-Add integration tests
-Remove tools and addins from packages.config.
-Setup Issue and Pull Request Templates
-Obsolete XmlPoke string alias and add new method/alias for string
-Signtool: Add support for certificates from the certificate store based on thumbprint
-Add generic optional tool timeout
-Add NuGetPacker support for IncludeReferencedProjects
-Parse multiple InternalsVisibleTo attributes from AssemblyInfo
-Add StorePasswordInClearText to NuGetSoiurceAdd NuGetSourcesSettings
-TeamCity ImportDotCoverCoverage tests fail when running on TeamCity
-Have TeamCityDisposableExtensions extend ITeamCityProvider
-Remove (Install) from Chocolatey Package
-Setup/Teardown should provide ICakeContext
-Signtool: Add support for description (/d)
-Support NuGet 3 new parameters
-Added note about ReSharper License
-Added Chocolatey Package Badge
+
+* Regression: ProcessArgumentListExtensions was renamed
+* DNU usage of multi arguments changed
+* MSTest tool resolution fail if Visual Studio isn't in default location
+* Fix issue with final build step
+* Actual type of RepositoryUrl is String not Uri
+* Add configuration file for Cake.
+* Add Text Transform support
+* Add FileSize alias
+* Add TravisCI buildsystem
+* Add integration tests
+* Remove tools and addins from packages.config.
+* Setup Issue and Pull Request Templates
+* Obsolete XmlPoke string alias and add new method/alias for string
+* Signtool: Add support for certificates from the certificate store based on thumbprint
+* Add generic optional tool timeout
+* Add NuGetPacker support for IncludeReferencedProjects
+* Parse multiple InternalsVisibleTo attributes from AssemblyInfo
+* Add StorePasswordInClearText to NuGetSoiurceAdd NuGetSourcesSettings
+* TeamCity ImportDotCoverCoverage tests fail when running on TeamCity
+* Have TeamCityDisposableExtensions extend ITeamCityProvider
+* Remove (Install) from Chocolatey Package
+* Setup/Teardown should provide ICakeContext
+* Signtool: Add support for description (/d)
+* Support NuGet 3 new parameters
+* Added note about ReSharper License
+* Added Chocolatey Package Badge
 
 
 ### New on 0.10.1 (Released 2016/04/07)

build.cake

@@ -1,3 +1,6 @@
+// Install addins.
+#addin "nuget:?package=Polly&version=4.2.0"
+
 // Install tools.
 #tool "nuget:?package=xunit.runner.console&version=2.1.0"
 #tool "nuget:?package=gitreleasemanager&version=0.4.0"
@@ -6,11 +9,15 @@
 // Load other scripts.
 #load "./build/parameters.cake"
 
+// Using statements
+using Polly;
+
 //////////////////////////////////////////////////////////////////////
 // PARAMETERS
 //////////////////////////////////////////////////////////////////////
 
 BuildParameters parameters = BuildParameters.GetParameters(Context, BuildSystem);
+bool publishingError = false;
 
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
@@ -61,12 +68,29 @@ Task("Restore-NuGet-Packages")
     .IsDependentOn("Clean")
     .Does(() =>
 {
-    NuGetRestore("./src/Cake.sln", new NuGetRestoreSettings {
-        Source = new List<string> {
-            "https://api.nuget.org/v3/index.json",
-            "https://www.myget.org/F/roslyn-nightly/api/v3/index.json"
-        }
-    });
+    var maxRetryCount = 5;
+    var toolTimeout = 1d;
+    Policy
+        .Handle<Exception>()
+        .Retry(maxRetryCount, (exception, retryCount, context) => {
+            if (retryCount == maxRetryCount)
+            {
+                throw exception;
+            }
+            else
+            {
+                Verbose("{0}", exception);
+                toolTimeout+=0.5;
+            }})
+        .Execute(()=> {
+            NuGetRestore("./src/Cake.sln", new NuGetRestoreSettings {
+                Source = new List<string> {
+                    "https://api.nuget.org/v3/index.json",
+                    "https://www.myget.org/F/roslyn-nightly/api/v3/index.json"
+                },
+                ToolTimeout = TimeSpan.FromMinutes(toolTimeout)
+            });
+        });
 });
 
 Task("Build")
@@ -168,6 +192,11 @@ Task("Upload-AppVeyor-Artifacts")
     .Does(() =>
 {
     AppVeyor.UploadArtifact(parameters.Paths.Files.ZipArtifactPath);
+
+    foreach(var package in GetFiles(parameters.Paths.Directories.NugetRoot + "/*"))
+    {
+        AppVeyor.UploadArtifact(package);
+    }
 });
 
 Task("Publish-MyGet")
@@ -198,6 +227,11 @@ Task("Publish-MyGet")
             ApiKey = apiKey
         });
     }
+})
+.OnError(exception =>
+{
+    Information("Publish-MyGet Task failed, but continuing with next Task...");
+    publishingError = true;
 });
 
 Task("Publish-NuGet")
@@ -229,6 +263,11 @@ Task("Publish-NuGet")
           Source = apiUrl
         });
     }
+})
+.OnError(exception =>
+{
+    Information("Publish-NuGet Task failed, but continuing with next Task...");
+    publishingError = true;
 });
 
 Task("Publish-Chocolatey")
@@ -260,6 +299,11 @@ Task("Publish-Chocolatey")
           Source = apiUrl
         });
     }
+})
+.OnError(exception =>
+{
+    Information("Publish-Chocolatey Task failed, but continuing with next Task...");
+    publishingError = true;
 });
 
 Task("Publish-HomeBrew")
@@ -274,6 +318,11 @@ Task("Publish-HomeBrew")
     var hash = CalculateFileHash(parameters.Paths.Files.ZipArtifactPath).ToHex();
 
     Information("Hash for creating HomeBrew PullRequest: {0}", hash);
+})
+.OnError(exception =>
+{
+    Information("Publish-HomeBrew Task failed, but continuing with next Task...");
+    publishingError = true;
 });
 
 Task("Publish-GitHub-Release")
@@ -287,6 +336,11 @@ Task("Publish-GitHub-Release")
     GitReleaseManagerAddAssets(parameters.GitHub.UserName, parameters.GitHub.Password, "cake-build", "cake", parameters.Version.Milestone, parameters.Paths.Files.ZipArtifactPath.ToString());
 
     GitReleaseManagerClose(parameters.GitHub.UserName, parameters.GitHub.Password, "cake-build", "cake", parameters.Version.Milestone);
+})
+.OnError(exception =>
+{
+    Information("Publish-GitHub-Release Task failed, but continuing with next Task...");
+    publishingError = true;
 });
 
 Task("Create-Release-Notes")
@@ -317,7 +371,14 @@ Task("AppVeyor")
   .IsDependentOn("Publish-NuGet")
   .IsDependentOn("Publish-Chocolatey")
   .IsDependentOn("Publish-HomeBrew")
-  .IsDependentOn("Publish-GitHub-Release");
+  .IsDependentOn("Publish-GitHub-Release")
+  .Finally(() =>
+{
+    if(publishingError)
+    {
+        throw new Exception("An error occurred during the publishing of Cake.  All publishing tasks have been attempted.");
+    }
+});
 
 Task("Travis")
   .IsDependentOn("Run-Unit-Tests");

build.sh

@@ -42,7 +42,7 @@ fi
 # Make sure that packages.config exist.
 if [ ! -f $TOOLS_DIR/packages.config ]; then
     echo "Downloading packages.config..."
-    curl -Lsfo $TOOLS_DIR/packages.config http://cakebuild.net/bootstrapper/packages
+    curl -Lsfo $TOOLS_DIR/packages.config http://cakebuild.net/download/bootstrapper/packages
     if [ $? -ne 0 ]; then
         echo "An error occured while downloading packages.config."
         exit 1

build/paths.cake

@@ -34,6 +34,7 @@ public class BuildPaths
 
         var cakeAssemblyPaths = new FilePath[] {
             buildDir + context.File("Cake.exe"),
+            buildDir + context.File("Cake.pdb"),
             buildDir + context.File("Cake.Core.dll"),
             buildDir + context.File("Cake.Core.pdb"),
             buildDir + context.File("Cake.Core.xml"),
@@ -117,12 +118,12 @@ public class BuildFiles
         ArtifactsSourcePaths = Filter(context, artifactsSourcePaths);
         ZipArtifactPath = zipArtifactPath;
     }
-    
+
     private static FilePath[] Filter(ICakeContext context, FilePath[] files)
     {
         // Not a perfect solution, but we need to filter PDB files
         // when building on an OS that's not Windows (since they don't exist there).
-        
+
         if(!context.IsRunningOnWindows())
         {
             return files.Where(f => !f.FullPath.EndsWith("pdb")).ToArray();

nuspec/Cake.Common.nuspec

@@ -13,6 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright (c) Patrik Svensson, Mattias Karlsson, Gary Ewan Park and contributors</copyright>
     <tags>Cake Script Build</tags>
+    <developmentDependency>true</developmentDependency>
     <dependencies>
       <dependency id="Cake.Core" version="$version$" />
     </dependencies>
@@ -23,4 +24,4 @@
     <file src="Cake.Common.pdb" target="lib/net45" />
     <file src="LICENSE" />
   </files>
-</package>
+</package>

src/Cake.Common.Tests/Cake.Common.Tests.csproj

@@ -106,6 +106,14 @@
     <Compile Include="Fixtures\Tools\DotCover\Analyse\DotCoverAnalyserFixture.cs" />
     <Compile Include="Fixtures\Tools\DotCover\Cover\DotCoverCovererFixture.cs" />
     <Compile Include="Fixtures\Tools\DotCover\DotCoverFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Build\DotNetCoreBuilderFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Execute\DotNetCoreExecutorFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\DotNetCoreFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Pack\DotNetCorePackerFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Publish\DotNetCorePublisherFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Restore\DotNetCoreRestorerFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Run\DotNetCoreRunnerFixture.cs" />
+    <Compile Include="Fixtures\Tools\DotNetCore\Test\DotNetCoreTesterFixture.cs" />
     <Compile Include="Fixtures\Tools\DupFinder\DupFinderRunnerConfigFixture.cs" />
     <Compile Include="Fixtures\Tools\DupFinder\DupFinderRunnerFixture.cs" />
     <Compile Include="Fixtures\Tools\FixieRunnerFixture.cs" />
@@ -239,6 +247,13 @@
     <Compile Include="Unit\Tools\DotCover\Analyse\DotCoverAnalyserTests.cs" />
     <Compile Include="Unit\Tools\DotCover\Analyse\DotCoverAnalyseSettingsTests.cs" />
     <Compile Include="Unit\Tools\DotCover\Cover\DotCoverCovererTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Build\DotNetCoreBuilderTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Execute\DotNetCoreExecutorTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Pack\DotNetCorePackerTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Publish\DotNetCorePublisherTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Restore\DotNetCoreRestorerTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Run\DotNetCoreRunnerTests.cs" />
+    <Compile Include="Unit\Tools\DotNetCore\Test\DotNetCoreTesterTests.cs" />
     <Compile Include="Unit\Tools\DupFinder\DupFinderRunnerTests.cs" />
     <Compile Include="Unit\Tools\Fixie\FixieRunnerTests.cs" />
     <Compile Include="Unit\Tools\GitLink\GitlinkRunnerTests.cs" />

src/Cake.Common.Tests/Fixtures/Tools/CakeRunnerFixture.cs

@@ -27,7 +27,7 @@ public void GivenScriptDoNotExist()
 
         protected override void RunTool()
         {
-            var runner = new CakeRunner(FileSystem, Environment, Globber, ProcessRunner);
+            var runner = new CakeRunner(FileSystem, Environment, Globber, ProcessRunner, Tools);
             runner.ExecuteScript(ScriptPath, Settings);
         }
     }

src/Cake.Common.Tests/Fixtures/Tools/CandleFixture.cs

@@ -18,7 +18,7 @@ public CandleFixture()
 
         protected override void RunTool()
         {
-            var tool = new CandleRunner(FileSystem, Environment, Globber, ProcessRunner);
+            var tool = new CandleRunner(FileSystem, Environment, ProcessRunner, Tools);
             tool.Run(SourceFiles, Settings);
         }
     }

src/Cake.Common.Tests/Fixtures/Tools/Chocolatey/ApiKey/ChocolateyApiKeySetterFixture.cs

@@ -15,7 +15,7 @@ public ChocolateyApiKeySetterFixture()
 
         protected override void RunTool()
         {
-            var tool = new ChocolateyApiKeySetter(FileSystem, Environment, ProcessRunner, Globber, Resolver);
+            var tool = new ChocolateyApiKeySetter(FileSystem, Environment, ProcessRunner, Tools, Resolver);
             tool.Set(ApiKey, Source, Settings);
         }
     }

src/Cake.Common.Tests/Fixtures/Tools/Chocolatey/Config/ChocolateyConfigSetterFixture.cs

@@ -15,7 +15,7 @@ public ChocolateyConfigSetterFixture()
 
         protected override void RunTool()
         {
-            var tool = new ChocolateyConfigSetter(FileSystem, Environment, ProcessRunner, Globber, Resolver);
+            var tool = new ChocolateyConfigSetter(FileSystem, Environment, ProcessRunner, Tools, Resolver);
             tool.Set(Name, Value, Settings);
         }
     }

src/Cake.Common.Tests/Fixtures/Tools/Chocolatey/Features/ChocolateyDisableFeatureFixture.cs

@@ -6,7 +6,7 @@ internal sealed class ChocolateyDisableFeatureFixture : ChocolateyFeatureToggler
     {
         protected override void RunTool()
         {
-            var tool = new ChocolateyFeatureToggler(FileSystem, Environment, ProcessRunner, Globber, Resolver);
+            var tool = new ChocolateyFeatureToggler(FileSystem, Environment, ProcessRunner, Tools, Resolver);
             tool.DisableFeature(Name, Settings);
         }
     }

src/Cake.Common.Tests/Fixtures/Tools/Chocolatey/Features/ChocolateyEnableFeatureFixture.cs

@@ -6,7 +6,7 @@ internal sealed class ChocolateyEnableFeatureFixture : ChocolateyFeatureTogglerF
     {
         protected override void RunTool()
         {
-            var tool = new ChocolateyFeatureToggler(FileSystem, Environment, ProcessRunner, Globber, Resolver);
+            var tool = new ChocolateyFeatureToggler(FileSystem, Environment, ProcessRunner, Tools, Resolver);
             tool.EnableFeature(Name, Settings);
         }
     }