Skip to content

Commit 9816dfa

Browse files
author
Dirk Rombauts
committed
Verson 2.18.2
1 parent 59ffd41 commit 9816dfa

File tree

50 files changed

+1017
-753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1017
-753
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
2828

2929
### Security
3030

31+
## [2.18.2] - 2018-04-28
32+
33+
### Changed
34+
35+
- Updated several external libraries
36+
37+
### Fixed
38+
39+
- Problem with Chocolatey Deployment
40+
3141
## [2.18.1] - 2018-04-20
3242

3343
### Fixed

‎build.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
2-
set "picklesVersion=2.18.1"
2+
set "picklesVersion=2.18.2"
33

44
cls
55

‎chocolatey.fsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Target "CreatePackage GUI" (fun _ ->
6868
guiDir + "MahApps.Metro.dll";
6969
guiDir + "MarkdownDeep.dll";
7070
guiDir + "CommonServiceLocator.dll";
71+
guiDir + "ControlzEx.dll";
7172
guiDir + "Newtonsoft.Json.dll";
7273
guiDir + "NLog.dll";
7374
guiDir + "NlogViewer.dll";

‎chocolatey/picklesui.nuspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
4646
<file src="MahApps.Metro.dll" target="tools" />
4747
<file src="MarkdownDeep.dll" target="tools" />
4848
<file src="CommonServiceLocator.dll" target="tools" />
49+
<file src="ControlzEx.dll" target="tools" />
4950
<file src="Newtonsoft.Json.dll" target="tools" />
5051
<file src="NLog.dll" target="tools" />
5152
<file src="NlogViewer.dll" target="tools" />

‎src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,6 +17,8 @@
1617
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
1718
<IsCodedUITest>False</IsCodedUITest>
1819
<TestProjectType>UnitTest</TestProjectType>
20+
<NuGetPackageImportStamp>
21+
</NuGetPackageImportStamp>
1922
</PropertyGroup>
2023
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2124
<DebugSymbols>true</DebugSymbols>
@@ -39,8 +42,8 @@
3942
<Reference Include="NFluent, Version=2.2.0.125, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
4043
<HintPath>..\packages\NFluent.2.2.0\lib\net45\NFluent.dll</HintPath>
4144
</Reference>
42-
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
43-
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
45+
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
46+
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
4447
</Reference>
4548
<Reference Include="System" />
4649
<Reference Include="System.IO.Abstractions, Version=2.1.0.178, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
@@ -107,6 +110,12 @@
107110
</Choose>
108111
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
109112
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
113+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
114+
<PropertyGroup>
115+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
116+
</PropertyGroup>
117+
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
118+
</Target>
110119
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111120
Other similar extension points exist, see Microsoft.Common.targets.
112121
<Target Name="BeforeBuild">

‎src/Pickles/Pickles.CommandLine.UnitTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NFluent" version="2.2.0" targetFramework="net45" />
4-
<package id="NUnit" version="3.9.0" targetFramework="net45" />
4+
<package id="NUnit" version="3.10.1" targetFramework="net45" />
55
<package id="System.IO.Abstractions" version="2.1.0.178" targetFramework="net45" />
66
<package id="System.IO.Abstractions.TestingHelpers" version="2.1.0.178" targetFramework="net45" />
77
</packages>

‎src/Pickles/Pickles.CommandLine/NLog.xsd‎

Lines changed: 382 additions & 312 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,29 @@
4242
<StartupObject>PicklesDoc.Pickles.CommandLine.Program</StartupObject>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="Autofac, Version=4.6.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Autofac.4.6.2\lib\net45\Autofac.dll</HintPath>
45+
<Reference Include="Autofac, Version=4.8.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Autofac.4.8.0\lib\net45\Autofac.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.CSharp" />
4949
<Reference Include="NDesk.Options">
5050
<HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
5151
</Reference>
5252
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
53-
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
53+
<HintPath>..\packages\NLog.4.5.3\lib\net45\NLog.dll</HintPath>
5454
</Reference>
5555
<Reference Include="System" />
56+
<Reference Include="System.Configuration" />
5657
<Reference Include="System.Core" />
5758
<Reference Include="System.Drawing" />
5859
<Reference Include="System.IO.Abstractions, Version=2.1.0.178, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
5960
<HintPath>..\packages\System.IO.Abstractions.2.1.0.178\lib\net40\System.IO.Abstractions.dll</HintPath>
6061
</Reference>
62+
<Reference Include="System.IO.Compression" />
6163
<Reference Include="System.IO.Compression.FileSystem" />
6264
<Reference Include="System.Numerics" />
6365
<Reference Include="System.Runtime.Serialization" />
66+
<Reference Include="System.ServiceModel" />
67+
<Reference Include="System.Transactions" />
6468
<Reference Include="System.Xml.Linq" />
6569
<Reference Include="System.Data.DataSetExtensions" />
6670
<Reference Include="System.Data" />

‎src/Pickles/Pickles.CommandLine/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="4.6.2" targetFramework="net45" />
3+
<package id="Autofac" version="4.8.0" targetFramework="net45" />
44
<package id="NDesk.Options" version="0.2.1" />
5-
<package id="NLog" version="4.4.12" targetFramework="net45" />
6-
<package id="NLog.Config" version="4.4.12" targetFramework="net45" />
7-
<package id="NLog.Schema" version="4.4.12" targetFramework="net45" />
5+
<package id="NLog" version="4.5.3" targetFramework="net45" />
6+
<package id="NLog.Config" version="4.5.3" targetFramework="net45" />
7+
<package id="NLog.Schema" version="4.5.3" targetFramework="net45" />
88
<package id="System.IO.Abstractions" version="2.1.0.178" targetFramework="net45" />
99
</packages>

‎src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
1718
<IsCodedUITest>False</IsCodedUITest>
1819
<TestProjectType>UnitTest</TestProjectType>
1920
<TargetFrameworkProfile />
21+
<NuGetPackageImportStamp>
22+
</NuGetPackageImportStamp>
2023
</PropertyGroup>
2124
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2225
<DebugSymbols>true</DebugSymbols>
@@ -36,18 +39,18 @@
3639
<WarningLevel>4</WarningLevel>
3740
</PropertyGroup>
3841
<ItemGroup>
39-
<Reference Include="Autofac, Version=4.6.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Autofac.4.6.2\lib\net45\Autofac.dll</HintPath>
42+
<Reference Include="Autofac, Version=4.8.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Autofac.4.8.0\lib\net45\Autofac.dll</HintPath>
4144
</Reference>
4245
<Reference Include="Microsoft.CSharp" />
4346
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
47+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4548
</Reference>
4649
<Reference Include="NFluent, Version=2.2.0.125, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
4750
<HintPath>..\packages\NFluent.2.2.0\lib\net45\NFluent.dll</HintPath>
4851
</Reference>
49-
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
50-
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
52+
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
53+
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
5154
</Reference>
5255
<Reference Include="System" />
5356
<Reference Include="System.Data" />
@@ -147,6 +150,7 @@
147150
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
148151
</PropertyGroup>
149152
<Error Condition="!Exists('..\packages\SpecFlow.2.3.2\build\SpecFlow.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.2.3.2\build\SpecFlow.targets'))" />
153+
<Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
150154
</Target>
151155
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
152156
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)