Skip to content
This repository was archived by the owner on Dec 30, 2020. It is now read-only.

Commit d8f6184

Browse files
samussamus
committed
Merge branch 'typedcollections'
2 parents de04f6a + 580be4f commit d8f6184

File tree

444 files changed

+32447
-12716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

444 files changed

+32447
-12716
lines changed

Diff for: ‎.gitignore

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,28 @@
1-
21
*~
32
*.dll
43
*.*~
54
*.mdb
65
*.pdb
76
*.pidb
8-
*.vcproj
97
*.user
108
*.ncb
119
*.aps
1210
*.suo
13-
*.sln
1411
*.userprefs
1512
*.usertasks
1613
*.orig
1714
*.cache
1815
*.ReSharper
1916

20-
*/bin/*
21-
*/obj/*
22-
*/test-results/*
23-
/test-results/
17+
bin/
18+
obj/
19+
deploy/
20+
test-results/
21+
test-results/
2422

2523
/Release/*
26-
27-
/examples/*/bin/*
28-
/examples/*/test-results/*
29-
/examples/*/obj/*
30-
3124
/_UpgradeReport_Files/*
3225

3326
/redist/*.zip
3427

3528
*_ReSharper.*/**
36-
>>>>>>> dc06fc695339fb920a153bad7a131c47f57ac7d7:.gitignore

Diff for: ‎MongoDB.GridFS/AssemblyInfo.cs renamed to ‎AssemblyInfoGlobal.cs

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
1+
using System.Reflection;
32

43
// Information about this assembly is defined by the following attributes.
54
// Change them to the values specific to your project.
65

7-
[assembly: AssemblyTitle("MongoDB.GridFS")]
8-
[assembly: AssemblyDescription("")]
9-
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("")]
11-
[assembly: AssemblyProduct("")]
12-
[assembly: AssemblyCopyright("")]
6+
[assembly: AssemblyConfiguration("")]
7+
[assembly: AssemblyCompany("MongoDB-CSharp")]
8+
[assembly: AssemblyCopyright("MongoDB-CSharp")]
139
[assembly: AssemblyTrademark("")]
1410
[assembly: AssemblyCulture("")]
1511

1612
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
1713
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1814
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1915

20-
[assembly: AssemblyVersion("1.0.*")]
21-
22-
// The following attributes are used to specify the signing key for the assembly,
23-
// if desired. See the Mono documentation for more information about signing.
24-
25-
[assembly: AssemblyDelaySign(false)]
26-
[assembly: AssemblyKeyFile("")]
16+
[assembly: AssemblyVersion("0.82.2")]

Diff for: ‎Deploy.proj

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="deploy" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<!-- $Id: Task.proj 135 2006-03-19 01:02:09Z pwelter34 $ -->
4+
5+
<PropertyGroup>
6+
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
7+
<ExtensionTasksPath>$(MSBuildProjectDirectory)\tools\MSBuild.ExtensionPack</ExtensionTasksPath>
8+
<DeployPath>$(MSBuildProjectDirectory)\deploy</DeployPath>
9+
<DeployTmp>$(DeployPath)\tmp</DeployTmp>
10+
<SourceProject>$(MSBuildProjectDirectory)\MongoDB-CSharp.sln</SourceProject>
11+
</PropertyGroup>
12+
13+
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets"/>
14+
15+
<Target Name="releasebuild">
16+
17+
<ItemGroup>
18+
<ProjectToBuild Include="$(MSBuildProjectDirectory)\source\MongoDB\MongoDB.csproj" />
19+
<ProjectToBuild Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\MongoDB.GridFS.csproj" />
20+
</ItemGroup>
21+
22+
<MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild" Properties="Configuration=Release" />
23+
24+
</Target>
25+
26+
<Target Name="deploy" DependsOnTargets="releasebuild">
27+
28+
<PropertyGroup>
29+
<DeployFile>$(DeployPath)\MongoDB-CSharp.zip</DeployFile>
30+
</PropertyGroup>
31+
32+
<Delete Files="$(DeployFile)" />
33+
34+
<MakeDir Directories="$(DeployPath)" Condition="!Exists('$(DeployPath)')" />
35+
<MakeDir Directories="$(DeployTmp)" Condition="!Exists('$(DeployTmp)')" />
36+
37+
<ItemGroup>
38+
<CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB\bin\Release\*.xml" />
39+
<CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB\bin\Release\*.dll" />
40+
<CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\bin\Release\*.xml" />
41+
<CollectFiles Include="$(MSBuildProjectDirectory)\source\MongoDB.GridFS\bin\Release\*.dll" />
42+
<CollectFiles Include="$(MSBuildProjectDirectory)\LICENSE" />
43+
<CollectFiles Include="$(MSBuildProjectDirectory)\README.rst" />
44+
</ItemGroup>
45+
46+
<Copy SourceFiles="@(CollectFiles)" DestinationFolder="$(DeployTmp)" />
47+
48+
<ItemGroup>
49+
<DeployFiles Include="$(DeployTmp)\**\*.*" />
50+
</ItemGroup>
51+
52+
<Zip Files="@(DeployFiles)"
53+
WorkingDirectory="$(DeployTmp)"
54+
ZipFileName="$(DeployFile)"
55+
ZipLevel="9" />
56+
57+
<RemoveDir Directories="$(DeployTmp)" />
58+
59+
</Target>
60+
61+
</Project>

