Skip to content

Commit 736e4c3

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/0.9.3' into production
2 parents f4e7c5f + 64e6d0c commit 736e4c3

8 files changed

Lines changed: 66 additions & 195 deletions

File tree

‎Deployment/CSF.Zpt.Documentation/HelloWorld/HelloWorld.csproj‎

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -59,54 +59,9 @@
5959
<Reference Include="System.Web.WebPages.Razor">
6060
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
6161
</Reference>
62-
<Reference Include="CSF.Zpt.Abstractions">
63-
<HintPath>..\..\..\packages\CSF.Zpt.Abstractions.0.8.1-beta\lib\net45\CSF.Zpt.Abstractions.dll</HintPath>
64-
</Reference>
65-
<Reference Include="CSF.Utils">
66-
<HintPath>..\..\..\packages\CSF.Utils.6.0.0\lib\net45\CSF.Utils.dll</HintPath>
67-
</Reference>
68-
<Reference Include="CSF.Reflection">
69-
<HintPath>..\..\..\packages\CSF.Reflection.1.0.1\lib\net45\CSF.Reflection.dll</HintPath>
70-
</Reference>
71-
<Reference Include="CSF.Configuration">
72-
<HintPath>..\..\..\packages\CSF.Configuration.1.1.0\lib\net45\CSF.Configuration.dll</HintPath>
73-
</Reference>
74-
<Reference Include="CSF.Caches">
75-
<HintPath>..\..\..\packages\CSF.Caches.1.0.0\lib\net45\CSF.Caches.dll</HintPath>
76-
</Reference>
77-
<Reference Include="CSF.Zpt">
78-
<HintPath>..\..\..\packages\CSF.Zpt.0.8.1-beta\lib\net45\CSF.Zpt.dll</HintPath>
79-
</Reference>
80-
<Reference Include="HtmlAgilityPack">
81-
<HintPath>..\..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
82-
</Reference>
83-
<Reference Include="CSF.Zpt.DocumentProviders.HtmlHAP">
84-
<HintPath>..\..\..\packages\CSF.Zpt.DocumentProviders.HtmlHAP.0.8.1-beta\lib\net45\CSF.Zpt.DocumentProviders.HtmlHAP.dll</HintPath>
85-
</Reference>
86-
<Reference Include="CSF.Zpt.DocumentProviders.XmlLinq">
87-
<HintPath>..\..\..\packages\CSF.Zpt.DocumentProviders.XmlLinq.0.8.1-beta\lib\net45\CSF.Zpt.DocumentProviders.XmlLinq.dll</HintPath>
88-
</Reference>
89-
<Reference Include="CSF.Zpt.ExpressionEvaluators.NotExpressions">
90-
<HintPath>..\..\..\packages\CSF.Zpt.ExpressionEvaluators.NotExpressions.0.8.1-beta\lib\net45\CSF.Zpt.ExpressionEvaluators.NotExpressions.dll</HintPath>
91-
</Reference>
92-
<Reference Include="CSF.Zpt.ExpressionEvaluators.StringExpressions">
93-
<HintPath>..\..\..\packages\CSF.Zpt.ExpressionEvaluators.StringExpressions.0.8.1-beta\lib\net45\CSF.Zpt.ExpressionEvaluators.StringExpressions.dll</HintPath>
94-
</Reference>
95-
<Reference Include="CSF.Zpt.ExpressionEvaluators.PathExpressions">
96-
<HintPath>..\..\..\packages\CSF.Zpt.ExpressionEvaluators.PathExpressions.0.8.1-beta\lib\net45\CSF.Zpt.ExpressionEvaluators.PathExpressions.dll</HintPath>
97-
</Reference>
98-
<Reference Include="CSF.Zpt.ExpressionEvaluators.CSharpFramework">
99-
<HintPath>..\..\..\packages\CSF.Zpt.ExpressionEvaluators.CSharpExpressions.0.8.1-beta\lib\net45\CSF.Zpt.ExpressionEvaluators.CSharpFramework.dll</HintPath>
100-
</Reference>
101-
<Reference Include="CSF.Zpt.ExpressionEvaluators.CSharpExpressions">
102-
<HintPath>..\..\..\packages\CSF.Zpt.ExpressionEvaluators.CSharpExpressions.0.8.1-beta\lib\net45\CSF.Zpt.ExpressionEvaluators.CSharpExpressions.dll</HintPath>
103-
</Reference>
10462
<Reference Include="System.Dynamic" />
10563
<Reference Include="System.Web.Mvc">
106-
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
107-
</Reference>
108-
<Reference Include="CSF.Zpt.MVC5">
109-
<HintPath>..\..\..\packages\CSF.Zpt.MVC5.0.8.1-beta\lib\net45\CSF.Zpt.MVC5.dll</HintPath>
64+
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
11065
</Reference>
11166
</ItemGroup>
11267
<ItemGroup>
@@ -140,4 +95,46 @@
14095
<ItemGroup>
14196
<None Include="Views\Home\Index.pt" />
14297
</ItemGroup>
98+
<ItemGroup>
99+
<ProjectReference Include="..\..\..\CSF.Zpt\CSF.Zpt.csproj">
100+
<Project>{16E957BB-347C-4EE1-815F-19AC296FB9E0}</Project>
101+
<Name>CSF.Zpt</Name>
102+
</ProjectReference>
103+
<ProjectReference Include="..\..\..\CSF.Zpt.Abstractions\CSF.Zpt.Abstractions.csproj">
104+
<Project>{8207CD9B-F1C1-4D75-B250-ACDFFBDCB071}</Project>
105+
<Name>CSF.Zpt.Abstractions</Name>
106+
</ProjectReference>
107+
<ProjectReference Include="..\..\..\CSF.Zpt.MVC5\CSF.Zpt.MVC5.csproj">
108+
<Project>{9B4DF12E-6E04-4C25-AD16-58434C18DE8A}</Project>
109+
<Name>CSF.Zpt.MVC5</Name>
110+
</ProjectReference>
111+
<ProjectReference Include="..\..\..\DocumentProviders\CSF.Zpt.DocumentProviders.HtmlHAP\CSF.Zpt.DocumentProviders.HtmlHAP.csproj">
112+
<Project>{BFD834D4-5724-4425-BCB3-6DEE6B03F743}</Project>
113+
<Name>CSF.Zpt.DocumentProviders.HtmlHAP</Name>
114+
</ProjectReference>
115+
<ProjectReference Include="..\..\..\DocumentProviders\CSF.Zpt.DocumentProviders.XmlLinq\CSF.Zpt.DocumentProviders.XmlLinq.csproj">
116+
<Project>{842160E4-BDE5-4FA0-ADE5-07554090AA27}</Project>
117+
<Name>CSF.Zpt.DocumentProviders.XmlLinq</Name>
118+
</ProjectReference>
119+
<ProjectReference Include="..\..\..\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.CSharpExpressions\CSF.Zpt.ExpressionEvaluators.CSharpExpressions.csproj">
120+
<Project>{AA29F7A3-A259-408A-B2FC-E2EFD78BCDFC}</Project>
121+
<Name>CSF.Zpt.ExpressionEvaluators.CSharpExpressions</Name>
122+
</ProjectReference>
123+
<ProjectReference Include="..\..\..\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.CSharpFramework\CSF.Zpt.ExpressionEvaluators.CSharpFramework.csproj">
124+
<Project>{3D5A705B-A414-4ACA-AC01-C053047F424E}</Project>
125+
<Name>CSF.Zpt.ExpressionEvaluators.CSharpFramework</Name>
126+
</ProjectReference>
127+
<ProjectReference Include="..\..\..\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.NotExpressions\CSF.Zpt.ExpressionEvaluators.NotExpressions.csproj">
128+
<Project>{7B3748AD-DF11-4A80-9258-EA043CD99D7C}</Project>
129+
<Name>CSF.Zpt.ExpressionEvaluators.NotExpressions</Name>
130+
</ProjectReference>
131+
<ProjectReference Include="..\..\..\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.PathExpressions\CSF.Zpt.ExpressionEvaluators.PathExpressions.csproj">
132+
<Project>{B6A27567-61F7-43F7-B201-FFC7A449BDBB}</Project>
133+
<Name>CSF.Zpt.ExpressionEvaluators.PathExpressions</Name>
134+
</ProjectReference>
135+
<ProjectReference Include="..\..\..\ExpressionEvaluators\CSF.Zpt.ExpressionEvaluators.StringExpressions\CSF.Zpt.ExpressionEvaluators.StringExpressions.csproj">
136+
<Project>{63F5FF1D-DA36-4BB4-AA99-24AA78844109}</Project>
137+
<Name>CSF.Zpt.ExpressionEvaluators.StringExpressions</Name>
138+
</ProjectReference>
139+
</ItemGroup>
143140
</Project>

