Attempted to fix CI build

git-svn-id: http://moq.googlecode.com/svn/trunk@748 b33fba48-7441-0410-8d5c-f397f7ceaa6c
devlooped · Aug 17, 2010 · 3c15dee · 3c15dee
1 parent 97376da
commit 3c15dee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Moq-CI.msbuild b/Moq-CI.msbuild
@@ -3,6 +3,6 @@
 		<MSBuild
 			Projects="Moq.sln"
 			Targets="Build"
-			Properties="Configuration=Release;TrackFileAccess=False"/>
+			Properties="Configuration=Release;TrackFileAccess=False;DefineConstants=TRACE;CODE_ANALYSIS;SERVER"/>
 	</Target>
 </Project>
diff --git a/Moq.sln b/Moq.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5A5B8C3-D43F-43C6-AEC7-6FA7C35B8BE9}"
 	ProjectSection(SolutionItems) = preProject
 		Changelog.txt = Changelog.txt
+		..\build\drop.cmd = ..\build\drop.cmd
 		License.txt = License.txt
+		Moq-CI.msbuild = Moq-CI.msbuild
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Silverlight", "Silverlight", "{48EC9EB4-F52B-4404-89D7-5804E17B24D0}"

diff --git a/UnitTests/Moq.Tests.csproj b/UnitTests/Moq.Tests.csproj
@@ -22,7 +22,7 @@
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants>
-    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">TRACE;DEBUG;DESKTOP;NET3x</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">$(DefineConstants);NET3x</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -32,7 +32,7 @@
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE;DESKTOP</DefineConstants>
-    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">TRACE;DESKTOP;NET3x</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">$(DefineConstants);NET3x</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DebugSymbols>true</DebugSymbols>

diff --git a/UnitTests/Regressions/IssueReportsFixture.cs b/UnitTests/Regressions/IssueReportsFixture.cs
@@ -1654,7 +1654,7 @@ public void ShouldMockInteropDTE()
 				Assert.NotNull(dte.Object);
 			}
 
-#if !NET3x
+#if !NET3x && !SERVER
 			[Fact]
 			public void ShouldRaiseEventOnInteropInterface()
 			{