Skip to content
This repository was archived by the owner on Jun 25, 2020. It is now read-only.

Commit e122e94

Browse files
author
Jérémie Bertrand
committed
Fix #251 
1 parent 1728abb commit e122e94

11 files changed

+174
-98
lines changed

‎src/Pretzel.Logic/Pretzel.Logic.csproj

+13-12
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
<HintPath>..\packages\AjaxMin.5.14.5506.26202\lib\net40\AjaxMin.dll</HintPath>
4242
</Reference>
4343
<Reference Include="CommonMark, Version=0.1.0.0, Culture=neutral, PublicKeyToken=001ef8810438905d, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\packages\CommonMark.NET.0.8.5\lib\net45\CommonMark.dll</HintPath>
44+
<HintPath>..\packages\CommonMark.NET.0.9.1\lib\net45\CommonMark.dll</HintPath>
45+
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="dotless.ClientOnly">
48-
<HintPath>..\packages\DotlessClientOnly.1.4.1.0\lib\dotless.ClientOnly.dll</HintPath>
47+
<Reference Include="dotless.ClientOnly, Version=1.5.1.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
48+
<HintPath>..\packages\DotlessClientOnly.1.5.1\lib\dotless.ClientOnly.dll</HintPath>
49+
<Private>True</Private>
4950
</Reference>
5051
<Reference Include="DotLiquid, Version=1.8.0.0, Culture=neutral, PublicKeyToken=82e46016ecf9f07c, processorArchitecture=MSIL">
5152
<SpecificVersion>False</SpecificVersion>
@@ -58,9 +59,9 @@
5859
<Reference Include="NDesk.Options">
5960
<HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
6061
</Reference>
61-
<Reference Include="RazorEngine, Version=3.6.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\RazorEngine.3.6.0\lib\net45\RazorEngine.dll</HintPath>
62+
<Reference Include="RazorEngine, Version=3.7.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
63+
<HintPath>..\packages\RazorEngine.3.7.0\lib\net45\RazorEngine.dll</HintPath>
64+
<Private>True</Private>
6465
</Reference>
6566
<Reference Include="System" />
6667
<Reference Include="System.ComponentModel.Composition" />
@@ -71,17 +72,17 @@
7172
<HintPath>..\packages\System.IO.Abstractions.2.0.0.116\lib\net40\System.IO.Abstractions.dll</HintPath>
7273
</Reference>
7374
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
75+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
76+
<Private>True</Private>
7677
</Reference>
7778
<Reference Include="System.Xml.Linq" />
7879
<Reference Include="System.Data.DataSetExtensions" />
7980
<Reference Include="Microsoft.CSharp" />
8081
<Reference Include="System.Data" />
8182
<Reference Include="System.Xml" />
82-
<Reference Include="YamlDotNet, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\packages\YamlDotNet.3.5.1\lib\net35\YamlDotNet.dll</HintPath>
83+
<Reference Include="YamlDotNet, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
84+
<HintPath>..\packages\YamlDotNet.3.6.1\lib\net35\YamlDotNet.dll</HintPath>
85+
<Private>True</Private>
8586
</Reference>
8687
</ItemGroup>
8788
<ItemGroup>

‎src/Pretzel.Logic/packages.config

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AjaxMin" version="5.14.5506.26202" targetFramework="net40" />
4-
<package id="CommonMark.NET" version="0.8.5" targetFramework="net45" />
5-
<package id="DotlessClientOnly" version="1.4.1.0" targetFramework="net40" />
3+
<package id="AjaxMin" version="5.14.5506.26202" targetFramework="net4" />
4+
<package id="CommonMark.NET" version="0.9.1" targetFramework="net45" />
5+
<package id="DotlessClientOnly" version="1.5.1" targetFramework="net45" />
66
<package id="DotLiquid" version="1.8.0" targetFramework="net45" />
77
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
8+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
99
<package id="NDesk.Options" version="0.2.1" />
10-
<package id="RazorEngine" version="3.6.0" targetFramework="net45" />
10+
<package id="RazorEngine" version="3.7.0" targetFramework="net45" />
1111
<package id="System.IO.Abstractions" version="2.0.0.116" targetFramework="net45" />
12-
<package id="YamlDotNet" version="3.5.1" targetFramework="net40" />
13-
</packages>
12+
<package id="YamlDotNet" version="3.6.1" targetFramework="net45" />
13+
</packages>

‎src/Pretzel.ScriptCs/Pretzel.ScriptCs.csproj

