Update to v1.8.0.0

SparkViewEngine · Feb 7, 2015 · e778116 · e778116
1 parent dc64052
commit e778116
Show file tree

Hide file tree

Showing 30 changed files with 70 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,7 +41,6 @@ src/Tools/SparkLanguagePackage/PackageLoadKey.h
 
 #NuGet
 packages/
-*.nupkg
 
 #ncrunch
 *ncrunch*

diff --git a/NuGet/NuGet.exe b/NuGet/NuGet.exe
diff --git a/NuGet/PackAndPush.bat b/NuGet/PackAndPush.bat
@@ -2,10 +2,12 @@ nuget pack Spark\Spark.nuspec
 nuget pack Spark.Web.Mvc2\Spark.Web.Mvc2.nuspec
 nuget pack Spark.Web.Mvc3\Spark.Web.Mvc3.nuspec
 nuget pack Spark.Web.Mvc4\Spark.Web.Mvc4.nuspec
+nuget pack Spark.Web.Mvc5\Spark.Web.Mvc5.nuspec
 
-nuget push Spark.1.7.5.3.nupkg
-nuget push Spark.Web.Mvc2.1.7.5.3.nupkg
-nuget push Spark.Web.Mvc3.1.7.5.3.nupkg
-nuget push Spark.Web.Mvc4.1.7.5.3.nupkg
+nuget push Spark.1.8.0.0.nupkg
+nuget push Spark.Web.Mvc2.1.8.0.0.nupkg
+nuget push Spark.Web.Mvc3.1.8.0.0.nupkg
+nuget push Spark.Web.Mvc4.1.8.0.0.nupkg
+nuget push Spark.Web.Mvc5.1.8.0.0.nupkg
 
 pause
diff --git a/NuGet/Spark.1.7.5.3.nupkg b/NuGet/Spark.1.7.5.3.nupkg
diff --git a/NuGet/Spark.1.8.0.0.nupkg b/NuGet/Spark.1.8.0.0.nupkg
diff --git a/NuGet/Spark.Web.Mvc2.1.7.5.3.nupkg b/NuGet/Spark.Web.Mvc2.1.7.5.3.nupkg
diff --git a/NuGet/Spark.Web.Mvc2.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc2.1.8.0.0.nupkg
diff --git a/NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec b/NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec
@@ -2,15 +2,15 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Spark.Web.Mvc2</id>
-    <version>1.7.5.3</version>
+    <version>1.8.0.0</version>
     <authors>Louis DeJardin &amp; Robert Greyling</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Spark View Engine for ASP.NET MVC.</description>
     <summary>Spark View Engine for ASP.NET MVC.</summary>
     <language>en-US</language>
     <dependencies>
-      <dependency id="Spark" version="1.7.5.3" />
-      <dependency id="WebActivator" version="1.4.1" />
+      <dependency id="Spark" version="1.8.0.0" />
+      <dependency id="WebActivator" version="2.0.6" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll
diff --git a/NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll
diff --git a/NuGet/Spark.Web.Mvc3.1.7.5.3.nupkg b/NuGet/Spark.Web.Mvc3.1.7.5.3.nupkg
diff --git a/NuGet/Spark.Web.Mvc3.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc3.1.8.0.0.nupkg
diff --git a/NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec b/NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec
@@ -2,15 +2,15 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Spark.Web.Mvc3</id>
-    <version>1.7.5.3</version>
+    <version>1.8.0.0</version>
     <authors>Louis DeJardin &amp; Robert Greyling</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Spark View Engine for ASP.NET MVC.</description>
     <summary>Spark View Engine for ASP.NET MVC.</summary>
     <language>en-US</language>
     <dependencies>
