diff --git a/Moq.sln b/Moq.sln
index 574db7ba4..1103ac11c 100644
--- a/Moq.sln
+++ b/Moq.sln
@@ -20,72 +20,36 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
-		Debug35|Any CPU = Debug35|Any CPU
-		Debug35|x86 = Debug35|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
-		Release35|Any CPU = Release35|Any CPU
-		Release35|x86 = Release35|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug35|Any CPU.Build.0 = Debug35|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug35|x86.ActiveCfg = Debug35|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.ActiveCfg = Release|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release35|Any CPU.Build.0 = Release35|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release35|x86.ActiveCfg = Release35|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.ActiveCfg = Debug|x86
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.Build.0 = Debug|x86
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug35|Any CPU.Build.0 = Debug35|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug35|x86.ActiveCfg = Debug35|x86
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug35|x86.Build.0 = Debug35|x86
+		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.ActiveCfg = Release|x86
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.Build.0 = Release|x86
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release35|Any CPU.Build.0 = Release35|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release35|x86.ActiveCfg = Release35|x86
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release35|x86.Build.0 = Release35|x86
+		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.ActiveCfg = Release|Any CPU
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug|x86.ActiveCfg = Debug|x86
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug|x86.Build.0 = Debug|x86
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug35|Any CPU.Build.0 = Debug35|Any CPU
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug35|x86.ActiveCfg = Debug35|x86
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Debug35|x86.Build.0 = Debug35|x86
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release|x86.ActiveCfg = Release|Any CPU
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release35|Any CPU.Build.0 = Release35|Any CPU
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release35|x86.ActiveCfg = Release35|x86
-		{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}.Release35|x86.Build.0 = Release35|x86
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug|x86.ActiveCfg = Debug|x86
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug|x86.Build.0 = Debug|x86
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug35|Any CPU.Build.0 = Debug35|Any CPU
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug35|x86.ActiveCfg = Debug35|x86
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Debug35|x86.Build.0 = Debug35|x86
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release|x86.ActiveCfg = Release|Any CPU
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release35|Any CPU.Build.0 = Release35|Any CPU
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release35|x86.ActiveCfg = Release35|x86
-		{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}.Release35|x86.Build.0 = Release35|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source.Silverlight/Moq.Silverlight.csproj b/Source.Silverlight/Moq.Silverlight.csproj
index d051a8ffb..de0b4b5aa 100644
--- a/Source.Silverlight/Moq.Silverlight.csproj
+++ b/Source.Silverlight/Moq.Silverlight.csproj
@@ -240,6 +240,9 @@
     <Compile Include="..\Source\Matchers\PredicateMatcher.cs">
       <Link>Matchers\PredicateMatcher.cs</Link>
     </Compile>
+    <Compile Include="..\Source\MatchExpression.Silverlight.cs">
+      <Link>MatchExpression.Silverlight.cs</Link>
+    </Compile>
     <Compile Include="..\Source\MemberInfoExtensions.cs">
       <Link>MemberInfoExtensions.cs</Link>
     </Compile>
@@ -413,78 +416,6 @@
     <TargetFrameworkSDKDirectory>$(SilverlightBuildResources)Libraries\Client\</TargetFrameworkSDKDirectory>
     <SilverlightRuntimeVersion>2.0.31005.0</SilverlightRuntimeVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug35|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug35\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SILVERLIGHT</DefineConstants>