‎Deployment/CSF.Zpt.Documentation/HelloWorld/Web.config‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,20 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
2121
</sectionGroup>
2222
<sectionGroup name="CSF">
2323
<sectionGroup name="Zpt">
24-
<section name="PluginConfigurationSection"
25-
type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt" />
24+
<section name="PluginConfigurationSection" type="CSF.Zpt.PluginConfigurationSection, CSF.Zpt" />
2625
</sectionGroup>
2726
</sectionGroup>
2827
</configSections>
2928
<CSF>
3029
<Zpt>
31-
<PluginConfigurationSection DefaultHtmlDocumentProvider="CSF.Zpt.DocumentProviders.HtmlZptDocumentProvider"
32-
DefaultXmlDocumentProvider="CSF.Zpt.DocumentProviders.XmlLinqZptDocumentProvider"
33-
DefaultExpressionEvaluator="CSF.Zpt.ExpressionEvaluators.PathExpressions.PathExpressionEvaluator">
30+
<PluginConfigurationSection DefaultHtmlDocumentProvider="CSF.Zpt.DocumentProviders.HtmlZptDocumentProvider" DefaultXmlDocumentProvider="CSF.Zpt.DocumentProviders.XmlLinqZptDocumentProvider" DefaultExpressionEvaluator="CSF.Zpt.ExpressionEvaluators.PathExpressions.PathExpressionEvaluator">
3431
<PluginAssemblies>
35-
<Assembly Path="CSF.Zpt.DocumentProviders.HtmlHAP" />
36-
<Assembly Path="CSF.Zpt.DocumentProviders.XmlLinq" />
37-
<Assembly Path="CSF.Zpt.ExpressionEvaluators.CSharpExpressions" />
38-
<Assembly Path="CSF.Zpt.ExpressionEvaluators.PathExpressions" />
39-
<Assembly Path="CSF.Zpt.ExpressionEvaluators.StringExpressions" />
40-
<Assembly Path="CSF.Zpt.ExpressionEvaluators.NotExpressions" />
32+
<Assembly Name="CSF.Zpt.DocumentProviders.HtmlHAP" />
33+
<Assembly Name="CSF.Zpt.DocumentProviders.XmlLinq" />
34+
<Assembly Name="CSF.Zpt.ExpressionEvaluators.CSharpExpressions" />
35+
<Assembly Name="CSF.Zpt.ExpressionEvaluators.PathExpressions" />
36+
<Assembly Name="CSF.Zpt.ExpressionEvaluators.StringExpressions" />
37+
<Assembly Name="CSF.Zpt.ExpressionEvaluators.NotExpressions" />
4138
</PluginAssemblies>
4239
</PluginConfigurationSection>
4340
</Zpt>
@@ -118,10 +115,6 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
118115
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
119116
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
120117
</dependentAssembly>
121-
<dependentAssembly>
122-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
123-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
124-
</dependentAssembly>
125118
</assemblyBinding>
126119
</runtime>
127120
</configuration>

