diff --git a/.gitignore b/.gitignore
index f5514407..3882ca11 100644
--- 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
index 8f613402..8dd7e45a 100644
Binary files a/NuGet/NuGet.exe and b/NuGet/NuGet.exe differ
diff --git a/NuGet/PackAndPush.bat b/NuGet/PackAndPush.bat
index f96567f1..248b75fc 100644
--- 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
\ No newline at end of file
diff --git a/NuGet/Spark.1.7.5.3.nupkg b/NuGet/Spark.1.7.5.3.nupkg
deleted file mode 100644
index 345672a3..00000000
Binary files a/NuGet/Spark.1.7.5.3.nupkg and /dev/null differ
diff --git a/NuGet/Spark.1.8.0.0.nupkg b/NuGet/Spark.1.8.0.0.nupkg
new file mode 100644
index 00000000..a4b63ad2
Binary files /dev/null and b/NuGet/Spark.1.8.0.0.nupkg differ
diff --git a/NuGet/Spark.Web.Mvc2.1.7.5.3.nupkg b/NuGet/Spark.Web.Mvc2.1.7.5.3.nupkg
deleted file mode 100644
index 178eaf95..00000000
Binary files a/NuGet/Spark.Web.Mvc2.1.7.5.3.nupkg and /dev/null differ
diff --git a/NuGet/Spark.Web.Mvc2.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc2.1.8.0.0.nupkg
new file mode 100644
index 00000000..7afcf446
Binary files /dev/null and b/NuGet/Spark.Web.Mvc2.1.8.0.0.nupkg differ
diff --git a/NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec b/NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec
index ba6ed412..61a6146f 100644
--- a/NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec
+++ b/NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec
@@ -2,15 +2,15 @@
Spark.Web.Mvc2
- 1.7.5.3
+ 1.8.0.0
Louis DeJardin & Robert Greyling
false
Spark View Engine for ASP.NET MVC.
Spark View Engine for ASP.NET MVC.
en-US
-
-
+
+
\ No newline at end of file
diff --git a/NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll
index 76b1cee4..619f08d6 100644
Binary files a/NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll and b/NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll differ
diff --git a/NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll
index 4e93c999..5df8f953 100644
Binary files a/NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll and b/NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll differ
diff --git a/NuGet/Spark.Web.Mvc3.1.7.5.3.nupkg b/NuGet/Spark.Web.Mvc3.1.7.5.3.nupkg
deleted file mode 100644
index c80babe6..00000000
Binary files a/NuGet/Spark.Web.Mvc3.1.7.5.3.nupkg and /dev/null differ
diff --git a/NuGet/Spark.Web.Mvc3.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc3.1.8.0.0.nupkg
new file mode 100644
index 00000000..ab75ef42
Binary files /dev/null and b/NuGet/Spark.Web.Mvc3.1.8.0.0.nupkg differ
diff --git a/NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec b/NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec
index 9a43ae48..27a0a779 100644
--- a/NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec
+++ b/NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec
@@ -2,15 +2,15 @@
Spark.Web.Mvc3
- 1.7.5.3
+ 1.8.0.0
Louis DeJardin & Robert Greyling
false
Spark View Engine for ASP.NET MVC.
Spark View Engine for ASP.NET MVC.
en-US
-
-
+
+
\ No newline at end of file
diff --git a/NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll
index e3dc3676..6286373d 100644
Binary files a/NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll and b/NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll differ
diff --git a/NuGet/Spark.Web.Mvc4.1.7.5.3.nupkg b/NuGet/Spark.Web.Mvc4.1.7.5.3.nupkg
deleted file mode 100644
index d58b90b4..00000000
Binary files a/NuGet/Spark.Web.Mvc4.1.7.5.3.nupkg and /dev/null differ
diff --git a/NuGet/Spark.Web.Mvc4.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc4.1.8.0.0.nupkg
new file mode 100644
index 00000000..8ecaadc8
Binary files /dev/null and b/NuGet/Spark.Web.Mvc4.1.8.0.0.nupkg differ
diff --git a/NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec b/NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec
index 0e960575..3a718ae7 100644
--- a/NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec
+++ b/NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec
@@ -2,15 +2,15 @@
Spark.Web.Mvc4
- 1.7.5.3
+ 1.8.0.0
Louis DeJardin & Robert Greyling
false
Spark View Engine for ASP.NET MVC 4.
Spark View Engine for ASP.NET MVC 4.
en-US
-
-
+
+
\ No newline at end of file
diff --git a/NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll
index c0688eae..b394b846 100644
Binary files a/NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll and b/NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll differ
diff --git a/NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll
index a0b07301..48deaa5e 100644
Binary files a/NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll and b/NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll differ
diff --git a/NuGet/Spark.Web.Mvc5.1.8.0.0.nupkg b/NuGet/Spark.Web.Mvc5.1.8.0.0.nupkg
new file mode 100644
index 00000000..ef31afc6
Binary files /dev/null and b/NuGet/Spark.Web.Mvc5.1.8.0.0.nupkg differ
diff --git a/NuGet/Spark.Web.Mvc5/Content/App_Start/SparkWebMvc.cs.pp b/NuGet/Spark.Web.Mvc5/Content/App_Start/SparkWebMvc.cs.pp
new file mode 100644
index 00000000..edecd063
--- /dev/null
+++ 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
new file mode 100644
index 00000000..4001aa7c
--- /dev/null
+++ b/NuGet/Spark.Web.Mvc5/Content/Views/Shared/_global.spark
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/NuGet/Spark.Web.Mvc5/Spark.Web.Mvc5.nuspec b/NuGet/Spark.Web.Mvc5/Spark.Web.Mvc5.nuspec
new file mode 100644
index 00000000..3dc707f7
--- /dev/null
+++ b/NuGet/Spark.Web.Mvc5/Spark.Web.Mvc5.nuspec
@@ -0,0 +1,16 @@
+
+
+
+ Spark.Web.Mvc5
+ 1.8.0.0
+ Louis DeJardin & Robert Greyling
+ false
+ Spark View Engine for ASP.NET MVC 5.
+ Spark View Engine for ASP.NET MVC 5.
+ en-US
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NuGet/Spark.Web.Mvc5/lib/NET45/Spark.Web.Mvc.dll b/NuGet/Spark.Web.Mvc5/lib/NET45/Spark.Web.Mvc.dll
new file mode 100644
index 00000000..f6947d93
Binary files /dev/null and b/NuGet/Spark.Web.Mvc5/lib/NET45/Spark.Web.Mvc.dll differ
diff --git a/NuGet/Spark/Spark.nuspec b/NuGet/Spark/Spark.nuspec
index 17469bc5..88f68491 100644
--- a/NuGet/Spark/Spark.nuspec
+++ b/NuGet/Spark/Spark.nuspec
@@ -2,7 +2,7 @@
Spark
- 1.7.5.3
+ 1.8.0.0
Louis DeJardin & Robert Greyling
false
Spark View Engine Core.
diff --git a/NuGet/Spark/lib/NET35/Spark.dll b/NuGet/Spark/lib/NET35/Spark.dll
index 9ef6d372..8c582528 100644
Binary files a/NuGet/Spark/lib/NET35/Spark.dll and b/NuGet/Spark/lib/NET35/Spark.dll differ
diff --git a/NuGet/Spark/lib/NET40/Spark.dll b/NuGet/Spark/lib/NET40/Spark.dll
index 8dd79688..64308ebd 100644
Binary files a/NuGet/Spark/lib/NET40/Spark.dll and b/NuGet/Spark/lib/NET40/Spark.dll differ
diff --git a/spark.build b/spark.build
index 3ca99339..aa39ac88 100644
--- a/spark.build
+++ b/spark.build
@@ -12,9 +12,9 @@
-
-
-
+
+
+
@@ -82,9 +82,9 @@
+ commandline=""${solution.file}" /p:VisualStudioVersion=12.0 /t:Clean "/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}" /v:q" workingdir="." />
+ commandline=""${solution.file}" /p:VisualStudioVersion=12.0 /t:Rebuild "/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}" /v:q" workingdir="." />
diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
index e48458f0..cab651d3 100644
--- a/src/CommonAssemblyInfo.cs
+++ b/src/CommonAssemblyInfo.cs
@@ -5,7 +5,7 @@
//------------------------------------------------------------------------------
//
// 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.
@@ -13,11 +13,11 @@
//------------------------------------------------------------------------------
[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
index bce03176..fd407af3 100644
--- 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"
\ No newline at end of file
+// 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"
\ No newline at end of file