-    <DocumentationFile>bin\Debug\Moq.Silverlight.xml</DocumentationFile>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Moq.Silverlight.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Debug35\Moq.Silverlight.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <NoConfig>true</NoConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug35|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug35\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
-    <DocumentationFile>bin\Debug\Moq.Silverlight.xml</DocumentationFile>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Moq.Silverlight.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\x86\Debug35\Moq.Silverlight.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release35|AnyCPU'">
-    <OutputPath>bin\Release35\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;NET35</DefineConstants>
-    <DocumentationFile>bin\Release\Moq.Silverlight.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Moq.Silverlight.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Release35\Moq.Silverlight.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <NoConfig>true</NoConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release35|x86'">
-    <OutputPath>bin\x86\Release35\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
-    <DocumentationFile>bin\Release\Moq.Silverlight.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Moq.Silverlight.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\x86\Release35\Moq.Silverlight.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
   <Import Project="$(SilverlightBuildResources)MSBuild\Microsoft.Silverlight.CSharp.targets" />
   <!--<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" />-->
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Source/Match.cs b/Source/Match.cs
index a16840dfd..e65f0df72 100644
--- a/Source/Match.cs
+++ b/Source/Match.cs
@@ -134,29 +134,4 @@ internal static Match<TValue> SetLastMatch<TValue>(Match<TValue> match)
 			return match;
 		}
 	}
-
-	internal class MatchExpression : Expression
-	{
-		public MatchExpression(Match match)
-#if NET35 || SILVERLIGHT
-			: base(ExpressionType.Call, typeof(Match))
-#endif
-		{
-			this.Match = match;
-		}
-
-		public Match Match { get; private set; }
-
-#if !NET35 && !SILVERLIGHT
-		public override ExpressionType NodeType
-		{
-			get { return ExpressionType.Call; }
-		}
-
-		public override Type Type
-		{
-			get { return typeof(Match); }
-		}
-#endif
-	}
 }
\ No newline at end of file
diff --git a/Source/MatchExpression.Silverlight.cs b/Source/MatchExpression.Silverlight.cs
new file mode 100644
index 000000000..6785e79df
--- /dev/null
+++ b/Source/MatchExpression.Silverlight.cs
@@ -0,0 +1,55 @@
+//Copyright (c) 2007. Clarius Consulting, Manas Technology Solutions, InSTEDD
+//http://code.google.com/p/moq/
+//All rights reserved.
+
+//Redistribution and use in source and binary forms, 
+//with or without modification, are permitted provided 
+//that the following conditions are met:
+
+//    * Redistributions of source code must retain the 
+//    above copyright notice, this list of conditions and 
+//    the following disclaimer.
+
+//    * Redistributions in binary form must reproduce 
+//    the above copyright notice, this list of conditions 
+//    and the following disclaimer in the documentation 
+//    and/or other materials provided with the distribution.
+
+//    * Neither the name of Clarius Consulting, Manas Technology Solutions or InSTEDD nor the 
+//    names of its contributors may be used to endorse 
+//    or promote products derived from this software 
+//    without specific prior written permission.
+
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+//CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+//INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+//MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+//DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+//SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+//SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+//INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+//WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+//OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+//SUCH DAMAGE.
+
+//[This is the BSD license, see
+// http://www.opensource.org/licenses/bsd-license.php]
+
+using System.Linq.Expressions;
+
+namespace Moq
+{
+	internal class MatchExpression : Expression
+	{
+		public MatchExpression(Match match)
+			: base(ExpressionType.Call, typeof(Match))
+		{
+			this.Match = match;
+		}
+
+		public Match Match { get; private set; }
+	}
+}
\ No newline at end of file
diff --git a/Source/MatchExpression.cs b/Source/MatchExpression.cs
new file mode 100644
index 000000000..b77e0dd80
--- /dev/null
+++ b/Source/MatchExpression.cs
@@ -0,0 +1,65 @@
+//Copyright (c) 2007. Clarius Consulting, Manas Technology Solutions, InSTEDD
+//http://code.google.com/p/moq/
+//All rights reserved.
+
+//Redistribution and use in source and binary forms, 
+//with or without modification, are permitted provided 
+//that the following conditions are met:
+
+//    * Redistributions of source code must retain the 
+//    above copyright notice, this list of conditions and 
+//    the following disclaimer.
+
+//    * Redistributions in binary form must reproduce 
+//    the above copyright notice, this list of conditions 
+//    and the following disclaimer in the documentation 
+//    and/or other materials provided with the distribution.
+
+//    * Neither the name of Clarius Consulting, Manas Technology Solutions or InSTEDD nor the 
+//    names of its contributors may be used to endorse 
+//    or promote products derived from this software 
+//    without specific prior written permission.
+
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+//CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+//INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+//MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+//DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+//SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+//SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+//INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+//WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+//OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+//SUCH DAMAGE.
+
+//[This is the BSD license, see
+// http://www.opensource.org/licenses/bsd-license.php]
+
+using System;
+using System.Linq.Expressions;
+
+namespace Moq
+{
+	internal class MatchExpression : Expression
+	{
+		public MatchExpression(Match match)
+		{
+			this.Match = match;
+		}
+
+		public Match Match { get; private set; }
+
+		public override ExpressionType NodeType
+		{
+			get { return ExpressionType.Call; }
+		}
+
+		public override Type Type
+		{
+			get { return typeof(Match); }
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Microsoft/Delegates.cs b/Source/Microsoft/Delegates.cs
index aecaedbe9..197970d79 100644
--- a/Source/Microsoft/Delegates.cs
+++ b/Source/Microsoft/Delegates.cs
@@ -1,5 +1,4 @@
-#if NET35 || SILVERLIGHT
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
 namespace System
 {
@@ -676,4 +675,3 @@ namespace System
 	public delegate TResult Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, T11 arg11, T12 arg12, T13 arg13, T14 arg14, T15 arg15, T16 arg16);
 
 }
-#endif
diff --git a/Source/Microsoft/Delegates.tt b/Source/Microsoft/Delegates.tt
index 3983d8bb6..08cabb12e 100644
--- a/Source/Microsoft/Delegates.tt
+++ b/Source/Microsoft/Delegates.tt
@@ -2,7 +2,6 @@
 <#@ output extension=".cs" #>
 <#@ Assembly Name="System.Core" #>
 <#@ Import Namespace="System.Linq" #>
-#if NET35 || SILVERLIGHT
 using System.Diagnostics.CodeAnalysis;
 
 namespace System
@@ -62,5 +61,4 @@ for (var typeCount = GenericTypeMin; typeCount <= GenericTypeMax; typeCount++)
 }
 #>
 }