‎Deployment/CSF.Zpt.Documentation/HelloWorld/packages.config‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CSF.Caches" version="1.0.0" targetFramework="net45" />
4-
<package id="CSF.Configuration" version="1.1.0" targetFramework="net45" />
5-
<package id="CSF.Reflection" version="1.0.1" targetFramework="net45" />
6-
<package id="CSF.Utils" version="6.0.0" targetFramework="net45" />
7-
<package id="CSF.Zpt" version="0.8.1-beta" targetFramework="net45" />
8-
<package id="CSF.Zpt.Abstractions" version="0.8.1-beta" targetFramework="net45" />
9-
<package id="CSF.Zpt.DocumentProviders.HtmlHAP" version="0.8.1-beta" targetFramework="net45" />
10-
<package id="CSF.Zpt.DocumentProviders.XmlLinq" version="0.8.1-beta" targetFramework="net45" />
11-
<package id="CSF.Zpt.ExpressionEvaluators.CSharpExpressions" version="0.8.1-beta" targetFramework="net45" />
12-
<package id="CSF.Zpt.ExpressionEvaluators.NotExpressions" version="0.8.1-beta" targetFramework="net45" />
13-
<package id="CSF.Zpt.ExpressionEvaluators.PathExpressions" version="0.8.1-beta" targetFramework="net45" />
14-
<package id="CSF.Zpt.ExpressionEvaluators.StringExpressions" version="0.8.1-beta" targetFramework="net45" />
15-
<package id="CSF.Zpt.MVC5" version="0.8.1-beta" targetFramework="net45" />
16-
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
17-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net45" />
184
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
195
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
206
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
21-
<package id="Zpt-Sharp-API" version="0.8.1-beta" targetFramework="net45" />
22-
<package id="Zpt-Sharp-MVC5" version="0.8.1-beta" targetFramework="net45" />
237
</packages>

