From: Griffin C. <gc...@us...> - 2005-02-05 21:13:04
|
Update of /cvsroot/dotnetmock/dotnetmock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2065 Modified Files: DotNetMock.build Added Files: CommonAssemblyInfo.cs StrongCommonAssemblyInfo.cs Log Message: - Re-added nunit.framework for direct unit tests - Removed individual AssemblyInfo files - Added CommonAssemblyInfo files. - Moved strong naming into release & debug builds --- NEW FILE: StrongCommonAssemblyInfo.cs --- using System; using System.Reflection; using System.Runtime.InteropServices; // Marks CLS Compliance [assembly:CLSCompliant(true)] // Marks COM Visibility to false. We don't want COM clients to use this assembly [assembly:ComVisible(false)] // Sets assembly version [assembly: AssemblyVersion("0.7.4.0")] // Delay signs assemblies [assembly:AssemblyKeyFileAttribute("dotnetmock.ket")] Index: DotNetMock.build =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.build,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DotNetMock.build 1 Feb 2005 23:24:17 -0000 1.16 --- DotNetMock.build 5 Feb 2005 21:12:49 -0000 1.17 *************** *** 1,9 **** ! <project name=".NET Mock Objects master build file"> <description>Master build file for .NET Mock Objects project</description> ! <property name="debug" value="false"/> <property name="VisualStudioTemplates" value="VisualStudioTemplates"/> <property name="VisualStudioTemplates2003" value="VisualStudioTemplates2003"/> <property name="project.name" value="DotNetMock"/> ! <property name="version" value="0.7.3"/> <property name="build.dir" value="build/"/> <property name="dist.dir" value="dist"/> --- 1,10 ---- ! <project name=".NET Mock Objects master build file" default="test"> <description>Master build file for .NET Mock Objects project</description> ! <property name="project.config" value="debug"/> ! <property name="debug.build" value="true"/> <property name="VisualStudioTemplates" value="VisualStudioTemplates"/> <property name="VisualStudioTemplates2003" value="VisualStudioTemplates2003"/> <property name="project.name" value="DotNetMock"/> ! <property name="version" value="0.7.4"/> <property name="build.dir" value="build/"/> <property name="dist.dir" value="dist"/> *************** *** 13,20 **** <property name="doc.dir" value="${package.dir}/doc/" /> <property name="lib.dir" value="lib/"/> ! <tstamp/> <target name="init" description="Setup environment"> <mkdir dir="${build.dir}" failonerror="false"/> </target> <target name="clean" description="Cleans project to pre-build state"> --- 14,31 ---- <property name="doc.dir" value="${package.dir}/doc/" /> <property name="lib.dir" value="lib/"/> ! <tstamp/> + + <target name="debug" description="Perform a 'debug' build"> + <property name="build.assemblyInfo" value="CommonAssemblyInfo.cs"/> + </target> + + <target name="release" description="Perform a 'release' build"> + <property name="build.assemblyInfo" value="StrongCommonAssemblyInfo.cs"/> + </target> + <target name="init" description="Setup environment"> <mkdir dir="${build.dir}" failonerror="false"/> + <call target="${project.config}" /> </target> <target name="clean" description="Cleans project to pre-build state"> *************** *** 40,50 **** </target> <target name="build" description="Builds .NET Mock Object modules" depends="init"> ! <csc target="library" output="${build.dir}/DotNetMock.Core.dll" debug="${debug}" doc="${build.dir}\DotNetMock.Core.xml"> <sources basedir="."> <includes name="DotNetMock.Core/**/*.cs"/> </sources> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.dll" debug="${debug}" doc="${build.dir}\DotNetMock.xml"> <sources basedir="."> <includes name="DotNetMock/**/*.cs"/> </sources> --- 51,63 ---- </target> <target name="build" description="Builds .NET Mock Object modules" depends="init"> ! <csc target="library" output="${build.dir}/DotNetMock.Core.dll" debug="${debug.build}" doc="${build.dir}\DotNetMock.Core.xml"> <sources basedir="."> + <includes name="${build.assemblyInfo}"/> <includes name="DotNetMock.Core/**/*.cs"/> </sources> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.dll" debug="${debug.build}" doc="${build.dir}\DotNetMock.xml"> <sources basedir="."> + <includes name="${build.assemblyInfo}"/> <includes name="DotNetMock/**/*.cs"/> </sources> *************** *** 53,57 **** </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Tests.dll" debug="${debug}"> <sources basedir="."> <includes name="DotNetMock.Tests/**/*.cs"/> --- 66,70 ---- </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Tests.dll" debug="${debug.build}"> <sources basedir="."> <includes name="DotNetMock.Tests/**/*.cs"/> *************** *** 62,67 **** </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Framework.dll" debug="${debug}" doc="${build.dir}\DotNetMock.Framework.xml"> <sources basedir="."> <includes name="DotNetMock.Framework/**/*.cs"/> </sources> --- 75,81 ---- </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Framework.dll" debug="${debug.build}" doc="${build.dir}\DotNetMock.Framework.xml"> <sources basedir="."> + <includes name="${build.assemblyInfo}"/> <includes name="DotNetMock.Framework/**/*.cs"/> </sources> *************** *** 70,74 **** </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Framework.Tests.dll" debug="${debug}"> <sources basedir="."> <includes name="DotNetMock.Framework.Tests/**/*.cs"/> --- 84,88 ---- </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Framework.Tests.dll" debug="${debug.build}"> <sources basedir="."> <includes name="DotNetMock.Framework.Tests/**/*.cs"/> *************** *** 80,84 **** </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Examples.dll" debug="${debug}"> <sources basedir="."> <includes name="DotNetMock.Examples/**/*.cs"/> --- 94,98 ---- </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Examples.dll" debug="${debug.build}"> <sources basedir="."> <includes name="DotNetMock.Examples/**/*.cs"/> *************** *** 90,94 **** </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.TestFramework.Tests.dll" debug="${debug}"> <sources basedir="."> <includes name="DotNetMock.TestFramework.Tests/**/*.cs"/> --- 104,108 ---- </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.TestFramework.Tests.dll" debug="${debug.build}"> <sources basedir="."> <includes name="DotNetMock.TestFramework.Tests/**/*.cs"/> *************** *** 107,125 **** </copy> </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"/> - <exec program="sn" commandline="-Vr ${build.dir}/DotNetMock.Framework.dll"/> - </target> - <target name="sign-assemblies" depends="build" failonerror="true"> - <delay-sign keyfile="dotnetmock.key" verbose="true"> - <targets> - <include name="${build.dir}/DotNetMock.Core.dll"/> - <include name="${build.dir}/DotNetMock.dll"/> - <include name="${build.dir}/DotNetMock.Framework.dll"/> - </targets> - </delay-sign> - </target> <target name="package" description="Collects and packs up the distribution" depends="buildMSDN"> <mkdir dir="${dist.dir}" failonerror="false"/> --- 121,124 ---- --- NEW FILE: CommonAssemblyInfo.cs --- using System; using System.Reflection; using System.Runtime.InteropServices; // Marks CLS Compliance [assembly:CLSCompliant(true)] // Marks COM Visibility to false. We don't want COM clients to use this assembly [assembly:ComVisible(false)] // Sets assembly version [assembly: AssemblyVersion("0.7.4.0")] |