Skip to content

Commit e778116

Browse files
RobertTheGreyRobertTheGrey
committedFeb 7, 2015
Update to v1.8.0.0
·
v1.8.2.1v1.8.0.0
1 parent dc64052 commit e778116

30 files changed

+70
-26
lines changed
 

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ src/Tools/SparkLanguagePackage/PackageLoadKey.h
4141

4242
#NuGet
4343
packages/
44-
*.nupkg
4544

4645
#ncrunch
4746
*ncrunch*

‎NuGet/NuGet.exe

51.5 KB
Binary file not shown.

‎NuGet/PackAndPush.bat

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ nuget pack Spark\Spark.nuspec
22
nuget pack Spark.Web.Mvc2\Spark.Web.Mvc2.nuspec
33
nuget pack Spark.Web.Mvc3\Spark.Web.Mvc3.nuspec
44
nuget pack Spark.Web.Mvc4\Spark.Web.Mvc4.nuspec
5+
nuget pack Spark.Web.Mvc5\Spark.Web.Mvc5.nuspec
56

6-
nuget push Spark.1.7.5.3.nupkg
7-
nuget push Spark.Web.Mvc2.1.7.5.3.nupkg
8-
nuget push Spark.Web.Mvc3.1.7.5.3.nupkg
9-
nuget push Spark.Web.Mvc4.1.7.5.3.nupkg
7+
nuget push Spark.1.8.0.0.nupkg
8+
nuget push Spark.Web.Mvc2.1.8.0.0.nupkg
9+
nuget push Spark.Web.Mvc3.1.8.0.0.nupkg
10+
nuget push Spark.Web.Mvc4.1.8.0.0.nupkg
11+
nuget push Spark.Web.Mvc5.1.8.0.0.nupkg
1012

1113
pause

‎NuGet/Spark.1.7.5.3.nupkg

-349 KB
Binary file not shown.

‎NuGet/Spark.1.8.0.0.nupkg

349 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc2.1.7.5.3.nupkg

-45.9 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc2.1.8.0.0.nupkg

46 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc2/Spark.Web.Mvc2.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Spark.Web.Mvc2</id>
5-
<version>1.7.5.3</version>
5+
<version>1.8.0.0</version>
66
<authors>Louis DeJardin &amp; Robert Greyling</authors>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
88
<description>Spark View Engine for ASP.NET MVC.</description>
99
<summary>Spark View Engine for ASP.NET MVC.</summary>
1010
<language>en-US</language>
1111
<dependencies>
12-
<dependency id="Spark" version="1.7.5.3" />
13-
<dependency id="WebActivator" version="1.4.1" />
12+
<dependency id="Spark" version="1.8.0.0" />
13+
<dependency id="WebActivator" version="2.0.6" />
1414
</dependencies>
1515
</metadata>
1616
</package>

‎NuGet/Spark.Web.Mvc2/lib/NET35/Spark.Web.Mvc.dll

0 Bytes
Binary file not shown.

‎NuGet/Spark.Web.Mvc2/lib/NET40/Spark.Web.Mvc.dll

0 Bytes
Binary file not shown.

‎NuGet/Spark.Web.Mvc3.1.7.5.3.nupkg

-25.4 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc3.1.8.0.0.nupkg

25.6 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc3/Spark.Web.Mvc3.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Spark.Web.Mvc3</id>
5-
<version>1.7.5.3</version>
5+
<version>1.8.0.0</version>
66
<authors>Louis DeJardin &amp; Robert Greyling</authors>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
88
<description>Spark View Engine for ASP.NET MVC.</description>
99
<summary>Spark View Engine for ASP.NET MVC.</summary>
1010
<language>en-US</language>
1111
<dependencies>
12-
<dependency id="Spark" version="1.7.5.3" />
13-
<dependency id="WebActivator" version="1.4.1" />
12+
<dependency id="Spark" version="1.8.0.0" />
13+
<dependency id="WebActivator" version="2.0.6" />
1414
</dependencies>
1515
</metadata>
1616
</package>

‎NuGet/Spark.Web.Mvc3/lib/NET4/Spark.Web.Mvc.dll

0 Bytes
Binary file not shown.

‎NuGet/Spark.Web.Mvc4.1.7.5.3.nupkg

-47.5 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc4.1.8.0.0.nupkg

47.6 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc4/Spark.Web.Mvc4.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Spark.Web.Mvc4</id>
5-
<version>1.7.5.3</version>
5+
<version>1.8.0.0</version>
66
<authors>Louis DeJardin &amp; Robert Greyling</authors>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
88
<description>Spark View Engine for ASP.NET MVC 4.</description>
99
<summary>Spark View Engine for ASP.NET MVC 4.</summary>
1010
<language>en-US</language>
1111
<dependencies>
12-
<dependency id="Spark" version="1.7.5.3" />
13-
<dependency id="WebActivator" version="1.4.1" />
12+
<dependency id="Spark" version="1.8.0.0" />
13+
<dependency id="WebActivator" version="2.0.6" />
1414
</dependencies>
1515
</metadata>
1616
</package>

‎NuGet/Spark.Web.Mvc4/lib/NET4/Spark.Web.Mvc.dll

0 Bytes
Binary file not shown.

‎NuGet/Spark.Web.Mvc4/lib/NET45/Spark.Web.Mvc.dll

0 Bytes
Binary file not shown.

‎NuGet/Spark.Web.Mvc5.1.8.0.0.nupkg

25.6 KB
Binary file not shown.

