diff --git a/Nake.csx b/Nake.csx index 3e1fb41..8e278d8 100644 --- a/Nake.csx +++ b/Nake.csx @@ -44,7 +44,7 @@ var MSBuildExe = @"$ProgramFiles(x86)$\MSBuild\12.0\Bin\MSBuild.exe"; { Build("Debug", outputPath); - string tests = new FileSet{@"{outputPath}\*.Tests.dll"}; + var tests = new FileSet{@"{outputPath}\*.Tests.dll"}.ToString(" "); Cmd(@"Packages\NUnit.Runners.2.6.2\tools\nunit-console.exe /framework:net-4.0 /noshadow /nologo {tests}"); } diff --git a/Source/ProductAssemblyInfo.cs b/Source/ProductAssemblyInfo.cs index d5bb63f..4753336 100644 --- a/Source/ProductAssemblyInfo.cs +++ b/Source/ProductAssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; -[assembly: AssemblyVersion("2.1.0.0")] -[assembly: AssemblyInformationalVersion("2.1.0")] +[assembly: AssemblyVersion("2.1.1.0")] +[assembly: AssemblyInformationalVersion("2.1.1")] [assembly: AssemblyCopyright("Copyright © Yevhen Bobrov 2013-2014")] diff --git a/Source/Utility/FileSet.cs b/Source/Utility/FileSet.cs index 31ee40c..a2ac5a5 100644 --- a/Source/Utility/FileSet.cs +++ b/Source/Utility/FileSet.cs @@ -271,7 +271,16 @@ FileSet Transform(Func transform) } /// - /// Performs an implicit conversion from strign array to . + /// Performs conversion from file set to array of . + /// + /// The sequence of MSBuild task items + public ITaskItem[] AsTaskItems() + { + return ((IEnumerable)this).AsTaskItems(); + } + + /// + /// Performs an implicit conversion from string array to . /// /// The argument. /// @@ -303,23 +312,25 @@ public static implicit operator string[](FileSet arg) } /// - /// Performs an implicit conversion from file set to array of . + /// Returns a string that represents the current object. /// - /// The argument. - /// The sequence of MSBuild task items - public static implicit operator ITaskItem[](FileSet arg) + /// + /// A string that represents the current object. + /// + /// 2 + public override string ToString() { - return arg.ToArray().AsTaskItems(); - } - + return ToString(" "); + } + /// - /// Performs an implicit conversion from file set to string. + /// Returns a string of resolved concatenated file paths using given separator. /// - /// The argument. - /// The string with space separated list of resolved file set paths - public static implicit operator string(FileSet arg) + /// Path separator + /// The string with resolved file set paths separated by given separator + public string ToString(string separator) { - return string.Join(" ", arg); + return string.Join(separator, this); ; } class Inclusion diff --git a/Tools/Nake/Meta.dll b/Tools/Nake/Meta.dll index efd8154..484a932 100644 Binary files a/Tools/Nake/Meta.dll and b/Tools/Nake/Meta.dll differ diff --git a/Tools/Nake/Meta.pdb b/Tools/Nake/Meta.pdb index 96582bc..32b7974 100644 Binary files a/Tools/Nake/Meta.pdb and b/Tools/Nake/Meta.pdb differ diff --git a/Tools/Nake/Nake.exe b/Tools/Nake/Nake.exe index 1d58723..be5b9fc 100644 Binary files a/Tools/Nake/Nake.exe and b/Tools/Nake/Nake.exe differ diff --git a/Tools/Nake/Nake.pdb b/Tools/Nake/Nake.pdb index 99dd1bc..8a4e261 100644 Binary files a/Tools/Nake/Nake.pdb and b/Tools/Nake/Nake.pdb differ diff --git a/Tools/Nake/Utility.dll b/Tools/Nake/Utility.dll index 56ba2b1..7be3290 100644 Binary files a/Tools/Nake/Utility.dll and b/Tools/Nake/Utility.dll differ diff --git a/Tools/Nake/Utility.pdb b/Tools/Nake/Utility.pdb index 1e62dd2..b9eea67 100644 Binary files a/Tools/Nake/Utility.pdb and b/Tools/Nake/Utility.pdb differ