‎Deployment/Utils/push-all-packages‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ SOLUTION_ROOT="${SCRIPT_DIR}/../.."
55
OUTPUT_ROOT="${SOLUTION_ROOT}/Deployment/Output"
66
NUGET_PATH="${OUTPUT_ROOT}/NuGet"
77

8-
NUGET_DESTINATION="https://www.nuget.org"
9-
108
for pkg in $(find "$NUGET_PATH" -type f -name "*.nupkg")
119
do
12-
nuget push "$pkg" -src "$NUGET_DESTINATION"
13-
done
10+
nuget push "$pkg"
11+
done

‎ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpExpressions/Host/ExpressionHostBuilder.cs‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎ExpressionEvaluators/CSF.Zpt.ExpressionEvaluators.CSharpExpressions/Host/ExpressionHostCompiler.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public class ExpressionHostCompiler : IExpressionHostCompiler
1818
private static readonly string
1919
SYSTEM_CORE_ASSEMBLY_NAME = typeof(Enumerable).Assembly.FullName,
2020
CSHARP_EXPRESSION_FRAMEWORK_ASSEMBLY_NAME = typeof(IExpressionHost).Assembly.FullName,
21-
CODEDOM_ASSEMBLY_NAME = typeof(CSharpCodeProvider).Assembly.FullName;
21+
CODEDOM_ASSEMBLY_NAME = typeof(Microsoft.CSharp.RuntimeBinder.Binder).Assembly.FullName;
2222

2323
/// <summary>
2424
/// A collection of mandatory assemblies which must always be referenced.
2525
/// </summary>
26-
private static readonly string[] MandatoryAssemblyReferences = new [] {
26+
private static readonly string[] MandatoryAssemblyReferences = {
2727
SYSTEM_CORE_ASSEMBLY_NAME,
2828
CSHARP_EXPRESSION_FRAMEWORK_ASSEMBLY_NAME,
29-
CODEDOM_ASSEMBLY_NAME,
29+
CODEDOM_ASSEMBLY_NAME
3030
};
3131

3232
#endregion
@@ -86,8 +86,8 @@ private IExpressionHostCreator GetExpressionHostCreator(Assembly assembly, Expre
8686
/// <param name="model">Model.</param>
8787
private Assembly CompileHostAssembly(ExpressionModel model)
8888
{
89-
CSharpCodeProvider provider = new CSharpCodeProvider();
90-
CompilerParameters parameters = new CompilerParameters();
89+
var provider = new CSharpCodeProvider();
90+
var parameters = new CompilerParameters();
9191

9292
var references = GetAssemblyReferences(model);
9393
AddReferencedAssemblies(references, parameters);
@@ -186,8 +186,7 @@ private void CheckNoCompilerErrors(CompilerResults result, ExpressionModel model
186186
#region constructor
187187

188188
/// <summary>
189-
/// Initializes a new instance of the
190-
/// <see cref="CSF.Zpt.ExpressionEvaluators.CSharpExpressions.Host.ExpressionHostCompiler"/> class.
189+
/// Initializes a new instance of the <see cref="ExpressionHostCompiler"/> class.
191190
/// </summary>
192191
/// <param name="assemblyFinder">Assembly finder.</param>
193192
public ExpressionHostCompiler(IAddOnAssemblyFinder assemblyFinder = null)

‎Tests/Test.CSF.Zpt/BatchRendering/TestBatchRenderer.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ public void GetContextConfigurator_adds_documents_directory_when_path_is_provide
113113
public void GetContextConfigurator_does_not_add_documents_directory_when_path_is_null()
114114
{
115115
// Arrange
116-
var job = Mock.Of<IRenderingJob>(x => x.InputRootDirectory == (DirectoryInfo) null);
116+
var job = new Mock<IRenderingJob>().Object;
117+
Mock.Get(job)
118+
.SetupGet(x => x.InputRootDirectory)
119+
.Returns((DirectoryInfo) null);
117120

118121
var model = new Mock<IModelValueStore>();
119122
model.Setup(x => x.AddGlobal(It.IsAny<string>(), It.IsAny<object>()));

‎version.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
semantic_version = 0.9.2
1+
semantic_version = 0.9.3
22
build_number = 1
3-
informational_version = rc3
3+
informational_version = rc4

0 commit comments

Comments
 (0)