Merge branch 'master' into release

DeployToChocolatey.cmd

@@ -0,0 +1,12 @@
+@ECHO OFF
+
+REM this script supposes you set the chocolatey API key by running this command:
+REM   NuGet SetApiKey <your key here> -source https://chocolatey.org/
+REM Mind the trailing slash!
+
+cd .\deploy\chocolatey\
+
+choco push pickles.%1.nupkg
+choco push picklesui.%1.nupkg
+
+cd ..\..\

DeployToNuget.cmd

@@ -0,0 +1,12 @@
+@ECHO OFF
+
+REM this script supposes you set the nuget API key by running this command:
+REM   NuGet SetApiKey <your key here>
+
+cd .\src\Pickles\packages\NuGet.CommandLine.*\tools
+
+nuget push ..\..\..\..\..\deploy\Pickles.%1.nupkg
+nuget push ..\..\..\..\..\deploy\Pickles.CommandLine.%1.nupkg
+nuget push ..\..\..\..\..\deploy\Pickles.MSBuild.%1.nupkg
+
+cd ..\..\..\..\..\

ReleaseNotes.md

@@ -1,5 +1,15 @@
 # Pickles Release Notes
 
+## v1.0.0 - 2014-12-15
+
+### Breaking Change
+
+- Support for the nAnt runner has been discontinued. nAnt users can migrate by using nAnt's capabilities to call the command line runner of Pickles. ([#179](https://github.com/picklesdoc/pickles/pull/179))
+
+### Bug Fix
+
+- The checkmark/cross icon in the GUI client did not always show the cross icon when appropriate, and its state could be changed by the user. ([#177](https://github.com/picklesdoc/pickles/pull/177))
+
 ## v0.20.0 - 2014-12-10
 
 ### Breaking Change

build.bat

@@ -1,10 +1,10 @@
 @echo off
-set "picklesVersion=0.20.0"
+set "picklesVersion=1.0.0"
 
 cls
 
 
-cd ".\src\Pickles\packages\NuGet.CommandLine.2.8.3\tools\"
+cd ".\src\Pickles\packages\NuGet.CommandLine.*\tools\"
 
 ".\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "..\..\..\..\..\packages" "-ExcludeVersion"
 

build.fsx

@@ -7,19 +7,18 @@ open Fake.AssemblyInfoFile
 let buildDir = "./build/"
 let cmdDir = "./build/exe/"
 let msBuildDir = "./build/msbuild/"
-let nantDir = "./build/nant/"
 let powerShellDir = "./build/powershell/"
 let guiDir = "./build/gui/"
 let testDir  = "./test/"
 let deployDir = "./deploy/"
 
 // version info
 let version = environVar "version" // or retrieve from CI server
- 
+
 
 // Targets
 Target "Clean" (fun _ ->
-    CleanDirs [cmdDir; msBuildDir; nantDir; powerShellDir; guiDir; buildDir; testDir; deployDir]
+    CleanDirs [cmdDir; msBuildDir; powerShellDir; guiDir; buildDir; testDir; deployDir]
 )
 
 Target "AssemblyInfo" (fun _ ->
@@ -46,12 +45,6 @@ Target "BuildMsBuild" (fun _ ->
       |> Log "AppBuild-Output: "
 )
 
-Target "BuildNAnt" (fun _ ->
-    !! "src/Pickles/Pickles.NAnt/Pickles.NAnt.csproj"
-      |> MSBuildRelease nantDir "Build"
-      |> Log "AppBuild-Output: "
-)
-
 Target "BuildPowerShell" (fun _ ->
     !! "src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj"
       |> MSBuildRelease powerShellDir "Build"
@@ -70,15 +63,14 @@ Target "BuildTest" (fun _ ->
       |> Log "AppBuild-Output: "
 )
 
-let createZip (packageType : string) = 
+let createZip (packageType : string) =
     !! (buildDir + "/" + packageType + "/*.*") -- "*.zip"
         |> Zip (buildDir + packageType) (deployDir + "Pickles-" + packageType + "-" + version + ".zip")
 
 Target "Zip" (fun _ ->
     createZip "exe"
     createZip "gui"
     createZip "msbuild"
-    createZip "nant"
     createZip "powershell"
 )
 
@@ -92,7 +84,6 @@ Target "Default" (fun _ ->
   ==> "AssemblyInfo"
   ==> "BuildCmd"
   ==> "BuildMsBuild"
-  ==> "BuildNAnt"
   ==> "BuildPowerShell"
   ==> "BuildGui"
   ==> "BuildTest"

src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj

@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Pickles\</SolutionDir>
-    <NuGetPackageImportStamp>a01d3d9d</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>c0225c14</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -81,7 +81,9 @@
     <None Include="NLog.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Settings.StyleCop" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -121,12 +123,12 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  <Import Project="..\packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.1\build\Fody.targets')" />
+  <Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\Fody.1.26.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.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.

src/Pickles/Pickles.CommandLine/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="Autofac" version="2.6.3.862" targetFramework="net35" />
   <package id="Costura.Fody" version="1.3.3.0" targetFramework="net35" developmentDependency="true" />
-  <package id="Fody" version="1.26.1" targetFramework="net35" developmentDependency="true" />
+  <package id="Fody" version="1.26.2" targetFramework="net35" developmentDependency="true" />
   <package id="NDesk.Options" version="0.2.1" />
   <package id="NLog" version="3.1.0.0" targetFramework="net35" />
   <package id="NLog.Config" version="3.1.0.0" targetFramework="net35" />

src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj

@@ -13,7 +13,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Pickles\</SolutionDir>
-    <NuGetPackageImportStamp>966e5458</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>ccac234e</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -112,12 +112,12 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  <Import Project="..\packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.1\build\Fody.targets')" />
+  <Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\Fody.1.26.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.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.

src/Pickles/Pickles.MSBuild/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="Autofac" version="2.6.3.862" targetFramework="net35" />
   <package id="Costura.Fody" version="1.3.3.0" targetFramework="net35" developmentDependency="true" />
-  <package id="Fody" version="1.26.1" targetFramework="net35" developmentDependency="true" />
+  <package id="Fody" version="1.26.2" targetFramework="net35" developmentDependency="true" />
   <package id="System.IO.Abstractions" version="1.4.0.92" targetFramework="net35" />
 </packages>