Some issues compiling for .NET 4.0 & Silverlight

git-svn-id: http://moq.googlecode.com/svn/trunk@639 b33fba48-7441-0410-8d5c-f397f7ceaa6c
devlooped · Nov 6, 2009 · da4710b · da4710b
1 parent 3d82ba9
commit da4710b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 32 deletions.
diff --git a/Moq.sln b/Moq.sln
@@ -16,10 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Silverlight", "Source.S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Silverlight.Tests", "UnitTests.Silverlight\Moq.Silverlight.Tests.csproj", "{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Visualizer", "Visualizer\Moq.Visualizer.csproj", "{335EAF40-60EF-40D7-84A8-E33D255FA59F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Visualizer.Tests", "UnitTests.Visualizer\Moq.Visualizer.Tests.csproj", "{A84563A0-8A70-43D9-A1C0-530955413318}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,16 +54,6 @@ Global
 		{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
-		{335EAF40-60EF-40D7-84A8-E33D255FA59F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{335EAF40-60EF-40D7-84A8-E33D255FA59F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{335EAF40-60EF-40D7-84A8-E33D255FA59F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{335EAF40-60EF-40D7-84A8-E33D255FA59F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{335EAF40-60EF-40D7-84A8-E33D255FA59F}.Release|x86.ActiveCfg = Release|Any CPU
-		{A84563A0-8A70-43D9-A1C0-530955413318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A84563A0-8A70-43D9-A1C0-530955413318}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A84563A0-8A70-43D9-A1C0-530955413318}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A84563A0-8A70-43D9-A1C0-530955413318}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A84563A0-8A70-43D9-A1C0-530955413318}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Source.Silverlight/Moq.Silverlight.csproj b/Source.Silverlight/Moq.Silverlight.csproj
@@ -42,7 +42,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;NET35</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>

diff --git a/Source/Match.cs b/Source/Match.cs
@@ -138,7 +138,7 @@ internal static Match<TValue> SetLastMatch<TValue>(Match<TValue> match)
 	internal class MatchExpression : Expression
 	{
 		public MatchExpression(Match match)
-#if NET35
+#if NET35 || SILVERLIGHT
 			: base(ExpressionType.Call, typeof(Match))
 #endif
 		{
@@ -147,7 +147,7 @@ public MatchExpression(Match match)
 
 		public Match Match { get; private set; }
 
-#if !NET35
+#if !NET35 && !SILVERLIGHT
 		public override ExpressionType NodeType
 		{
 			get { return ExpressionType.Call; }

diff --git a/Source/Microsoft/Delegates.cs b/Source/Microsoft/Delegates.cs
@@ -1,4 +1,4 @@
-#if NET35
+#if NET35 || SILVERLIGHT
 using System.Diagnostics.CodeAnalysis;
 
 namespace System

diff --git a/Source/Microsoft/Delegates.tt b/Source/Microsoft/Delegates.tt
@@ -2,7 +2,7 @@
 <#@ output extension=".cs" #>
 <#@ Assembly Name="System.Core" #>
 <#@ Import Namespace="System.Linq" #>
-#if NET35
+#if NET35 || SILVERLIGHT
 using System.Diagnostics.CodeAnalysis;
 
 namespace System

diff --git a/Source/Microsoft/ExpressionVisitor.cs b/Source/Microsoft/ExpressionVisitor.cs
@@ -1,6 +1,6 @@
 // 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
+#if NET35 || SILVERLIGHT
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

diff --git a/UnitTests.Visualizer/Moq.Visualizer.Tests.csproj b/UnitTests.Visualizer/Moq.Visualizer.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Moq.Visualizer.Tests</RootNamespace>
     <AssemblyName>Moq.Visualizer.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Moq.snk</AssemblyOriginatorKeyFile>
@@ -33,6 +33,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,10 +76,6 @@
       <Project>{1C91AC30-5977-4BE5-BA67-8EB186C03514}</Project>
       <Name>Moq</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Visualizer\Moq.Visualizer.csproj">
-      <Project>{335EAF40-60EF-40D7-84A8-E33D255FA59F}</Project>
-      <Name>Moq.Visualizer</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Moq.snk">

diff --git a/Visualizer/Moq.Visualizer.csproj b/Visualizer/Moq.Visualizer.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Moq.Visualizer</RootNamespace>
     <AssemblyName>Moq.Visualizer</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Moq.snk</AssemblyOriginatorKeyFile>
@@ -33,6 +33,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -105,12 +106,6 @@
       <DependentUpon>MockVisualizerView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Source\Moq.csproj">
-      <Project>{1C91AC30-5977-4BE5-BA67-8EB186C03514}</Project>
-      <Name>Moq</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="MockVisualizerView.xaml">
       <SubType>Designer</SubType>
@@ -155,6 +150,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Source\Moq.csproj">
+      <Project>{1C91AC30-5977-4BE5-BA67-8EB186C03514}</Project>
+      <Name>Moq</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. 
        Other similar extension points exist, see Microsoft.Common.targets.