Diff for: ‎MongoDBDriver2010.sln renamed to ‎MongoDB-CSharp-2010.sln

+58-33
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,42 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver", "MongoDBDriver\MongoDB.Driver.csproj", "{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}"
4+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{4345382B-FAA2-46E2-99CF-C90ACA2DD574}"
55
EndProject
6-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Packages", "Packages.mdproj", "{502F3381-58AA-461B-B9D8-12578A588C61}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{AEFFB75E-9365-4BC6-87E9-148CEECA0C0C}"
77
EndProject
8-
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "MongoDBDriverTranslation", "MongoDBDriverTranslation\MongoDBDriverTranslation.mdproj", "{DCBE47DD-59A6-4212-AA4A-142838088B69}"
8+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SimpleVB", "examples\SimpleVB\SimpleVB.vbproj", "{1BAAE3D8-7720-4AA5-9335-E59824E7B667}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Tests", "MongoDB.Net-Tests\MongoDB.Driver.Tests.csproj", "{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple", "examples\Simple\Simple.csproj", "{131BDB5F-5C6F-4AC7-B03E-394B1B75E120}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Linq", "MongoDB.Linq\MongoDB.Linq.csproj", "{2E48891E-72F9-445D-9A5A-DBA787BFFE9E}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB", "source\MongoDB\MongoDB.csproj", "{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Linq.Tests", "MongoDB.Linq.Tests\MongoDB.Linq.Tests.csproj", "{870FE8E1-3461-4C79-BF25-9C35E41BF582}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.GridFS", "source\MongoDB.GridFS\MongoDB.GridFS.csproj", "{B42DBBF9-0A1F-4749-9787-013BF8D8F435}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Benchmark", "MongoDB.Driver.Benchmark\MongoDB.Driver.Benchmark.csproj", "{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.GridFS.Tests", "source\MongoDB.GridFS.Tests\MongoDB.GridFS.Tests.csproj", "{0C293FE9-F670-4FEF-A60F-20F8C978B1CD}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.GridFS", "MongoDB.GridFS\MongoDB.GridFS.csproj", "{B42DBBF9-0A1F-4749-9787-013BF8D8F435}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Tests", "source\MongoDB.Tests\MongoDB.Tests.csproj", "{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}"
1919
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.GridFS.Tests", "MongoDB.GridFS.Tests\MongoDB.GridFS.Tests.csproj", "{0C293FE9-F670-4FEF-A60F-20F8C978B1CD}"
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmark", "tools\Benchmark\Benchmark.csproj", "{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}"
2121
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2424
Debug|Any CPU = Debug|Any CPU
2525
Release|Any CPU = Release|Any CPU
2626
EndGlobalSection
2727
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28+
{1BAAE3D8-7720-4AA5-9335-E59824E7B667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{1BAAE3D8-7720-4AA5-9335-E59824E7B667}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{1BAAE3D8-7720-4AA5-9335-E59824E7B667}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{1BAAE3D8-7720-4AA5-9335-E59824E7B667}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{131BDB5F-5C6F-4AC7-B03E-394B1B75E120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{131BDB5F-5C6F-4AC7-B03E-394B1B75E120}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{131BDB5F-5C6F-4AC7-B03E-394B1B75E120}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{131BDB5F-5C6F-4AC7-B03E-394B1B75E120}.Release|Any CPU.Build.0 = Release|Any CPU
2836
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2937
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
3038
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
3139
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{502F3381-58AA-461B-B9D8-12578A588C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{502F3381-58AA-461B-B9D8-12578A588C61}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{502F3381-58AA-461B-B9D8-12578A588C61}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{502F3381-58AA-461B-B9D8-12578A588C61}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{2E48891E-72F9-445D-9A5A-DBA787BFFE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{2E48891E-72F9-445D-9A5A-DBA787BFFE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{2E48891E-72F9-445D-9A5A-DBA787BFFE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{2E48891E-72F9-445D-9A5A-DBA787BFFE9E}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Release|Any CPU.Build.0 = Release|Any CPU
5640
{B42DBBF9-0A1F-4749-9787-013BF8D8F435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5741
{B42DBBF9-0A1F-4749-9787-013BF8D8F435}.Debug|Any CPU.Build.0 = Debug|Any CPU
5842
{B42DBBF9-0A1F-4749-9787-013BF8D8F435}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,10 +45,23 @@ Global
6145
{0C293FE9-F670-4FEF-A60F-20F8C978B1CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
6246
{0C293FE9-F670-4FEF-A60F-20F8C978B1CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
6347
{0C293FE9-F670-4FEF-A60F-20F8C978B1CD}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Release|Any CPU.Build.0 = Release|Any CPU
6456
EndGlobalSection
6557
GlobalSection(SolutionProperties) = preSolution
6658
HideSolutionNode = FALSE
6759
EndGlobalSection
60+
GlobalSection(NestedProjects) = preSolution
61+
{1BAAE3D8-7720-4AA5-9335-E59824E7B667} = {4345382B-FAA2-46E2-99CF-C90ACA2DD574}
62+
{131BDB5F-5C6F-4AC7-B03E-394B1B75E120} = {4345382B-FAA2-46E2-99CF-C90ACA2DD574}
63+
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B} = {AEFFB75E-9365-4BC6-87E9-148CEECA0C0C}
64+
EndGlobalSection
6865
GlobalSection(MonoDevelopProperties) = preSolution
6966
StartupItem = MongoDBDriver\MongoDB.Driver.csproj
7067
Policies = $0
@@ -84,8 +81,36 @@ Global
8481
$3.inheritsScope = text/plain
8582
$3.scope = text/x-csharp
8683
$0.CSharpFormattingPolicy = $4
84+
$4.IndentSwitchBody = True
85+
$4.MethodBraceStyle = EndOfLineWithoutSpace
86+
$4.BeforeMethodCallParentheses = False
87+
$4.BeforeMethodDeclarationParentheses = False
88+
$4.BeforeConstructorDeclarationParentheses = False
89+
$4.BeforeDelegateDeclarationParentheses = False
90+
$4.NewParentheses = False
91+
$4.MethodBraceStyle = EndOfLine
92+
$4.ConstructorBraceStyle = EndOfLine
93+
$4.DestructorBraceStyle = EndOfLine
94+
$4.BeforeMethodCallParentheses = False
95+
$4.BeforeMethodDeclarationParentheses = False
96+
$4.BeforeConstructorDeclarationParentheses = False
97+
$4.NewParentheses = False
98+
$4.IfParentheses = False
99+
$4.WhileParentheses = False
100+
$4.ForParentheses = False
101+
$4.ForeachParentheses = False
102+
$4.CatchParentheses = False
103+
$4.SwitchParentheses = False
104+
$4.LockParentheses = False
105+
$4.UsingParentheses = False
87106
$4.inheritsSet = Mono
88107
$4.inheritsScope = text/x-csharp
89108
$4.scope = text/x-csharp
109+
$0.TextStylePolicy = $5
110+
$5.FileWidth = 120
111+
$5.EolMarker = Windows
112+
$5.inheritsSet = VisualStudio
113+
$5.inheritsScope = text/plain
114+
$5.scope = text/x-vb
90115
EndGlobalSection
91116
EndGlobal

0 commit comments

Comments
 (0)