-      <dependency id="Spark" version="1.7.5.3" />
-      <dependency id="WebActivator" version="1.4.1" />
+      <dependency id="Spark" version="1.8.0.0" />
+      <dependency id="WebActivator" version="2.0.6" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll
diff --git a/NuGet/Spark.Web.Mvc4.1.7.5.3.nupkg b/NuGet/Spark.Web.Mvc4.1.7.5.3.nupkg
diff --git a/NuGet/Spark.Web.Mvc4.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc4.1.8.0.0.nupkg
diff --git a/NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec b/NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec
@@ -2,15 +2,15 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Spark.Web.Mvc4</id>
-    <version>1.7.5.3</version>
+    <version>1.8.0.0</version>
     <authors>Louis DeJardin &amp; Robert Greyling</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Spark View Engine for ASP.NET MVC 4.</description>
     <summary>Spark View Engine for ASP.NET MVC 4.</summary>
     <language>en-US</language>
     <dependencies>
-      <dependency id="Spark" version="1.7.5.3" />
-      <dependency id="WebActivator" version="1.4.1" />
+      <dependency id="Spark" version="1.8.0.0" />
+      <dependency id="WebActivator" version="2.0.6" />
     </dependencies>
   </metadata>
 </package>
diff --git a/NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll
diff --git a/NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll
diff --git a/NuGet/Spark.Web.Mvc5.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc5.1.8.0.0.nupkg
diff --git a/NuGet/Spark.Web.Mvc5/Content/App_Start/SparkWebMvc.cs.pp b/NuGet/Spark.Web.Mvc5/Content/App_Start/SparkWebMvc.cs.pp
@@ -0,0 +1,18 @@
+using System.Web.Mvc;
+using Spark;
+using Spark.Web.Mvc;
+
+[assembly: WebActivator.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.SparkWebMvc), "Start")]
+
+namespace $rootnamespace$.App_Start {
+    public static class SparkWebMvc {
+        public static void Start() {
+            var settings = new SparkSettings();
+            settings.SetAutomaticEncoding(true); 
+
+            // Note: you can change the list of namespace and assembly
+            // references in Views\Shared\_global.spark
+            SparkEngineStarter.RegisterViewEngine(settings);
+        }
+    }
+}
diff --git a/NuGet/Spark.Web.Mvc5/Content/Views/Shared/_global.spark b/NuGet/Spark.Web.Mvc5/Content/Views/Shared/_global.spark
@@ -0,0 +1,9 @@
+<use namespace="System"/>
+<use namespace="System.Collections.Generic"/>
+<use namespace="System.Linq"/>
+<use namespace="System.Web.Mvc"/>
+<use namespace="System.Web.Routing"/>
+<use namespace="System.Web.Mvc.Html"/>
+
+<use assembly="Spark.Web.Mvc"/>
+<use assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
diff --git a/NuGet/Spark.Web.Mvc5/Spark.Web.Mvc5.nuspec b/NuGet/Spark.Web.Mvc5/Spark.Web.Mvc5.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>Spark.Web.Mvc5</id>
+    <version>1.8.0.0</version>
+    <authors>Louis DeJardin &amp; Robert Greyling</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Spark View Engine for ASP.NET MVC 5.</description>
+    <summary>Spark View Engine for ASP.NET MVC 5.</summary>
+    <language>en-US</language>
+    <dependencies>
+      <dependency id="Spark" version="1.8.0.0" />
+      <dependency id="WebActivator" version="2.0.6" />
+    </dependencies>
+  </metadata>
+</package>
diff --git a/NuGet/Spark.Web.Mvc5/lib/NET45/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc5/lib/NET45/Spark.Web.Mvc.dll
diff --git a/NuGet/Spark/Spark.nuspec b/NuGet/Spark/Spark.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Spark</id>
-    <version>1.7.5.3</version>
+    <version>1.8.0.0</version>
     <authors>Louis DeJardin &amp; Robert Greyling</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Spark View Engine Core.</description>

