Permalink
Browse files

Merge pull request #2 from gkilbride-ce/master

Update Mongo driver and replace FluentMongo with native Mongo extensions (Gavin Kilbride)
  • Loading branch information...
alanning committed May 18, 2012
2 parents f92776d + b919a20 commit af9928be98a218b588de63e8d009e5f708fca446
Showing with 15,043 additions and 12,814 deletions.
  1. +6 −15 MongoProviders.UnitTests/MongoProviders.UnitTests.csproj
  2. +2 −3 MongoProviders.UnitTests/packages.config
  3. +1 −1 MongoProviders/MembershipProvider.cs
  4. +2 −5 MongoProviders/MongoProviders.csproj
  5. +2 −2 MongoProviders/RoleProvider.cs
  6. +1 −2 MongoProviders/packages.config
  7. BIN packages/FluentMongo.1.2.0.0/FluentMongo.1.2.0.0.nupkg
  8. BIN packages/FluentMongo.1.2.0.0/lib/FluentMongo.dll
  9. BIN packages/NUnit.2.5.10.11092/Logo.ico
  10. BIN packages/NUnit.2.5.10.11092/NUnit.2.5.10.11092.nupkg
  11. +0 −277 packages/NUnit.2.5.10.11092/NUnitFitTests.html
  12. +0 −342 packages/NUnit.2.5.10.11092/fit-license.txt
  13. BIN packages/NUnit.2.5.10.11092/lib/nunit.framework.dll
  14. BIN packages/NUnit.2.5.10.11092/lib/nunit.mocks.dll
  15. BIN packages/NUnit.2.5.10.11092/lib/pnunit.framework.dll
  16. +0 −124 packages/NUnit.2.5.10.11092/tools/NUnitTests.VisualState.xml
  17. +0 −85 packages/NUnit.2.5.10.11092/tools/NUnitTests.config
  18. +0 −14 packages/NUnit.2.5.10.11092/tools/NUnitTests.nunit
  19. +0 −4 packages/NUnit.2.5.10.11092/tools/agent.conf
  20. +0 −18 packages/NUnit.2.5.10.11092/tools/agent.log.conf
  21. +0 −18 packages/NUnit.2.5.10.11092/tools/launcher.log.conf
  22. BIN packages/NUnit.2.5.10.11092/tools/lib/Failure.png
  23. BIN packages/NUnit.2.5.10.11092/tools/lib/Ignored.png
  24. BIN packages/NUnit.2.5.10.11092/tools/lib/Inconclusive.png
  25. BIN packages/NUnit.2.5.10.11092/tools/lib/Skipped.png
  26. BIN packages/NUnit.2.5.10.11092/tools/lib/Success.png
  27. BIN packages/NUnit.2.5.10.11092/tools/lib/fit.dll
  28. BIN packages/NUnit.2.5.10.11092/tools/lib/log4net.dll
  29. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit-console-runner.dll
  30. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit-gui-runner.dll
  31. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit.core.dll
  32. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit.core.interfaces.dll
  33. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit.fixtures.dll
  34. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit.uiexception.dll
  35. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit.uikit.dll
  36. BIN packages/NUnit.2.5.10.11092/tools/lib/nunit.util.dll
  37. BIN packages/NUnit.2.5.10.11092/tools/nunit-agent-x86.exe
  38. +0 −69 packages/NUnit.2.5.10.11092/tools/nunit-agent-x86.exe.config
  39. BIN packages/NUnit.2.5.10.11092/tools/nunit-agent.exe
  40. +0 −69 packages/NUnit.2.5.10.11092/tools/nunit-agent.exe.config
  41. BIN packages/NUnit.2.5.10.11092/tools/nunit-console-x86.exe
  42. +0 −69 packages/NUnit.2.5.10.11092/tools/nunit-console-x86.exe.config
  43. BIN packages/NUnit.2.5.10.11092/tools/nunit-console.exe
  44. +0 −69 packages/NUnit.2.5.10.11092/tools/nunit-console.exe.config
  45. BIN packages/NUnit.2.5.10.11092/tools/nunit-x86.exe
  46. +0 −83 packages/NUnit.2.5.10.11092/tools/nunit-x86.exe.config
  47. BIN packages/NUnit.2.5.10.11092/tools/nunit.exe
  48. +0 −83 packages/NUnit.2.5.10.11092/tools/nunit.exe.config
  49. BIN packages/NUnit.2.5.10.11092/tools/nunit.framework.dll
  50. BIN packages/NUnit.2.5.10.11092/tools/pnunit-agent.exe
  51. +0 −77 packages/NUnit.2.5.10.11092/tools/pnunit-agent.exe.config
  52. BIN packages/NUnit.2.5.10.11092/tools/pnunit-launcher.exe
  53. +0 −77 packages/NUnit.2.5.10.11092/tools/pnunit-launcher.exe.config
  54. BIN packages/NUnit.2.5.10.11092/tools/pnunit.framework.dll
  55. BIN packages/NUnit.2.5.10.11092/tools/pnunit.tests.dll
  56. BIN packages/NUnit.2.5.10.11092/tools/runFile.exe
  57. +0 −43 packages/NUnit.2.5.10.11092/tools/runFile.exe.config
  58. +0 −2 packages/NUnit.2.5.10.11092/tools/runpnunit.bat
  59. +0 −24 packages/NUnit.2.5.10.11092/tools/test.conf
  60. BIN packages/NUnit.2.6.0.12054/NUnit.2.6.0.12054.nupkg
  61. BIN packages/NUnit.2.6.0.12054/lib/nunit.framework.dll
  62. +600 −162 packages/{NUnit.2.5.10.11092 → NUnit.2.6.0.12054}/lib/nunit.framework.xml
  63. +2 −2 packages/{NUnit.2.5.10.11092 → NUnit.2.6.0.12054}/license.txt
  64. BIN packages/mongocsharpdriver.1.2/CSharpDriverDocs.chm
  65. +0 −386 packages/mongocsharpdriver.1.2/Release Notes v1.2.txt
  66. BIN packages/mongocsharpdriver.1.2/lib/net35/MongoDB.Bson.dll
  67. BIN packages/mongocsharpdriver.1.2/lib/net35/MongoDB.Bson.pdb
  68. BIN packages/mongocsharpdriver.1.2/lib/net35/MongoDB.Driver.dll
  69. BIN packages/mongocsharpdriver.1.2/lib/net35/MongoDB.Driver.pdb
  70. BIN packages/mongocsharpdriver.1.2/mongocsharpdriver.1.2.nupkg
  71. +90 −89 packages/{mongocsharpdriver.1.2 → mongocsharpdriver.1.4.2}/License.rtf
  72. +66 −0 packages/mongocsharpdriver.1.4.2/Release Notes v1.4.2.txt
  73. BIN packages/mongocsharpdriver.1.4.2/lib/net35/MongoDB.Bson.dll
  74. BIN packages/mongocsharpdriver.1.4.2/lib/net35/MongoDB.Bson.pdb
  75. +7,451 −6,079 ...csharpdriver.1.2/lib/net35/MongoDB.Bson.XML → mongocsharpdriver.1.4.2/lib/net35/MongoDB.Bson.xml}
  76. +6,820 −4,521 packages/{mongocsharpdriver.1.2 → mongocsharpdriver.1.4.2}/lib/net35/MongoDB.Driver.XML
  77. BIN packages/mongocsharpdriver.1.4.2/lib/net35/MongoDB.Driver.dll
  78. BIN packages/mongocsharpdriver.1.4.2/lib/net35/MongoDB.Driver.pdb
  79. BIN packages/mongocsharpdriver.1.4.2/mongocsharpdriver.1.4.2.nupkg
