Merge branch 'hotfix/0.16.1' into main

cake-build · Sep 25, 2016 · 3a8ac68 · 3a8ac68
2 parents e20691b + e674f7d
commit 3a8ac68
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 28 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -13,4 +13,5 @@ branches:
     track-merge-target: true
 ignore:
   sha:
-    - 2a4757b270f7946122ba6622e3d2e72b2b2808a7
+    - 2a4757b270f7946122ba6622e3d2e72b2b2808a7
+    - 3e91c23637b97bc4e4c3234f93ffd03e6af70e8c
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,4 +1,10 @@
+### New on 0.16.1 (Released 2016/09/25)
+
+* Issue with debugging in v0.16.0 (.NET Core)
+* Add missing assembly properties
+
 ### New on 0.16.0 (Released 2016/09/15)
+
 * Change API for registering dependencies with Cake
 * Add include & exlude parameters to #tool directive
 * Allow passing username and password to DownloadFile alias

diff --git a/build.ps1 b/build.ps1
@@ -31,7 +31,7 @@ Param(
     [string[]]$ScriptArgs
 )
 
-$CakeVersion = "0.15.2"
+$CakeVersion = "0.16.0"
 $DotNetChannel = "preview";
 $DotNetVersion = "1.0.0-preview2-003121";
 $DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1";

diff --git a/build.sh b/build.sh
@@ -10,7 +10,7 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 TOOLS_DIR=$SCRIPT_DIR/tools
 NUGET_EXE=$TOOLS_DIR/nuget.exe
 NUGET_URL=https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-CAKE_VERSION=0.15.2
+CAKE_VERSION=0.16.0
 CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
 
 # Define default arguments.

diff --git a/build/version.cake b/build/version.cake
@@ -68,11 +68,11 @@ public class BuildVersion
     public static string ReadProjectJsonVersion(ICakeContext context)
     {
         var projects = context.GetFiles("./**/project.json");
-        foreach(var project in projects) 
+        foreach(var project in projects)
         {
             var content = System.IO.File.ReadAllText(project.FullPath, Encoding.UTF8);
             var node = Newtonsoft.Json.Linq.JObject.Parse(content);
-            if(node["version"] != null) 
+            if(node["version"] != null)
             {
                 var version = node["version"].ToString();
                 return version.Replace("-*", "");
@@ -85,7 +85,7 @@ public class BuildVersion
     {
         var content = System.IO.File.ReadAllText(project.FullPath, Encoding.UTF8);
         var node = Newtonsoft.Json.Linq.JObject.Parse(content);
-        if(node["version"] != null) 
+        if(node["version"] != null)
         {
             node["version"].Replace(string.Concat(Version, "-*"));
             System.IO.File.WriteAllText(project.FullPath, node.ToString(), Encoding.UTF8);

diff --git a/nuspec/Cake.CoreCLR.nuspec b/nuspec/Cake.CoreCLR.nuspec
@@ -38,6 +38,8 @@
     <file src="NuGet.Repositories.dll" />
     <file src="NuGet.RuntimeModel.dll" />
     <file src="NuGet.Versioning.dll" />
+    <file src="System.Collections.NonGeneric.dll" />
+    <file src="System.Collections.Specialized.dll" />
     <file src="System.ComponentModel.Primitives.dll" />
     <file src="System.ComponentModel.TypeConverter.dll" />
     <file src="System.Diagnostics.StackTrace.dll" />

diff --git a/src/Cake.Common.Tests/project.json b/src/Cake.Common.Tests/project.json
@@ -1,10 +1,15 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "buildOptions": {
     "additionalArguments": [
       "/ruleset:../Test.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/Cake.Common/project.json b/src/Cake.Common/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "description": "Provides aliases (extension methods on Cake context) that support CI, build, unit tests, zip, signing, etc. for Cake.",
   "copyright": "Copyright (c) .NET Foundation and contributors",
   "authors": [
@@ -34,7 +34,12 @@
     "additionalArguments": [
       "/ruleset:../Cake.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/Cake.Core.Tests/project.json b/src/Cake.Core.Tests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Cake.Core": {
@@ -31,7 +31,12 @@
     "additionalArguments": [
       "/ruleset:../Test.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "frameworks": {
     "net451": {

diff --git a/src/Cake.Core/project.json b/src/Cake.Core/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "description": "The Cake core library.",
   "copyright": "Copyright (c) .NET Foundation and contributors",
   "authors": [
@@ -31,7 +31,12 @@
     "additionalArguments": [
       "/ruleset:../Cake.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/Cake.NuGet.Tests/project.json b/src/Cake.NuGet.Tests/project.json
@@ -1,10 +1,15 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "buildOptions": {
     "additionalArguments": [
       "/ruleset:../Test.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/Cake.NuGet/project.json b/src/Cake.NuGet/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "dependencies": {
     "Cake.Core": {
       "target": "project"
@@ -14,7 +14,12 @@
     "additionalArguments": [
       "/ruleset:../Cake.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/Cake.Testing.Xunit/project.json b/src/Cake.Testing.Xunit/project.json
@@ -1,12 +1,19 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "configurations": {
     "Release": {
       "buildOptions": {
         "warningsAsErrors": true
       }
     }
   },
+  "buildOptions": {
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
+  },
   "dependencies": {
     "Cake.Core": {
       "target": "project"

diff --git a/src/Cake.Testing/project.json b/src/Cake.Testing/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "description": "Contains testing utilities for Cake.",
   "copyright": "Copyright (c) .NET Foundation and contributors",
   "authors": [
@@ -25,7 +25,12 @@
     "additionalArguments": [
       "/ruleset:../Cake.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/Cake.Tests/project.json b/src/Cake.Tests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Cake": {
@@ -38,7 +38,12 @@
     "additionalArguments": [
       "/ruleset:../Test.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "frameworks": {
     "net451": {

diff --git a/src/Cake/project.json b/src/Cake/project.json
@@ -1,12 +1,17 @@
 {
-  "version": "0.16.0-*",
+  "version": "0.16.1-*",
   "buildOptions": {
     "emitEntryPoint": true,
     "xmlDoc": true,
     "additionalArguments": [
       "/ruleset:../Cake.ruleset",
       "/additionalfile:../stylecop.json"
-    ]
+    ],
+    "compile": {
+      "includeFiles": [
+        "../SolutionInfo.cs"
+      ]
+    }
   },
   "configurations": {
     "Release": {

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -10,7 +10,7 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake")]
-[assembly: AssemblyVersion("0.16.0.0")]
-[assembly: AssemblyFileVersion("0.16.0.0")]
-[assembly: AssemblyInformationalVersion("0.16.0-beta.1+0.Branch.release/0.16.0.Sha.063491a68fca245652b7d4b8cd289b6242d0e08f")]
+[assembly: AssemblyVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyInformationalVersion("0.16.1-beta.1+6.Branch.hotfix/0.16.1.Sha.17b0593ec6dfaa374b47294996bf3f7d65b43ca3")]
 [assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]