Permalink
Browse files

Merge branch 'mvc2-net4' into mvc3-net4

  • Loading branch information...
2 parents ca21871 + 20eae83 commit 5db5942f4928ce7093e9d99f61ae3df4708b1f4b @RobertTheGrey RobertTheGrey committed Mar 26, 2011
Showing with 8,513 additions and 4,850 deletions.
  1. +1 −1 NuGet/Spark Futures/{1.5.1.1 → 1.5.1.2}/Spark.Futures.nuspec
  2. BIN NuGet/Spark Futures/{1.5.1.1 → 1.5.1.2}/lib/NET35/Spark.dll
  3. BIN NuGet/Spark Futures/{1.5.1.1 → 1.5.1.2}/lib/NET40/Spark.dll
  4. BIN NuGet/Spark.Futures.1.5.1.1.nupkg
  5. BIN NuGet/Spark.Futures.1.5.1.2.nupkg
  6. 0 NuGet/Spark.Web.Mvc2 Futures/{1.5.1.1 → 1.5.1.2}/Content/App_Start/SparkWebMvc.cs.pp
  7. 0 NuGet/Spark.Web.Mvc2 Futures/{1.5.1.1 → 1.5.1.2}/Content/Views/Shared/_global.spark
  8. +2 −2 NuGet/Spark.Web.Mvc2 Futures/{1.5.1.1 → 1.5.1.2}/Spark.Web.Mvc2.Futures.nuspec
  9. BIN NuGet/Spark.Web.Mvc2 Futures/{1.5.1.1 → 1.5.1.2}/lib/NET35/Spark.Web.Mvc.dll
  10. BIN NuGet/Spark.Web.Mvc2 Futures/{1.5.1.1 → 1.5.1.2}/lib/NET40/Spark.Web.Mvc.dll
  11. BIN NuGet/Spark.Web.Mvc2.Futures.1.5.1.1.nupkg
  12. BIN NuGet/Spark.Web.Mvc2.Futures.1.5.1.2.nupkg
  13. BIN bin/nunit/Failure.jpg
  14. BIN bin/nunit/Ignored.jpg
  15. +0 −277 bin/nunit/NUnitFitTests.html
  16. +0 −84 bin/nunit/NUnitTests.config
  17. +0 −14 bin/nunit/NUnitTests.nunit
  18. BIN bin/nunit/Success.jpg
  19. +0 −96 bin/nunit/clr.bat
  20. +0 −342 bin/nunit/fit-license.txt
  21. BIN bin/nunit/fit.dll
  22. +0 −15 bin/nunit/license.txt
  23. BIN bin/nunit/mock-assembly.dll
  24. BIN bin/nunit/nonamespace-assembly.dll
  25. BIN bin/nunit/notestfixtures-assembly.dll
  26. BIN bin/nunit/nunit-console-runner.dll
  27. BIN bin/nunit/nunit-console-x86.exe
  28. +27 −7 bin/nunit/nunit-console-x86.exe.config
  29. BIN bin/nunit/nunit-console.exe
  30. +31 −8 bin/nunit/nunit-console.exe.config
  31. BIN bin/nunit/nunit-console.tests.dll
  32. BIN bin/nunit/nunit-gui-runner.dll
  33. BIN bin/nunit/nunit-gui.tests.dll
  34. BIN bin/nunit/nunit-x86.exe
  35. +0 −115 bin/nunit/nunit-x86.exe.config
  36. BIN bin/nunit/nunit.core.dll
  37. BIN bin/nunit/nunit.core.extensions.dll
  38. BIN bin/nunit/nunit.core.interfaces.dll
  39. BIN bin/nunit/nunit.core.tests.dll
  40. BIN bin/nunit/nunit.exe
  41. +0 −115 bin/nunit/nunit.exe.config
  42. BIN bin/nunit/nunit.extensions.tests.dll
  43. BIN bin/nunit/nunit.fixtures.dll
  44. BIN bin/nunit/nunit.fixtures.tests.dll
  45. BIN bin/nunit/nunit.framework.dll
  46. BIN bin/nunit/nunit.framework.extensions.dll
  47. BIN bin/nunit/nunit.framework.tests.dll
  48. +8,246 −3,382 bin/nunit/nunit.framework.xml
  49. BIN bin/nunit/nunit.mocks.dll
  50. BIN bin/nunit/nunit.mocks.tests.dll
  51. BIN bin/nunit/nunit.uikit.dll
  52. BIN bin/nunit/nunit.uikit.tests.dll
  53. BIN bin/nunit/nunit.util.dll
  54. BIN bin/nunit/nunit.util.tests.dll
  55. BIN bin/nunit/runFile.exe
  56. +0 −43 bin/nunit/runFile.exe.config
  57. BIN bin/nunit/test-assembly.dll
  58. BIN bin/nunit/test-utilities.dll
  59. BIN bin/nunit/timing-tests.dll
  60. +1 −1 spark.build
  61. +1 −1 src/Castle.MonoRail.Views.Spark.Tests/Caching/HybridCacheServiceProviderTests.cs
  62. +9 −6 src/Castle.MonoRail.Views.Spark.Tests/SparkViewFactoryStrictNullBehaviourTests.cs
  63. +3 −2 src/Castle.MonoRail.Views.Spark.Tests/SparkViewFactoryTests.cs
  64. +2 −2 src/Castle.MonoRail.Views.Spark.Tests/ViewComponents/ViewComponentSectionTests.cs
  65. +4 −2 src/Castle.MonoRail.Views.Spark.Tests/ViewSourceLoaderWrapperTests.cs
  66. +2 −2 src/CommonAssemblyInfo.cs
  67. +1 −1 src/CommonVersionInfo.h
  68. +1 −1 src/Spark.Python.Tests/ScriptingLanguageFactoryTests.cs
  69. +4 −4 src/Spark.Tests/Bindings/BindingExecutionTester.cs
  70. +1 −1 src/Spark.Tests/Bindings/BindingExpansionVisitorTester.cs
  71. +4 −4 src/Spark.Tests/Bindings/BindingGrammarTester.cs
  72. +5 −5 src/Spark.Tests/Bindings/ViewFolderBindingProviderTester.cs
  73. +11 −12 src/Spark.Tests/Caching/CacheElementTester.cs
  74. +1 −1 src/Spark.Tests/Caching/CacheOriginatorTester.cs
  75. +1 −1 src/Spark.Tests/Caching/CacheSignalTester.cs
  76. +1 −1 src/Spark.Tests/Caching/CacheUtilitiesTester.cs
  77. +1 −1 src/Spark.Tests/Caching/TextWriterOriginatorTester.cs
  78. +3 −3 src/Spark.Tests/ClientsideCompilerTester.cs
  79. +1 −1 src/Spark.Tests/CompiledViewHolderTester.cs
  80. +16 −14 src/Spark.Tests/Compiler/CSharpViewCompilerTester.cs
  81. +3 −3 src/Spark.Tests/Compiler/SourceMappingTester.cs
  82. +2 −2 src/Spark.Tests/Compiler/SourceWriterTester.cs
  83. +16 −14 src/Spark.Tests/Compiler/VisualBasicViewCompilerTester.cs
  84. +1 −1 src/Spark.Tests/DefaultResourcePathManagerTester.cs
  85. +2 −2 src/Spark.Tests/FileSystem/CombinedViewFolderTester.cs
  86. +3 −3 src/Spark.Tests/FileSystem/FileSystemViewFolderTester.cs
  87. +4 −3 src/Spark.Tests/FileSystem/InMemoryViewFolderTester.cs
  88. +13 −6 src/Spark.Tests/ImportAndIncludeTester.cs
  89. +1 −1 src/Spark.Tests/Parser/AutomaticEncodingTester.cs
  90. +1 −1 src/Spark.Tests/Parser/CharGrammarTester.cs
  91. +1 −1 src/Spark.Tests/Parser/JavascriptAnonymousTypeGrammarTester.cs
  92. +11 −11 src/Spark.Tests/Parser/MarkupGrammarTester.cs
  93. +1 −1 src/Spark.Tests/Parser/PositionTester.cs
  94. +5 −4 src/Spark.Tests/Parser/ViewLoaderTester.cs
  95. +0 −1 src/Spark.Tests/Spark.Tests.csproj
  96. +6 −6 src/Spark.Tests/SparkServiceContainerTester.cs
  97. +7 −39 src/Spark.Tests/SparkViewFactoryTester.cs
  98. +1 −1 src/Spark.Tests/Spool/SpoolReaderTester.cs
  99. +0 −152 src/Spark.Tests/UseMasterTester.cs
  100. +1 −1 src/Spark.Tests/ValueHolderTester.cs
  101. +6 −6 src/Spark.Tests/Visitors/SpecialNodeVisitorTester.cs
  102. +16 −16 src/Spark.Tests/VisualBasicViewTester.cs
  103. +1 −1 src/Spark.Web.Mvc.Pdf.Tests/PdfViewResultTests.cs
  104. +5 −3 src/Spark.Web.Mvc.Tests/DescriptorBuildingTester.cs
  105. +1 −1 src/Spark.Web.Mvc.Tests/DescriptorFilterTester.cs
  106. +1 −1 src/Spark.Web.Mvc.Tests/LanguageKitFolderTester.cs
  107. +1 −1 src/Spark.Web.Mvc.Tests/SparkViewFactoryTester.cs
  108. +11 −1 src/Spark.Web.Mvc/DefaultDescriptorBuilder.cs
  109. +12 −0 src/Spark/Spool/SpoolReader.cs