@@ -33,24 +33,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="FluentMongo">
- <HintPath>..\packages\FluentMongo.1.2.0.0\lib\FluentMongo.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.CSharp" />
- <Reference Include="MongoDB.Bson, Version=1.2.0.4274, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
- <HintPath>..\packages\mongocsharpdriver.1.2\lib\net35\MongoDB.Bson.dll</HintPath>
- </Reference>
- <Reference Include="MongoDB.Driver, Version=1.2.0.4274, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
- <HintPath>..\packages\mongocsharpdriver.1.2\lib\net35\MongoDB.Driver.dll</HintPath>
- </Reference>
- <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
+ <Reference Include="MongoDB.Bson">
+ <HintPath>..\packages\mongocsharpdriver.1.4.2\lib\net35\MongoDB.Bson.dll</HintPath>
</Reference>
- <Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
+ <Reference Include="MongoDB.Driver">
+ <HintPath>..\packages\mongocsharpdriver.1.4.2\lib\net35\MongoDB.Driver.dll</HintPath>
</Reference>
- <Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework">
+ <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mongocsharpdriver" version="1.2" />
- <package id="FluentMongo" version="1.2.0.0" />
- <package id="NUnit" version="2.5.10.11092" />
+ <package id="mongocsharpdriver" version="1.4.2" />
+ <package id="NUnit" version="2.6.0.12054" />
</packages>
@@ -34,7 +34,7 @@
using MongoDB.Driver.Builders;
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
-using FluentMongo.Linq;
+using MongoDB.Driver.Linq;
namespace MongoProviders
{
@@ -31,14 +31,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="FluentMongo">
- <HintPath>..\packages\FluentMongo.1.2.0.0\lib\FluentMongo.dll</HintPath>
- </Reference>
<Reference Include="MongoDB.Bson">
- <HintPath>..\packages\mongocsharpdriver.1.2\lib\net35\MongoDB.Bson.dll</HintPath>
+ <HintPath>..\packages\mongocsharpdriver.1.4.2\lib\net35\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver">
- <HintPath>..\packages\mongocsharpdriver.1.2\lib\net35\MongoDB.Driver.dll</HintPath>
+ <HintPath>..\packages\mongocsharpdriver.1.4.2\lib\net35\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -29,7 +29,7 @@
using MongoDB.Driver.Builders;
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
-using FluentMongo.Linq;
+using MongoDB.Driver.Linq;
namespace MongoProviders
{
@@ -323,7 +323,7 @@ public override bool DeleteRole(string roleName, bool throwOnPopulatedRole)
{
SecUtility.CheckParameter(ref roleName, true, true, InvalidRoleCharacters, MAX_ROLE_LENGTH, "roleName");
- var rolePopulated = UserCollection.AsQueryable().Where(u => u.Roles.Contains(roleName.ToLowerInvariant())).Any();
+ var rolePopulated = UserCollection.AsQueryable().Any(u => u.Roles.Contains(roleName.ToLowerInvariant()));
if (throwOnPopulatedRole && rolePopulated)
{
throw new ProviderException(Resources.Role_is_not_empty);
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mongocsharpdriver" version="1.2" />
- <package id="FluentMongo" version="1.2.0.0" />
+ <package id="mongocsharpdriver" version="1.4.2" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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>
Oops, something went wrong.

0 comments on commit af9928b

Please sign in to comment.