+60-36
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,67 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Autofac">
34-
<HintPath>..\packages\Autofac.3.3.1\lib\net40\Autofac.dll</HintPath>
33+
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
34+
<HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
35+
<Private>True</Private>
3536
</Reference>
3637
<Reference Include="Autofac.Integration.Mef">
3738
<HintPath>..\packages\Autofac.Mef.3.0.3\lib\net40\Autofac.Integration.Mef.dll</HintPath>
3839
</Reference>
39-
<Reference Include="Common.Logging">
40-
<HintPath>..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
40+
<Reference Include="Common.Logging, Version=3.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
41+
<HintPath>..\packages\Common.Logging.3.2.0\lib\net40\Common.Logging.dll</HintPath>
42+
<Private>True</Private>
4143
</Reference>
42-
<Reference Include="ICSharpCode.NRefactory">
43-
<HintPath>..\packages\ICSharpCode.NRefactory.5.3.0\lib\Net40\ICSharpCode.NRefactory.dll</HintPath>
44+
<Reference Include="Common.Logging.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Common.Logging.Core.3.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
46+
<Private>True</Private>
4447
</Reference>
45-
<Reference Include="ICSharpCode.NRefactory.CSharp">
46-
<HintPath>..\packages\ICSharpCode.NRefactory.5.3.0\lib\Net40\ICSharpCode.NRefactory.CSharp.dll</HintPath>
48+
<Reference Include="ICSharpCode.NRefactory, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
49+
<HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.dll</HintPath>
50+
<Private>True</Private>
4751
</Reference>
48-
<Reference Include="ICSharpCode.NRefactory.Xml">
49-
<HintPath>..\packages\ICSharpCode.NRefactory.5.3.0\lib\Net40\ICSharpCode.NRefactory.Xml.dll</HintPath>
52+
<Reference Include="ICSharpCode.NRefactory.Cecil, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
53+
<HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Cecil.dll</HintPath>
54+
<Private>True</Private>
55+
</Reference>
56+
<Reference Include="ICSharpCode.NRefactory.CSharp, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
57+
<HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.CSharp.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
60+
<Reference Include="ICSharpCode.NRefactory.Xml, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
61+
<HintPath>..\packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.Xml.dll</HintPath>
62+
<Private>True</Private>
5063
</Reference>
5164
<Reference Include="Microsoft.Web.XmlTransform">
5265
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
5366
</Reference>
54-
<Reference Include="Mono.Cecil">
55-
<HintPath>..\packages\Mono.Cecil.0.9.5.2\lib\net40\Mono.Cecil.dll</HintPath>
67+
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
69+
<Private>True</Private>
5670
</Reference>
57-
<Reference Include="Mono.Cecil.Mdb">
58-
<HintPath>..\packages\Mono.Cecil.0.9.5.2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
71+
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
73+
<Private>True</Private>
5974
</Reference>
60-
<Reference Include="Mono.Cecil.Pdb">
61-
<HintPath>..\packages\Mono.Cecil.0.9.5.2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
75+
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
76+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
77+
<Private>True</Private>
6278
</Reference>
63-
<Reference Include="Mono.Cecil.Rocks">
64-
<HintPath>..\packages\Mono.Cecil.0.9.5.2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
79+
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
81+
<Private>True</Private>
6582
</Reference>
66-
<Reference Include="Mono.CSharp">
67-
<HintPath>..\packages\Mono.CSharp.3.6.1\lib\net40\Mono.CSharp.dll</HintPath>
83+
<Reference Include="Mono.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
84+
<HintPath>..\packages\Mono.CSharp.4.0.0.143\lib\4.5\Mono.CSharp.dll</HintPath>
85+
<Private>True</Private>
6886
</Reference>
69-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
87+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
88+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
89+
<Private>True</Private>
7290
</Reference>
73-
<Reference Include="NuGet.Core, Version=2.8.50506.491, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
91+
<Reference Include="NuGet.Core, Version=2.8.60717.93, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\packages\NuGet.Core.2.8.6\lib\net40-Client\NuGet.Core.dll</HintPath>
93+
<Private>True</Private>
7694
</Reference>
7795
<Reference Include="Roslyn.Compilers">
7896
<HintPath>..\packages\Roslyn.Compilers.Common.1.2.20906.2\lib\net45\Roslyn.Compilers.dll</HintPath>
@@ -84,20 +102,25 @@
84102
<SpecificVersion>False</SpecificVersion>
85103
<HintPath>..\packages\ScriptCs.ComponentModel.Composition.0.1.2\lib\net45\ScriptCs.ComponentModel.Composition.dll</HintPath>
86104
</Reference>
87-
<Reference Include="ScriptCs.Contracts">
88-
<HintPath>..\packages\ScriptCs.Contracts.0.14.0\lib\net45\ScriptCs.Contracts.dll</HintPath>
105+
<Reference Include="ScriptCs.Contracts, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
106+
<HintPath>..\packages\ScriptCs.Contracts.0.15.0\lib\net45\ScriptCs.Contracts.dll</HintPath>
107+
<Private>True</Private>
89108
</Reference>
90-
<Reference Include="ScriptCs.Core">
91-
<HintPath>..\packages\ScriptCs.Core.0.14.0\lib\net45\ScriptCs.Core.dll</HintPath>
109+
<Reference Include="ScriptCs.Core, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
110+
<HintPath>..\packages\ScriptCs.Core.0.15.0\lib\net45\ScriptCs.Core.dll</HintPath>
111+
<Private>True</Private>
92112
</Reference>
93-
<Reference Include="ScriptCs.Engine.Mono">
94-
<HintPath>..\packages\ScriptCs.Engine.Mono.0.14.0\lib\net45\ScriptCs.Engine.Mono.dll</HintPath>
113+
<Reference Include="ScriptCs.Engine.Mono, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
114+
<HintPath>..\packages\ScriptCs.Engine.Mono.0.15.0\lib\net45\ScriptCs.Engine.Mono.dll</HintPath>
115+
<Private>True</Private>
95116
</Reference>
96-
<Reference Include="ScriptCs.Engine.Roslyn">
97-
<HintPath>..\packages\ScriptCs.Engine.Roslyn.0.14.0\lib\net45\ScriptCs.Engine.Roslyn.dll</HintPath>
117+
<Reference Include="ScriptCs.Engine.Roslyn, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
118+
<HintPath>..\packages\ScriptCs.Engine.Roslyn.0.15.0\lib\net45\ScriptCs.Engine.Roslyn.dll</HintPath>
119+
<Private>True</Private>
98120
</Reference>
99-
<Reference Include="ScriptCs.Hosting">
100-
<HintPath>..\packages\ScriptCs.Hosting.0.14.0\lib\net45\ScriptCs.Hosting.dll</HintPath>
121+
<Reference Include="ScriptCs.Hosting, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
122+
<HintPath>..\packages\ScriptCs.Hosting.0.15.0\lib\net45\ScriptCs.Hosting.dll</HintPath>
123+
<Private>True</Private>
101124
</Reference>
102125
<Reference Include="System" />
103126
<Reference Include="System.ComponentModel.Composition" />
@@ -113,6 +136,7 @@
113136
<Compile Include="Properties\AssemblyInfo.cs" />
114137
</ItemGroup>
115138
<ItemGroup>
139+
<None Include="app.config" />
116140
<None Include="packages.config" />
117141
</ItemGroup>
118142
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/Pretzel.ScriptCs/app.config

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
12+
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
16+
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="NuGet.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-2.8.60717.93" newVersion="2.8.60717.93" />
24+
</dependentAssembly>
25+
</assemblyBinding>
26+
</runtime>
27+
</configuration>