@@ -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.Futures</id>
- <version>1.5.1.1</version>
+ <version>1.5.1.2</version>
<authors>Louis DeJardin &amp; Robert Greyling</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Latest Spark View Engine Core.</description>
Binary file not shown.
Binary file not shown.
@@ -2,14 +2,14 @@
<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.Futures</id>
- <version>1.5.1.1</version>
+ <version>1.5.1.2</version>
<authors>Louis DeJardin &amp; Robert Greyling</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Latest Spark View Engine for ASP.NET MVC 2.</description>
<summary>Latest from source code of Spark View Engine on the master branch</summary>
<language>en-US</language>
<dependencies>
- <dependency id="Spark.Futures" version="1.5.1.1" />
+ <dependency id="Spark.Futures" version="1.5.1.2" />
<dependency id="WebActivator" version="1.4" />
</dependencies>
</metadata>
Binary file not shown.
Binary file not shown.
View
Deleted file not rendered
View
Deleted file not rendered
@@ -1,277 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
- <body>
- <h1>NUnit Acceptance Tests</h1>
- <p>
- Developers love self-referential programs! Hence, NUnit has always run all it's
- own tests, even those that are not really unit tests.
- <p>Now, beginning with NUnit 2.4, NUnit has top-level tests using Ward Cunningham's
- FIT framework. At this time, the tests are pretty rudimentary, but it's a start
- and it's a framework for doing more.
- <h2>Running the Tests</h2>
- <p>Open a console or shell window and navigate to the NUnit bin directory, which
- contains this file. To run the test under Microsoft .Net, enter the command
- <pre> runFile NUnitFitTests.html TestResults.html .</pre>
- To run it under Mono, enter
- <pre> mono runFile.exe NUnitFitTests.html TestResults.html .</pre>
- Note the space and dot at the end of each command. The results of your test
- will be in TestResults.html in the same directory.
- <h2>Platform and CLR Version</h2>
- <table BORDER cellSpacing="0" cellPadding="5">
- <tr>
- <td colspan="2">NUnit.Fixtures.PlatformInfo</td>
- </tr>
- </table>
- <h2>Verify Unit Tests</h2>
- <p>
- Load and run the NUnit unit tests, verifying that the results are as expected.
- When these tests are run on different platforms, different numbers of tests may
- be skipped, so the values for Skipped and Run tests are informational only.
- <p>
- The number of tests in each assembly should be constant across all platforms -
- any discrepancy usually means that one of the test source files was not
- compiled on the platform. There should be no failures and no tests ignored.
- <p><b>Note:</b>
- At the moment, the nunit.extensions.tests assembly is failing because the
- fixture doesn't initialize addins in the test domain.
- <p>
- <table BORDER cellSpacing="0" cellPadding="5">
- <tr>
- <td colspan="6">NUnit.Fixtures.AssemblyRunner</td>
- </tr>
- <tr>
- <td>Assembly</td>
- <td>Tests()</td>
- <td>Run()</td>
- <td>Skipped()</td>
- <td>Ignored()</td>
- <td>Failures()</td>
- </tr>
- <tr>
- <td>nunit.framework.tests.dll</td>
- <td>397</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit.core.tests.dll</td>
- <td>355</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit.util.tests.dll</td>
- <td>238</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit.mocks.tests.dll</td>
- <td>43</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit.extensions.tests.dll</td>
- <td>5</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit-console.tests.dll</td>
- <td>40</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit.uikit.tests.dll</td>
- <td>34</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit-gui.tests.dll</td>
- <td>15</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td>nunit.fixtures.tests.dll</td>
- <td>6</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- <td>0</td>
- <td>0</td>
- </tr>
- </table>
- <h2>Code Snippet Tests</h2>
- <p>
- These tests create a test assembly from a snippet of code and then load and run
- the tests that it contains, verifying that the structure of the loaded tests is
- as expected and that the number of tests run, skipped, ignored or failed is
- correct.
- <p>
- <table BORDER cellSpacing="0" cellPadding="5">
- <tr>
- <td colspan="6">NUnit.Fixtures.SnippetRunner</td>
- </tr>
- <tr>
- <td>Code</td>
- <td>Tree()</td>
- <td>Run()</td>
- <td>Skipped()</td>
- <td>Ignored()</td>
- <td>Failures()</td>
- </tr>
- <tr>
- <td><pre>public class TestClass
-{
-}</pre>
- </td>
- <td>EMPTY</td>
- <td>0</td>
- <td>0</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td><pre>using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
-}</pre>
- </td>
- <td>TestClass</td>
- <td>0</td>
- <td>0</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td><pre>using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
- [Test]
- public void T1() { }
- [Test]
- public void T2() { }
- [Test]
- public void T3() { }
-}</pre>
- </td>
- <td><pre>TestClass
-&gt;T1
-&gt;T2
-&gt;T3</pre>
- </td>
- <td>3</td>
- <td>0</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td><pre>using NUnit.Framework;
-
-[TestFixture]
-public class TestClass1
-{
- [Test]
- public void T1() { }
-}
-
-[TestFixture]
-public class TestClass2
-{
- [Test]
- public void T2() { }
- [Test]
- public void T3() { }
-}</pre>
- </td>
- <td><pre>TestClass1
-&gt;T1
-TestClass2
-&gt;T2
-&gt;T3</pre>
- </td>
- <td>3</td>
- <td>0</td>
- <td>0</td>
- <td>0</td>
- </tr>
- <tr>
- <td><pre>using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
- [Test]
- public void T1() { }
- [Test, Ignore]
- public void T2() { }
- [Test]
- public void T3() { }
-}</pre>
- </td>
- <td><pre>TestClass
-&gt;T1
-&gt;T2
-&gt;T3</pre>
- </td>
- <td>2</td>
- <td>0</td>
- <td>1</td>
- <td>0</td>
- </tr>
- <tr>
- <td><pre>using NUnit.Framework;
-
-[TestFixture]
-public class TestClass
-{
- [Test]
- public void T1() { }
- [Test, Explicit]
- public void T2() { }
- [Test]
- public void T3() { }
-}</pre>
- </td>
- <td><pre>TestClass
-&gt;T1
-&gt;T2
-&gt;T3</pre>
- </td>
- <td>2</td>
- <td>1</td>
- <td>0</td>
- <td>0</td>
- </tr>
- </table>
- <h2>Summary Information</h2>
- <table BORDER cellSpacing="0" cellPadding="5">
- <tr>
- <td colspan="2">fit.Summary</td>
- </tr>
- </table>
- </body>
-</html>
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-<!--
- This is the configuration file for the NUnitTests.nunit test project. You may
- need to create a similar configuration file for your own test project.
- -->
-
-<!--
- The <NUnit> section is only needed if you want to use a non-default value
- for any of the settings. It is commented out below. If you are going to use
- it, you must deifne the NUnit section group and the sections you need.
-
- The syntax shown here works for most runtimes. If NUnit fails at startup, you
- can try specifying the name of the assembly containing the NameValueSectionHandler:
-
- <section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler, System" />
-
- If that fails, try the fully qualified name of the assembly:
-
- <section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler, System,
- Version=2.0.50727.832, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-
- Unfortunately, this last approach makes your config file non-portable across runtimes.
- -->
-
-<!--
- <configSections>
- <sectionGroup name="NUnit">
- <section name="TestCaseBuilder" type="System.Configuration.NameValueSectionHandler"/>
- <section name="TestRunner" type="System.Configuration.NameValueSectionHandler"/>
- </sectionGroup>
- </configSections>
- -->
-
- <appSettings>
- <!-- User application and configured property settings go here.-->
- <!-- Example: <add key="settingName" value="settingValue"/> -->
- <add key="test.setting" value="54321" />
- </appSettings>
-
-<!-- Sample NUnit section group showing all default values -->
-<!--
- <NUnit>
- <TestCaseBuilder>
- <add key="OldStyleTestCases" value="false" />
- </TestCaseBuilder>
- <TestRunner>
- <add key="ApartmentState" value="MTA" />
- <add key="ThreadPriority" value="Normal" />
- </TestRunner>
- </NUnit>
--->
-
- <!--
- The following <runtime> section allows running nunit tests under
- .NET 1.0 by redirecting assemblies. The appliesTo attribute
- causes the section to be ignored except under .NET 1.0.
- -->
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
- appliesTo="v1.0.3705">
- <dependentAssembly>
- <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="" />
- <bindingRedirect oldVersion="1.0.5000.0" newVersion="1.0.3300.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Data" publicKeyToken="b77a5c561934e089" culture="" />
- <bindingRedirect oldVersion="1.0.5000.0" newVersion="1.0.3300.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="" />
- <bindingRedirect oldVersion="1.0.5000.0" newVersion="1.0.3300.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Windows.Forms" publicKeyToken="b77a5c561934e089" culture="" />
- <bindingRedirect oldVersion="1.0.5000.0" newVersion="1.0.3300.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Xml" publicKeyToken="b77a5c561934e089" culture="" />
- <bindingRedirect oldVersion="1.0.5000.0" newVersion="1.0.3300.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration>
Oops, something went wrong.

0 comments on commit 5db5942

Please sign in to comment.