Permalink
Browse files

Merge branch 'installers' of git@github.com:loudej/spark.git into mvc-2

Conflicts:
	src/Tools/SparkLanguage/VsProjectSparkSettings.cs
  • Loading branch information...
2 parents 7cb2aa3 + 2a0cd31 commit 5438732601f8e9539c0c674c4008397dc225b70a @loudej loudej committed Mar 20, 2010
Showing with 32,568 additions and 3 deletions.
  1. BIN bin/msbuild/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll
  2. +104 −0 bin/msbuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
  3. BIN bin/msbuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm
  4. BIN bin/msbuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll
  5. +6,506 −0 bin/msbuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml
  6. +153 −0 bin/msbuild/MSBuildCommunityTasks/Sample.proj
  7. +3 −2 spark.build
  8. +20 −0 src/Installers/Installers.sln
  9. +24 −0 src/Installers/SparkViewEngine/Product.wxs
  10. +34 −0 src/Installers/SparkViewEngine/SparkViewEngine.wixproj
  11. +1 −1 src/Tools/SparkLanguage/VsProjectSparkSettings.cs
  12. +20 −0 src/Tools/Tools.sln
  13. +317 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Content/Site.css
  14. +296 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Controllers/AccountController.cs
  15. +24 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Controllers/HomeController.cs
  16. +3 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Default.aspx
  17. +22 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Default.aspx.cs
  18. +1 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Global.asax
  19. +39 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Global.asax.cs
  20. +84 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/MvcSparkWebApplication.cs.vstemplate
  21. +132 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/MvcSparkWebApplication.csproj
  22. +35 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Properties/AssemblyInfo.cs
  23. +6,850 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/MicrosoftAjax.debug.js
  24. +7 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/MicrosoftAjax.js
  25. +337 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/MicrosoftMvcAjax.debug.js
  26. +23 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/MicrosoftMvcAjax.js
  27. +6,255 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/jquery-1.3.2-vsdoc.js
  28. +4,410 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/jquery-1.3.2.js
  29. +6,255 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/jquery-1.3.2.min-vsdoc.js
  30. +53 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Scripts/jquery-1.3.2.min.js
  31. +41 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Account/ChangePassword.spark
  32. +9 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Account/ChangePasswordSuccess.spark
  33. +35 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Account/LogOn.spark
  34. +47 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Account/Register.spark
  35. +9 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Home/About.spark
  36. +9 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Home/Index.spark
  37. +37 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Shared/Application.spark
  38. +8 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Shared/Error.spark
  39. +6 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Shared/_LogOnUser.spark
  40. +16 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Views/Shared/_global.spark
  41. +254 −0 src/Tools/WebSiteProject/Projects/MvcSparkWebApplication/Web.config
  42. +89 −0 src/Tools/WebSiteProject/WebSiteProject.csproj
Binary file not shown.
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <!-- $Id: MSBuild.Community.Tasks.Targets 303 2007-02-23 15:49:46Z pwelter34 $ -->
+
+ <PropertyGroup>
+ <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(MSBuildExtensionsPath)\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+ <MSBuildCommunityTasksLib>$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
+ </PropertyGroup>
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.AspNet.InstallAspNet" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.AssemblyInfo" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Attrib" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SqlExecute" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.FileUpdate" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.FtpUpload" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.FxCop" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.GacUtil" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.GetSolutionProjects" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.ILMerge" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Mail" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Move" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Add" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Divide" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Modulo" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Multiple" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Math.Subtract" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.NDoc" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.NUnit" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Prompt" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.RegistryRead" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.RegistryWrite" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.RegexMatch" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.RegexReplace" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Script" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.ServiceController" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.ServiceQuery" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Sleep" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.AppPoolController" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.AppPoolCreate" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.AppPoolDelete" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.WebDirectoryCreate" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.WebDirectoryDelete" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.WebDirectoryScriptMap" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.IIS.WebDirectorySetting" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Install.InstallAssembly" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Install.UninstallAssembly" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Schema.TaskSchema" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SqlServer.ExecuteDDL" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssAdd" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssCheckin" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssCheckout" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssClean" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssDiff" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssGet" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssHistory" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssLabel" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.SourceSafe.VssUndoCheckout" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnCheckout" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnClient" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnCopy" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnCommit" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnExport" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnInfo" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnUpdate" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Subversion.SvnVersion" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Tfs.TfsVersion" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.TemplateFile" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Time" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Unzip" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Version" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.WebDownload" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Xml.XmlMassUpdate" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Xml.XmlQuery" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.XmlRead" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.XmlUpdate" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Xslt" />
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.Zip" />
+
+ <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.JavaScript.JSCompress" />
+
+ <ItemGroup>
+ <FxCopRuleAssemblies Include="UsageRules.dll"/>
+ <FxCopRuleAssemblies Include="SecurityRules.dll"/>
+ <FxCopRuleAssemblies Include="PortabilityRules.dll"/>
+ <FxCopRuleAssemblies Include="PerformanceRules.dll"/>
+ <FxCopRuleAssemblies Include="MobilityRules.dll"/>
+ <FxCopRuleAssemblies Include="InteroperabilityRules.dll"/>
+ <FxCopRuleAssemblies Include="GlobalizationRules.dll"/>
+ <FxCopRuleAssemblies Include="DesignRules.dll"/>
+ </ItemGroup>
+</Project>
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 5438732

Please sign in to comment.