‎src/Pretzel.ScriptCs/packages.config

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.3.1" targetFramework="net45" />
3+
<package id="Autofac" version="3.5.2" targetFramework="net45" />
44
<package id="Autofac.Mef" version="3.0.3" targetFramework="net45" />
5-
<package id="Common.Logging" version="2.1.2" targetFramework="net45" />
6-
<package id="ICSharpCode.NRefactory" version="5.3.0" targetFramework="net45" />
5+
<package id="Common.Logging" version="3.2.0" targetFramework="net45" />
6+
<package id="Common.Logging.Core" version="3.2.0" targetFramework="net45" />
7+
<package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net45" />
78
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
8-
<package id="Mono.Cecil" version="0.9.5.2" targetFramework="net45" />
9-
<package id="Mono.CSharp" version="3.6.1" targetFramework="net45" />
10-
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
11-
<package id="NuGet.Core" version="2.8.2" targetFramework="net45" />
9+
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
10+
<package id="Mono.CSharp" version="4.0.0.143" targetFramework="net45" />
11+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
12+
<package id="NuGet.Core" version="2.8.6" targetFramework="net45" />
1213
<package id="Roslyn.Compilers.Common" version="1.2.20906.2" targetFramework="net45" />
1314
<package id="Roslyn.Compilers.CSharp" version="1.2.20906.2" targetFramework="net45" />
1415
<package id="ScriptCs.ComponentModel.Composition" version="0.1.2" targetFramework="net45" />
15-
<package id="ScriptCs.Contracts" version="0.14.0" targetFramework="net45" />
16-
<package id="ScriptCs.Core" version="0.14.0" targetFramework="net45" />
17-
<package id="ScriptCs.Engine.Mono" version="0.14.0" targetFramework="net45" />
18-
<package id="ScriptCs.Engine.Roslyn" version="0.14.0" targetFramework="net45" />
19-
<package id="ScriptCs.Hosting" version="0.14.0" targetFramework="net45" />
16+
<package id="ScriptCs.Contracts" version="0.15.0" targetFramework="net45" />
17+
<package id="ScriptCs.Core" version="0.15.0" targetFramework="net45" />
18+
<package id="ScriptCs.Engine.Mono" version="0.15.0" targetFramework="net45" />
19+
<package id="ScriptCs.Engine.Roslyn" version="0.15.0" targetFramework="net45" />
20+
<package id="ScriptCs.Hosting" version="0.15.0" targetFramework="net45" />
2021
</packages>

‎src/Pretzel.Tests/Import/BloggerImportTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public void Error_on_write_is_traced()
118118
Tracing.Logger.SetWriter(writer);
119119
Tracing.Logger.AddCategory(Tracing.Category.Info);
120120
Tracing.Logger.AddCategory(Tracing.Category.Debug);
121+
Tracing.Logger.AddCategory(Tracing.Category.Error);
121122

122123
var fileSubstitute = Substitute.For<FileBase>();
123124
fileSubstitute.ReadAllText(ImportFile).Returns(ImportContent);

0 commit comments

Comments
 (0)