-#endif
 <#@ Include File="..\Includes\GenericTypeParameters.tt" #>
\ No newline at end of file
diff --git a/Source/Microsoft/ExpressionVisitor.cs b/Source/Microsoft/ExpressionVisitor.cs
index 615cbf55b..2beb62bc8 100644
--- a/Source/Microsoft/ExpressionVisitor.cs
+++ b/Source/Microsoft/ExpressionVisitor.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // This source code is made available under the terms of the Microsoft Public License (MS-PL)
-#if NET35 || SILVERLIGHT
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -496,5 +495,4 @@ private Expression VisitUnknown(Expression node)
 				node.NodeType));
 		}
 	}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Source/Moq.csproj b/Source/Moq.csproj
index 5acc6afa6..43364d916 100644
--- a/Source/Moq.csproj
+++ b/Source/Moq.csproj
@@ -44,45 +44,6 @@
     <DebugSymbols>true</DebugSymbols>
     <CodeAnalysisRuleSet>Migrated rules for Moq.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug35|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug35\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DESKTOP;NET35</DefineConstants>
-    <DocumentationFile>bin\Debug\Moq.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Moq.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Debug35\Moq.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release35|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Release35\</OutputPath>
-    <DefineConstants>CODE_ANALYSIS;TRACE;NET35</DefineConstants>
-    <DocumentationFile>bin\Release\Moq.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <CodeAnalysisLogFile>bin\Release\Moq.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Release35\Moq.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Migrated rules for Moq.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -97,6 +58,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MatchExpression.Silverlight.cs" Condition=" '$(TargetFrameworkVersion)' == 'v3.5'" />
+    <Compile Include="MatchExpression.cs" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
     <Compile Include="EmptyDefaultValueProvider.cs" />
     <Compile Include="ExpressionStringBuilder.cs" />
     <Compile Include="Language\ICallback.cs">
