Permalink
Browse files

cleanup after merge

  • Loading branch information...
1 parent fa1b72a commit 34da6a932510f99ac4aa128a8108cc0a70abb09d @craiggwilson craiggwilson committed Apr 27, 2010
View
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
+<Properties><Property Name="Solution" Value="MongoDB-CSharp-2010">
+</Property><Property Name="Solution File" Value="C:\projects\mongodb-csharp\MongoDB-CSharp-2010.sln">
+</Property><Property Name="Date" Value="Tuesday, April 27, 2010">
+</Property><Property Name="Time" Value="15:04 PM">
+</Property></Properties><Event ErrorLevel="0" Project="SimpleVB" Source="examples\SimpleVB\SimpleVB.vbproj" Description="Project converted successfully">
+</Event><Event ErrorLevel="3" Project="SimpleVB" Source="examples\SimpleVB\SimpleVB.vbproj" Description="Converted">
+</Event><Event ErrorLevel="0" Project="Simple" Source="examples\Simple\Simple.csproj" Description="Project converted successfully">
+</Event><Event ErrorLevel="3" Project="Simple" Source="examples\Simple\Simple.csproj" Description="Converted">
+</Event><Event ErrorLevel="0" Project="MongoDB" Source="source\MongoDB\MongoDB.csproj" Description="The project file does not require conversion.">
+</Event><Event ErrorLevel="3" Project="MongoDB" Source="source\MongoDB\MongoDB.csproj" Description="No Conversion Required">
+</Event><Event ErrorLevel="0" Project="MongoDB.GridFS" Source="source\MongoDB.GridFS\MongoDB.GridFS.csproj" Description="The project file does not require conversion.">
+</Event><Event ErrorLevel="3" Project="MongoDB.GridFS" Source="source\MongoDB.GridFS\MongoDB.GridFS.csproj" Description="No Conversion Required">
+</Event><Event ErrorLevel="0" Project="MongoDB.GridFS.Tests" Source="source\MongoDB.GridFS.Tests\MongoDB.GridFS.Tests.csproj" Description="The project file does not require conversion.">
+</Event><Event ErrorLevel="3" Project="MongoDB.GridFS.Tests" Source="source\MongoDB.GridFS.Tests\MongoDB.GridFS.Tests.csproj" Description="No Conversion Required">
+</Event><Event ErrorLevel="0" Project="MongoDB.Tests" Source="source\MongoDB.Tests\MongoDB.Tests.csproj" Description="The project file does not require conversion.">
+</Event><Event ErrorLevel="3" Project="MongoDB.Tests" Source="source\MongoDB.Tests\MongoDB.Tests.csproj" Description="No Conversion Required">
+</Event><Event ErrorLevel="0" Project="Benchmark" Source="tools\Benchmark\Benchmark.csproj" Description="The project file does not require conversion.">
+</Event><Event ErrorLevel="3" Project="Benchmark" Source="tools\Benchmark\Benchmark.csproj" Description="No Conversion Required">
+</Event><Event ErrorLevel="0" Project="" Source="MongoDB-CSharp-2010.sln" Description="The solution file does not require conversion.">
+</Event><Event ErrorLevel="3" Project="" Source="MongoDB-CSharp-2010.sln" Description="No Conversion Required">
+</Event><Event ErrorLevel="0" Project="SimpleVB" Source="examples\SimpleVB\SimpleVB.vbproj" Description="Scan complete: Upgrade not required for project files.">
+</Event><Event ErrorLevel="0" Project="Simple" Source="examples\Simple\Simple.csproj" Description="Scan complete: Upgrade not required for project files.">
+</Event></UpgradeLog>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +10,25 @@
<RootNamespace>Simple</RootNamespace>
<AssemblyName>Simple</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -19,13 +38,15 @@
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -48,4 +69,21 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,25 @@
<OptionInfer>On</OptionInfer>
<AssemblyName>SimpleVB</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -20,13 +39,17 @@
<DefineTrace>false</DefineTrace>
<AdditionalParameters />
<DefineDebug>false</DefineDebug>
+ <NoWarn>42353,42354,42355</NoWarn>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<DefineTrace>false</DefineTrace>
<AdditionalParameters />
<DefineDebug>false</DefineDebug>
+ <NoWarn>42353,42354,42355</NoWarn>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
@@ -50,5 +73,22 @@
<ItemGroup>
<Folder Include="My Project\" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
</Project>
@@ -4,11 +4,11 @@
using System.Text;
using System.Text.RegularExpressions;
-using MongoDB.Driver.Linq;
+using MongoDB.Linq;
using NUnit.Framework;
-namespace MongoDB.Driver.IntegrationTests.Linq
+namespace MongoDB.IntegrationTests.Linq
{
[TestFixture]
public class MapReduceTests : LinqTestsBase
@@ -2,10 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using MongoDB.Driver.Linq.Expressions;
+using MongoDB.Linq.Expressions;
using System.Linq.Expressions;
-namespace MongoDB.Driver.Linq
+namespace MongoDB.Linq
{
internal class AggregateRewriter : MongoExpressionVisitor
{
@@ -4,7 +4,7 @@
using System.Text;
using System.Linq.Expressions;
-namespace MongoDB.Driver.Linq.Expressions
+namespace MongoDB.Linq.Expressions
{
internal class AggregateSubqueryExpression : Expression
{
@@ -4,7 +4,7 @@
using System.Text;
using System.Linq.Expressions;
-namespace MongoDB.Driver.Linq.Expressions
+namespace MongoDB.Linq.Expressions
{
internal class FieldDeclaration
{
@@ -5,7 +5,7 @@
using System.Linq.Expressions;
using System.Collections.ObjectModel;
-namespace MongoDB.Driver.Linq.Expressions
+namespace MongoDB.Linq.Expressions
{
internal class FindExpression : Expression
{
@@ -3,7 +3,7 @@
using System.Linq;
using System.Text;
-namespace MongoDB.Driver.Linq.Expressions
+namespace MongoDB.Linq.Expressions
{
internal class ScalarExpression : SubqueryExpression
{
@@ -4,7 +4,7 @@
using System.Text;
using System.Linq.Expressions;
-namespace MongoDB.Driver.Linq.Expressions
+namespace MongoDB.Linq.Expressions
{
internal abstract class SubqueryExpression : Expression
{
@@ -4,10 +4,10 @@
using System.Linq.Expressions;
using System.Text;
-using MongoDB.Driver.Linq.Expressions;
+using MongoDB.Linq.Expressions;
using System.Collections.ObjectModel;
-namespace MongoDB.Driver.Linq
+namespace MongoDB.Linq
{
internal class FindMerger : MongoExpressionVisitor
{
@@ -4,7 +4,7 @@
using System.Linq;
using System.Text;
-namespace MongoDB.Driver.Linq
+namespace MongoDB.Linq
{
public class Grouping<TKey, TElement> : IGrouping<TKey, TElement>
{
@@ -2,10 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
-using MongoDB.Driver.Linq.Expressions;
+using MongoDB.Linq.Expressions;
using System.Linq.Expressions;
-namespace MongoDB.Driver.Linq
+namespace MongoDB.Linq
{
internal class UnusedFieldRemover : MongoExpressionVisitor
{
@@ -26,7 +26,7 @@ protected override Expression VisitField(FieldExpression field)
protected override Expression VisitSubquery(SubqueryExpression subquery)
{
if (subquery.NodeType == (ExpressionType)MongoExpressionType.Scalar && subquery.Find != null)
- MarkColumnAsUsed(subquery.Find.Alias, subquery.Find.Fields[0].Name);
+ MarkFieldAsUsed(subquery.Find.Alias, subquery.Find.Fields[0].Name);
return base.VisitSubquery(subquery);
}
@@ -49,7 +49,7 @@ private void MarkFieldAsUsed(string alias, string name)
{
HashSet<string> fields;
if (!_allFieldsUsed.TryGetValue(alias, out fields))
- _allFieldsUsed.Add(fields = new HashSet<string>());
+ _allFieldsUsed.Add(alias, fields = new HashSet<string>());
fields.Add(name);
}
}

0 comments on commit 34da6a9

Please sign in to comment.