[Dotnetmock-commits] dotnetmock DotNetMock.build,1.14,1.15 DotNetMock.sln,1.14,1.15

[Choy R. <ch...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14691

Modified Files:
	DotNetMock.build DotNetMock.sln 
Log Message:
Merged changes in from branch RFE_1098585.
* Had a little trouble with the new sn -Vr stuff. I don't normally develop under administrative id. So had to added target skip-verification run as administrator. then ran tests. all pass.

Index: DotNetMock.sln
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.sln,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DotNetMock.sln	10 Oct 2004 07:56:43 -0000	1.14
--- DotNetMock.sln	29 Jan 2005 09:13:32 -0000	1.15
***************
*** 36,39 ****
--- 36,43 ----
  	EndProjectSection
  EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.TestFramework.Tests", "DotNetMock.TestFramework.Tests\DotNetMock.TestFramework.Tests.csproj", "{6C2904D4-ADCC-4980-AED0-64A8C6F3AF69}"
+ 	ProjectSection(ProjectDependencies) = postProject
+ 	EndProjectSection
+ EndProject
  Global
  	GlobalSection(SolutionConfiguration) = preSolution
***************
*** 78,81 ****
--- 82,89 ----
  		{C7009DB3-7238-4608-AB9A-DB4927361898}.Release.ActiveCfg = Release|.NET
  		{C7009DB3-7238-4608-AB9A-DB4927361898}.Release.Build.0 = Release|.NET
+ 		{6C2904D4-ADCC-4980-AED0-64A8C6F3AF69}.Debug.ActiveCfg = Debug|.NET
+ 		{6C2904D4-ADCC-4980-AED0-64A8C6F3AF69}.Debug.Build.0 = Debug|.NET
+ 		{6C2904D4-ADCC-4980-AED0-64A8C6F3AF69}.Release.ActiveCfg = Release|.NET
+ 		{6C2904D4-ADCC-4980-AED0-64A8C6F3AF69}.Release.Build.0 = Release|.NET
  	EndGlobalSection
  	GlobalSection(ExtensibilityGlobals) = postSolution

Index: DotNetMock.build
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.build,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DotNetMock.build	27 Jan 2005 05:22:02 -0000	1.14
--- DotNetMock.build	29 Jan 2005 09:13:31 -0000	1.15
***************
*** 36,39 ****
--- 36,40 ----
  			<test assemblyname="${build.dir}/DotNetMock.Framework.Tests.dll"/>
  			<test assemblyname="${build.dir}/DotNetMock.Examples.dll"/>
+ 			<test assemblyname="${build.dir}/DotNetMock.TestFramework.Tests.dll"/>
  		</nunit2>
  	</target>
***************
*** 131,134 ****
--- 132,148 ----
  			</fileset>
  		</copy>
+ 		<csc target="library" output="${build.dir}/DotNetMock.TestFramework.Tests.dll" debug="${debug}">
+ 			<sources basedir=".">
+ 				<includes name="DotNetMock.TestFramework.Tests/**/*.cs"/>
+ 			</sources>
+ 			<references basedir=".">
+ 				<includes name="lib/nunit.framework.dll"/>
+ 				<includes name="build/DotNetMock.dll"/>
+ 				<includes name="build/DotNetMock.Core.dll"/>
+ 			</references>
+ 		</csc>
+ 	</target>
+ 	<target name="skip-verification"
+ 		description="Register DotNetMock assemblies for verification skipping">
  		<exec program="sn" commandline="-Vr ${build.dir}/DotNetMock.Core.dll"/>
  		<exec program="sn" commandline="-Vr ${build.dir}/DotNetMock.dll"/>