Merge branch 'hotfix/0.19.1' into main

augustoproiete-sandbox · Mar 23, 2017 · 4c5b4fd · 4c5b4fd
2 parents 70ad36c + a8bdf87
commit 4c5b4fd
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 27 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+### New on 0.19.1 (Released 2017/03/24)
+
+* 1543 VSWhere aliases should return Directory Paths and not File Paths
+
 ### New on 0.19.0 (Released 2017/03/23)
 
 * Add VSWhere support

diff --git a/src/Cake.Common.Tests/project.json b/src/Cake.Common.Tests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "buildOptions": {
     "platform": "anycpu",
     "additionalArguments": [

diff --git a/src/Cake.Common/Tools/VSWhere/All/VSWhereAll.cs b/src/Cake.Common/Tools/VSWhere/All/VSWhereAll.cs
@@ -31,7 +31,7 @@ public VSWhereAll(IFileSystem fileSystem, ICakeEnvironment environment, IProcess
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns>Installation paths for all instances.</returns>
-        public FilePathCollection All(VSWhereAllSettings settings)
+        public DirectoryPathCollection All(VSWhereAllSettings settings)
         {
             if (settings == null)
             {

diff --git a/src/Cake.Common/Tools/VSWhere/Latest/VSWhereLatest.cs b/src/Cake.Common/Tools/VSWhere/Latest/VSWhereLatest.cs
@@ -32,7 +32,7 @@ public VSWhereLatest(IFileSystem fileSystem, ICakeEnvironment environment, IProc
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns>Installation path of the newest or last install.</returns>
-        public FilePath Latest(VSWhereLatestSettings settings)
+        public DirectoryPath Latest(VSWhereLatestSettings settings)
         {
             if (settings == null)
             {

diff --git a/src/Cake.Common/Tools/VSWhere/Legacy/VSWhereLegacy.cs b/src/Cake.Common/Tools/VSWhere/Legacy/VSWhereLegacy.cs
@@ -31,7 +31,7 @@ public VSWhereLegacy(IFileSystem fileSystem, ICakeEnvironment environment, IProc
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns>Installation paths for all instances.</returns>
-        public FilePathCollection Legacy(VSWhereLegacySettings settings)
+        public DirectoryPathCollection Legacy(VSWhereLegacySettings settings)
         {
             if (settings == null)
             {

diff --git a/src/Cake.Common/Tools/VSWhere/Product/VSWhereProduct.cs b/src/Cake.Common/Tools/VSWhere/Product/VSWhereProduct.cs
@@ -31,7 +31,7 @@ public VSWhereProduct(IFileSystem fileSystem, ICakeEnvironment environment, IPro
         /// </summary>
         /// <param name="settings">The settings.</param>
         /// <returns>Installation paths for all instances.</returns>
-        public FilePathCollection Products(VSWhereProductSettings settings)
+        public DirectoryPathCollection Products(VSWhereProductSettings settings)
         {
             if (settings == null)
             {

diff --git a/src/Cake.Common/Tools/VSWhere/VSWhereAliases.cs b/src/Cake.Common/Tools/VSWhere/VSWhereAliases.cs
@@ -41,7 +41,7 @@ public static class VSWhereAliases
         [CakeMethodAlias]
         [CakeAliasCategory("Legacy")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.Legacy")]
-        public static FilePath VSWhereLegacy(this ICakeContext context, bool latest)
+        public static DirectoryPath VSWhereLegacy(this ICakeContext context, bool latest)
         {
             var settings = new VSWhereLegacySettings();
             settings.Latest = latest;
@@ -62,7 +62,7 @@ public static FilePath VSWhereLegacy(this ICakeContext context, bool latest)
         [CakeMethodAlias]
         [CakeAliasCategory("Legacy")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.Legacy")]
-        public static FilePathCollection VSWhereLegacy(this ICakeContext context, VSWhereLegacySettings settings)
+        public static DirectoryPathCollection VSWhereLegacy(this ICakeContext context, VSWhereLegacySettings settings)
         {
             if (context == null)
             {
@@ -91,7 +91,7 @@ public static FilePathCollection VSWhereLegacy(this ICakeContext context, VSWher
         [CakeMethodAlias]
         [CakeAliasCategory("Latest")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.Latest")]
-        public static FilePath VSWhereLatest(this ICakeContext context)
+        public static DirectoryPath VSWhereLatest(this ICakeContext context)
         {
             var settings = new VSWhereLatestSettings();
             return VSWhereLatest(context, settings);
@@ -111,7 +111,7 @@ public static FilePath VSWhereLatest(this ICakeContext context)
         [CakeMethodAlias]
         [CakeAliasCategory("Latest")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.Latest")]
-        public static FilePath VSWhereLatest(this ICakeContext context, VSWhereLatestSettings settings)
+        public static DirectoryPath VSWhereLatest(this ICakeContext context, VSWhereLatestSettings settings)
         {
             if (context == null)
             {
@@ -134,7 +134,7 @@ public static FilePath VSWhereLatest(this ICakeContext context, VSWhereLatestSet
         [CakeMethodAlias]
         [CakeAliasCategory("All")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.All")]
-        public static FilePathCollection VSWhereAll(this ICakeContext context)
+        public static DirectoryPathCollection VSWhereAll(this ICakeContext context)
         {
             var settings = new VSWhereAllSettings();
             return VSWhereAll(context, settings);
@@ -154,7 +154,7 @@ public static FilePathCollection VSWhereAll(this ICakeContext context)
         [CakeMethodAlias]
         [CakeAliasCategory("All")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.All")]
-        public static FilePathCollection VSWhereAll(this ICakeContext context, VSWhereAllSettings settings)
+        public static DirectoryPathCollection VSWhereAll(this ICakeContext context, VSWhereAllSettings settings)
         {
             if (context == null)
             {
@@ -184,7 +184,7 @@ public static FilePathCollection VSWhereAll(this ICakeContext context, VSWhereAl
         [CakeMethodAlias]
         [CakeAliasCategory("Product")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.Product")]
-        public static FilePathCollection VSWhereProducts(this ICakeContext context, string products)
+        public static DirectoryPathCollection VSWhereProducts(this ICakeContext context, string products)
         {
             var settings = new VSWhereProductSettings();
             return VSWhereProducts(context, products, settings);
@@ -205,7 +205,7 @@ public static FilePathCollection VSWhereProducts(this ICakeContext context, stri
         [CakeMethodAlias]
         [CakeAliasCategory("Product")]
         [CakeNamespaceImport("Cake.Common.Tools.VSWhere.Product")]
-        public static FilePathCollection VSWhereProducts(this ICakeContext context, string products, VSWhereProductSettings settings)
+        public static DirectoryPathCollection VSWhereProducts(this ICakeContext context, string products, VSWhereProductSettings settings)
         {
             if (context == null)
             {

diff --git a/src/Cake.Common/Tools/VSWhere/VSWhereTool.cs b/src/Cake.Common/Tools/VSWhere/VSWhereTool.cs
@@ -57,13 +57,13 @@ protected override IEnumerable<string> GetToolExecutableNames()
         /// <param name="settings">The settings.</param>
         /// <param name="builder">The process argument builder.</param>
         /// <returns>The parsed file paths.</returns>
-        protected FilePathCollection RunVSWhere(TSettings settings, ProcessArgumentBuilder builder)
+        protected DirectoryPathCollection RunVSWhere(TSettings settings, ProcessArgumentBuilder builder)
         {
             IEnumerable<string> installationPaths = null;
             Run(settings, builder, new ProcessSettings { RedirectStandardOutput = true },
                 process => installationPaths = process.GetStandardOutput());
 
-            return new FilePathCollection(installationPaths?.Select(FilePath.FromString) ?? Enumerable.Empty<FilePath>(),
+            return new DirectoryPathCollection(installationPaths?.Select(DirectoryPath.FromString) ?? Enumerable.Empty<DirectoryPath>(),
                 PathComparer.Default);
         }
 

diff --git a/src/Cake.Common/project.json b/src/Cake.Common/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.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": [

diff --git a/src/Cake.Core.Tests/project.json b/src/Cake.Core.Tests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Cake.Core": {

diff --git a/src/Cake.Core/project.json b/src/Cake.Core/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "description": "The Cake core library.",
   "copyright": "Copyright (c) .NET Foundation and contributors",
   "authors": [

diff --git a/src/Cake.NuGet.Tests/project.json b/src/Cake.NuGet.Tests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "buildOptions": {
     "platform": "AnyCpu",
     "additionalArguments": [

diff --git a/src/Cake.NuGet/project.json b/src/Cake.NuGet/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "dependencies": {
     "Cake.Core": {
       "target": "project"

diff --git a/src/Cake.Testing.Xunit/project.json b/src/Cake.Testing.Xunit/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "configurations": {
     "Release": {
       "buildOptions": {

diff --git a/src/Cake.Testing/project.json b/src/Cake.Testing/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "description": "Contains testing utilities for Cake.",
   "copyright": "Copyright (c) .NET Foundation and contributors",
   "authors": [

diff --git a/src/Cake.Tests/project.json b/src/Cake.Tests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Cake": {

diff --git a/src/Cake/project.json b/src/Cake/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.19.0-*",
+  "version": "0.19.1-*",
   "buildOptions": {
     "emitEntryPoint": true,
     "xmlDoc": true,

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -10,7 +10,7 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Cake")]
-[assembly: AssemblyVersion("0.19.0.0")]
-[assembly: AssemblyFileVersion("0.19.0.0")]
-[assembly: AssemblyInformationalVersion("0.19.0-beta.1+0.Branch.release/0.19.0.Sha.f797b4623c8d01e3841e9da18eef7358346d9d4b")]
+[assembly: AssemblyVersion("0.19.1.0")]
+[assembly: AssemblyFileVersion("0.19.1.0")]
+[assembly: AssemblyInformationalVersion("0.19.1-beta.1+1.Branch.hotfix/0.19.1.Sha.a0503c593c4eb2b2beb80b2bc913d0a3cd932c83")]
 [assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]