‎NuGet/Spark.Web.Mvc5/Content/App_Start/SparkWebMvc.cs.pp

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Web.Mvc;
2+
using Spark;
3+
using Spark.Web.Mvc;
4+
5+
[assembly: WebActivator.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.SparkWebMvc), "Start")]
6+
7+
namespace $rootnamespace$.App_Start {
8+
public static class SparkWebMvc {
9+
public static void Start() {
10+
var settings = new SparkSettings();
11+
settings.SetAutomaticEncoding(true);
12+
13+
// Note: you can change the list of namespace and assembly
14+
// references in Views\Shared\_global.spark
15+
SparkEngineStarter.RegisterViewEngine(settings);
16+
}
17+
}
18+
}

‎NuGet/Spark.Web.Mvc5/Content/Views/Shared/_global.spark

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<use namespace="System"/>
2+
<use namespace="System.Collections.Generic"/>
3+
<use namespace="System.Linq"/>
4+
<use namespace="System.Web.Mvc"/>
5+
<use namespace="System.Web.Routing"/>
6+
<use namespace="System.Web.Mvc.Html"/>
7+
8+
<use assembly="Spark.Web.Mvc"/>
9+
<use assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>

‎NuGet/Spark.Web.Mvc5/Spark.Web.Mvc5.nuspec

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>Spark.Web.Mvc5</id>
5+
<version>1.8.0.0</version>
6+
<authors>Louis DeJardin &amp; Robert Greyling</authors>
7+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
8+
<description>Spark View Engine for ASP.NET MVC 5.</description>
9+
<summary>Spark View Engine for ASP.NET MVC 5.</summary>
10+
<language>en-US</language>
11+
<dependencies>
12+
<dependency id="Spark" version="1.8.0.0" />
13+
<dependency id="WebActivator" version="2.0.6" />
14+
</dependencies>
15+
</metadata>
16+
</package>

‎NuGet/Spark.Web.Mvc5/lib/NET45/Spark.Web.Mvc.dll

50.5 KB
Binary file not shown.

‎NuGet/Spark/Spark.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Spark</id>
5-
<version>1.7.5.3</version>
5+
<version>1.8.0.0</version>
66
<authors>Louis DeJardin &amp; Robert Greyling</authors>
77
<requireLicenseAcceptance>false</requireLicenseAcceptance>
88
<description>Spark View Engine Core.</description>

‎NuGet/Spark/lib/NET35/Spark.dll

512 Bytes
Binary file not shown.

‎NuGet/Spark/lib/NET40/Spark.dll

512 Bytes
Binary file not shown.

‎spark.build

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<property name="results.dir" value="${build.base}\results" />
1313
<property name="samples.dir" value="${solution.dir}\samples"/>
1414
<property name="version.major" value="1"/>
15-
<property name="version.minor" value="7"/>
16-
<property name="version.build" value="5"/>
17-
<property name="version.revision" value="3"/>
15+
<property name="version.minor" value="8"/>
16+
<property name="version.build" value="0"/>
17+
<property name="version.revision" value="0"/>
1818
<property name="project.version" value="${version.major}.${version.minor}" dynamic="true" />
1919
<property name="project.fullversion" value="${version.major}.${version.minor}.${version.build}.${version.revision}" dynamic="true" />
2020
<property name="nant.settings.currentframework" value="net-4.0" />
@@ -82,9 +82,9 @@
8282
<echo message="Build Directory is ${build.dir}" />
8383

8484
<exec program="${msbuild.dir}\msbuild.exe"
85-
commandline="&quot;${solution.file}&quot; /t:Clean &quot;/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}&quot; /v:q" workingdir="." />
85+
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="." />
8686
<exec program="${msbuild.dir}\msbuild.exe"
87-
commandline="&quot;${solution.file}&quot; /t:Rebuild &quot;/p:Configuration=${project.config};OutDir=${out.dir};SignAssembly=${project.signassembly}&quot; /v:q" workingdir="." />
87+
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="." />
8888

8989
<if test="${property::exists('tools.solution.file')}">
9090
<property name="wix-parameters" value="WixTargetsPath=..\..\..\bin\msbuild\Microsoft\WiX\v3.0\wix.targets;WixTasksPath=WixTasks.dll;WixToolPath=..\..\..\bin\wix"/>

‎src/CommonAssemblyInfo.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
//------------------------------------------------------------------------------
66
// <auto-generated>
77
// This code was generated by a tool.
8-
// Runtime Version:4.0.30319.32559
8+
// Runtime Version:4.0.30319.0
99
//
1010
// Changes to this file may cause incorrect behavior and will be lost if
1111
// the code is regenerated.
1212
// </auto-generated>
1313
//------------------------------------------------------------------------------
1414

1515
[assembly: ComVisibleAttribute(false)]
16-
[assembly: AssemblyVersionAttribute("1.7")]
17-
[assembly: AssemblyFileVersionAttribute("1.7.5.3")]
18-
[assembly: AssemblyCopyrightAttribute("Copyright (c) Louis DeJardin 2008-2013")]
16+
[assembly: AssemblyVersionAttribute("1.8")]
17+
[assembly: AssemblyFileVersionAttribute("1.8.0.0")]
18+
[assembly: AssemblyCopyrightAttribute("Copyright (c) Louis DeJardin 2008-2015")]
1919
[assembly: AssemblyProductAttribute("Spark")]
2020
[assembly: AssemblyCompanyAttribute("Louis DeJardin")]
2121
[assembly: AssemblyConfigurationAttribute("release")]
22-
[assembly: AssemblyInformationalVersionAttribute("1.7.5.3")]
22+
[assembly: AssemblyInformationalVersionAttribute("1.8.0.0")]
2323

‎src/CommonVersionInfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +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"
1+
// 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"

0 commit comments

Comments
 (0)
Please sign in to comment.