Skip to content

Commit

Permalink
Merge branch 'gridfs' of git://github.com/samus/mongodb-csharp
Browse files Browse the repository at this point in the history 
Conflicts:
	MongoDB.Driver.GridFS.Tests/obj/Debug/ResolveAssemblyReference.cache
	MongoDB.Driver.GridFS/GridFile.cs
	MongoDB.Driver.GridFS/MongoDB.Driver.GridFS.csproj
	MongoDB.Driver.GridFS/obj/Debug/ResolveAssemblyReference.cache
	MongoDBDriver.sln
	MongoDBDriver/MongoExceptions.cs
  • Loading branch information
@Sedward
Sedward committed Jan 10, 2010
1 parent 1687de0 commit 37e5ca4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 36 deletions.
19 changes: 7 additions & 12 deletions MongoDB.Driver.GridFS.Tests/MongoDB.Driver.GridFS.Tests.csproj
View file
Expand Up @@ -31,17 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MongoDB.Driver, Version=1.0.3635.36608, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\mongodb-csharp\MongoDBDriver\bin\Debug\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="nunit.core, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\API\NUnit\NUnit-2.5.0.9122\bin\net-2.0\lib\nunit.core.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.5.0.9122, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\API\NUnit\NUnit-2.5.0.9122\bin\net-2.0\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework">
<HintPath>..\redist\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand All @@ -65,9 +56,13 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj">
<Project>{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}</Project>
<Project>{BF6A8BCA-BED6-46D3-907F-91E076C55884}</Project>
<Name>MongoDB.Driver.GridFS</Name>
</ProjectReference>
<ProjectReference Include="..\MongoDBDriver\MongoDB.Driver.csproj">
<Project>{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}</Project>
<Name>MongoDB.Driver</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Binary file modified MongoDB.Driver.GridFS.Tests/obj/Debug/ResolveAssemblyReference.cache
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions MongoDB.Driver.GridFS/MongoDB.Driver.GridFS.csproj
View file
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}</ProjectGuid>
<ProjectGuid>{BF6A8BCA-BED6-46D3-907F-91E076C55884}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MongoDB.Driver.GridFS</RootNamespace>
Expand Down Expand Up @@ -47,8 +47,9 @@
<ItemGroup>
<Compile Include="GridChunk.cs" />
<Compile Include="GridFile.cs" />
<Compile Include="GridFileInfo.cs" />
<Compile Include="GridFileMode.cs" />
<Compile Include="GridFS.cs" />
<Compile Include="GridFileStream.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
Expand Down
32 changes: 10 additions & 22 deletions MongoDBDriver.sln
View file
Expand Up @@ -13,11 +13,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Linq", "MongoDB.Lin
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Linq.Tests", "MongoDB.Linq.Tests\MongoDB.Linq.Tests.csproj", "{870FE8E1-3461-4C79-BF25-9C35E41BF582}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS", "MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj", "{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Benchmark", "MongoDB.Driver.Benchmark\MongoDB.Driver.Benchmark.csproj", "{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS.Tests", "MongoDB.Driver.GridFS.Tests\MongoDB.Driver.GridFS.Tests.csproj", "{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Benchmark", "MongoDB.Driver.Benchmark\MongoDB.Driver.Benchmark.csproj", "{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.GridFS", "MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj", "{BF6A8BCA-BED6-46D3-907F-91E076C55884}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -29,14 +29,6 @@ Global
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B125BBA6-BFFD-44FA-9254-9B1754CD8AF3}.Release|Any CPU.Build.0 = Release|Any CPU
{502F3381-58AA-461B-B9D8-12578A588C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{502F3381-58AA-461B-B9D8-12578A588C61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{502F3381-58AA-461B-B9D8-12578A588C61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{502F3381-58AA-461B-B9D8-12578A588C61}.Release|Any CPU.Build.0 = Release|Any CPU
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCBE47DD-59A6-4212-AA4A-142838088B69}.Release|Any CPU.Build.0 = Release|Any CPU
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8BC95AB-25C6-4133-BC9F-8B6BB782CA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -49,18 +41,18 @@ Global
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Debug|Any CPU.Build.0 = Debug|Any CPU
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Release|Any CPU.ActiveCfg = Release|Any CPU
{870FE8E1-3461-4C79-BF25-9C35E41BF582}.Release|Any CPU.Build.0 = Release|Any CPU
{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39900451-C8CD-4221-ABA6-35B9C6D1D6D3}.Release|Any CPU.Build.0 = Release|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Release|Any CPU.Build.0 = Release|Any CPU
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5ACD68A0-0F2E-452A-90E3-3D1CB82C055B}.Release|Any CPU.Build.0 = Release|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E1ACAC5-C179-422B-8B20-74B6DA573A0E}.Release|Any CPU.Build.0 = Release|Any CPU
{BF6A8BCA-BED6-46D3-907F-91E076C55884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF6A8BCA-BED6-46D3-907F-91E076C55884}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF6A8BCA-BED6-46D3-907F-91E076C55884}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF6A8BCA-BED6-46D3-907F-91E076C55884}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -79,8 +71,4 @@ Global
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
version = 0.1
StartupItem = MongoDBDriver\MongoDB.Driver.csproj
EndGlobalSection
EndGlobal

0 comments on commit 37e5ca4

Please sign in to comment.