@@ -124,12 +87,12 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>MethodCallReturn.tt</DependentUpon>
     </Compile>
-    <Compile Include="Microsoft\Delegates.cs">
+    <Compile Include="Microsoft\Delegates.cs" Condition=" '$(TargetFrameworkVersion)' == 'v3.5'">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Delegates.tt</DependentUpon>
     </Compile>
-    <Compile Include="Microsoft\ExpressionVisitor.cs" />
+    <Compile Include="Microsoft\ExpressionVisitor.cs" Condition=" '$(TargetFrameworkVersion)' == 'v3.5'" />
     <Compile Include="SetupKind.cs" />
     <Compile Include="Language\Flow\IReturnsResult.cs" />
     <Compile Include="MatcherAttribute.cs" />
@@ -209,7 +172,7 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MethodCallReturn.Generated.cs</LastGenOutput>
     </None>
-    <None Include="Microsoft\Delegates.tt">
+    <None Include="Microsoft\Delegates.tt" Condition=" '$(TargetFrameworkVersion)' == 'v3.5'">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Delegates.cs</LastGenOutput>
     </None>
diff --git a/Tools/ILMerge.doc b/Tools/ILMerge.doc
index 1b8511417..0dd2bd2c9 100644
Binary files a/Tools/ILMerge.doc and b/Tools/ILMerge.doc differ
diff --git a/Tools/ILMerge.exe b/Tools/ILMerge.exe
index ab9fb5bf2..bdfa718c6 100644
Binary files a/Tools/ILMerge.exe and b/Tools/ILMerge.exe differ
diff --git a/UnitTests.Silverlight/Moq.Silverlight.Tests.csproj b/UnitTests.Silverlight/Moq.Silverlight.Tests.csproj
index 03c30c65b..7f1186c02 100644
--- a/UnitTests.Silverlight/Moq.Silverlight.Tests.csproj
+++ b/UnitTests.Silverlight/Moq.Silverlight.Tests.csproj
@@ -236,72 +236,6 @@
     <TargetFrameworkSDKDirectory>$(SilverlightBuildResources)Libraries\Client\</TargetFrameworkSDKDirectory>
     <SilverlightRuntimeVersion>2.0.31005.0</SilverlightRuntimeVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug35|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug35\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Moq.Silverlight.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Debug35\Moq.Silverlight.Tests.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <NoConfig>true</NoConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug35|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug35\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT</DefineConstants>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\x86\Debug\Moq.Silverlight.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\x86\Debug35\Moq.Silverlight.Tests.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release35|AnyCPU'">
-    <OutputPath>bin\Release35\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Moq.Silverlight.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Release35\Moq.Silverlight.Tests.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <NoConfig>true</NoConfig>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release35|x86'">
-    <OutputPath>bin\x86\Release35\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisLogFile>bin\x86\Release\Moq.Silverlight.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\x86\Release35\Moq.Silverlight.Tests.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
   <Import Project="$(SilverlightBuildResources)MSBuild\Microsoft.Silverlight.CSharp.targets" />
   <!--<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" />-->
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/UnitTests/Moq.Tests.csproj b/UnitTests/Moq.Tests.csproj
index ea37d07bf..66eb702ca 100644
--- a/UnitTests/Moq.Tests.csproj
+++ b/UnitTests/Moq.Tests.csproj
@@ -36,39 +36,6 @@
     <DebugSymbols>true</DebugSymbols>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug35|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug35\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DESKTOP;NET35</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Moq.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Debug35\Moq.Tests.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release35|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Release35\</OutputPath>
-    <DefineConstants>TRACE;DESKTOP</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Moq.Tests.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisInputAssembly>bin\Release35\Moq.Tests.dll</CodeAnalysisInputAssembly>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>