diff --git a/NuGet/Spark/lib/NET35/Spark.dll b/NuGet/Spark/lib/NET35/Spark.dll
diff --git a/NuGet/Spark/lib/NET40/Spark.dll b/NuGet/Spark/lib/NET40/Spark.dll
diff --git a/spark.build b/spark.build
@@ -12,9 +12,9 @@
   <property name="results.dir" value="${build.base}\results" />
   <property name="samples.dir" value="${solution.dir}\samples"/>
   <property name="version.major" value="1"/>
-  <property name="version.minor" value="7"/>
-  <property name="version.build" value="5"/>
-  <property name="version.revision" value="3"/>
+  <property name="version.minor" value="8"/>
+  <property name="version.build" value="0"/>
+  <property name="version.revision" value="0"/>
   <property name="project.version" value="${version.major}.${version.minor}" dynamic="true" />
   <property name="project.fullversion" value="${version.major}.${version.minor}.${version.build}.${version.revision}" dynamic="true" />
   <property name="nant.settings.currentframework" value="net-4.0" />
@@ -82,9 +82,9 @@
     <echo message="Build Directory is ${build.dir}" />
 
     <exec program="${msbuild.dir}\msbuild.exe"
-				  commandline="&quot;${solution.file}&quot; /t:Clean &quot;/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}&quot; /v:q" workingdir="." />
+				  commandline="&quot;${solution.file}&quot; /p:VisualStudioVersion=12.0 /t:Clean &quot;/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}&quot; /v:q" workingdir="." />
     <exec program="${msbuild.dir}\msbuild.exe"
-				  commandline="&quot;${solution.file}&quot; /t:Rebuild &quot;/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}&quot; /v:q" workingdir="." />
+				  commandline="&quot;${solution.file}&quot; /p:VisualStudioVersion=12.0 /t:Rebuild &quot;/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}&quot; /v:q" workingdir="." />
 
     <if test="${property::exists('tools.solution.file')}">
       <property name="wix-parameters" value="WixTargetsPath=..\..\..\bin\msbuild\Microsoft\WiX\v3.0\wix.targets;WixTasksPath=WixTasks.dll;WixToolPath=..\..\..\bin\wix"/>

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -5,19 +5,19 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.32559
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("1.7")]
-[assembly: AssemblyFileVersionAttribute("1.7.5.3")]
-[assembly: AssemblyCopyrightAttribute("Copyright (c) Louis DeJardin 2008-2013")]
+[assembly: AssemblyVersionAttribute("1.8")]
+[assembly: AssemblyFileVersionAttribute("1.8.0.0")]
+[assembly: AssemblyCopyrightAttribute("Copyright (c) Louis DeJardin 2008-2015")]
 [assembly: AssemblyProductAttribute("Spark")]
 [assembly: AssemblyCompanyAttribute("Louis DeJardin")]
 [assembly: AssemblyConfigurationAttribute("release")]
-[assembly: AssemblyInformationalVersionAttribute("1.7.5.3")]
+[assembly: AssemblyInformationalVersionAttribute("1.8.0.0")]
 
diff --git a/src/CommonVersionInfo.h b/src/CommonVersionInfo.h
@@ -1 +1 @@
-// this is an auto-generated file#define VERSIONINFO_VERSIONSTRING "1.7.5.3"#define VERSIONINFO_MAJOR 1#define VERSIONINFO_MINOR 7#define VERSIONINFO_BUILD 5#define VERSIONINFO_REVISION 3#define VERSIONINFO_COPYRIGHT "Copyright (c) Louis DeJardin 2008-2013"#define VERSIONINFO_COMPANY "Louis DeJardin"#define VERSIONINFO_PRODUCT "Spark"
+// this is an auto-generated file#define VERSIONINFO_VERSIONSTRING "1.8.0.0"#define VERSIONINFO_MAJOR 1#define VERSIONINFO_MINOR 8#define VERSIONINFO_BUILD 0#define VERSIONINFO_REVISION 0#define VERSIONINFO_COPYRIGHT "Copyright (c) Louis DeJardin 2008-2015"#define VERSIONINFO_COMPANY "Louis DeJardin"#define VERSIONINFO_PRODUCT "Spark"