Merged revisions 537834-537845 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r537834 | tomasr | 2007-05-14 08:37:45 -0500 (Mon, 14 May 2007) | 6 lines
  
  * QPID-489 Added Nant build scripts for Qpid.NET
  * Modified msbuild files to build to central location matching nant builds
  * Removed old files from Qpid.Buffer
  * Removed MonoDevelop project files
  * Updated build scripts, readme.txt, todo.txt
........
  r537835 | tomasr | 2007-05-14 08:38:14 -0500 (Mon, 14 May 2007) | 1 line
  
  * removed MonoDevelop solution
........
  r537841 | tomasr | 2007-05-14 08:50:18 -0500 (Mon, 14 May 2007) | 1 line
  
  Fixed Qpid.Client.Tests build on linux
........
  r537845 | tomasr | 2007-05-14 08:57:12 -0500 (Mon, 14 May 2007) | 1 line
  
  Fixed release script and made executable
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@537848 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 35 insertions, 104 deletions

diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
index 21c6ff9ea2..819d43b5b0 100644
--- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\bin\net-2.0\debug\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <DebugType>pdbonly</DebugType>

     <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

+    <OutputPath>..\bin\net-2.0\release\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp
deleted file mode 100644
index 2fc9d7801c..0000000000
--- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp
+++ /dev/null
@@ -1,42 +0,0 @@
-<Project name="Qpid.Client.Tests" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject">
-  <Configurations active="Debug">
-    <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Debug" assembly="Qpid.Client.Tests" />
-      <Build debugmode="True" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" />
-      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-    <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="./bin/Release" assembly="Qpid.Client.Tests" />
-      <Build debugmode="False" target="Library" />
-      <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" />
-      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
-    </Configuration>
-  </Configurations>
-  <DeployTargets />
-  <Contents>
-    <File name="./bio/BlockingIo.cs" subtype="Code" buildaction="Compile" />
-    <File name="./Common/BaseMessagingTestFixture.cs" subtype="Code" buildaction="Compile" />
-    <File name="./connection/ConnectionTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./failover/FailoverTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./failover/FailoverTxTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./HeadersExchange/HeadersMatchingConsumer.cs" subtype="Code" buildaction="Compile" />
-    <File name="./HeadersExchange/HeadersMatchingProducer.cs" subtype="Code" buildaction="Compile" />
-    <File name="./MultiConsumer/ProducerMultiConsumer.cs" subtype="Code" buildaction="Compile" />
-    <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
-    <File name="./requestreply1/ServiceProvidingClient.cs" subtype="Code" buildaction="Compile" />
-    <File name="./requestreply1/ServiceRequestingClient.cs" subtype="Code" buildaction="Compile" />
-    <File name="./undeliverable/UndeliverableTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./url/ConnectionUrlTest.cs" subtype="Code" buildaction="Compile" />
-    <File name="./log4net.config" subtype="Code" buildaction="FileCopy" />
-  </Contents>
-  <References>
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Assembly" localcopy="True" refto="../Qpid.Common/lib/log4net/log4net.dll" />
-    <ProjectReference type="Assembly" localcopy="True" refto="./lib/nunit/nunit.framework.dll" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Client" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Messaging" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" />
-    <ProjectReference type="Project" localcopy="True" refto="Qpid.Client.Transport.Socket.Blocking" />
-  </References>
-</Project>
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
index b8941c8459..c3e9affa29 100644
--- a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
+++ b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
@@ -79,7 +79,7 @@ namespace Qpid.Client.Tests.Connection
          // load a self-issued certificate from an embedded

          // resource

          const string name = "Qpid.Client.Tests.connection.QpidTestCert.pfx";

-         Assembly assembly = Assembly.GetExecutingAssembly();

+         Assembly assembly = typeof(SslConnectionTest).Assembly;

          

          Stream res = assembly.GetManifestResourceStream(name);

          byte[] buffer = new byte[res.Length];

diff --git a/qpid/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build
index 36cdb612b5..3020f760b8 100644
--- a/qpid/dotnet/Qpid.Client.Tests/default.build
+++ b/qpid/dotnet/Qpid.Client.Tests/default.build
@@ -1,68 +1,41 @@
 <?xml version="1.0"?>
-<project name="XMS.AMQ.ClientTests" default="build">
-    <property name="nant.settings.currentframework" value="net-1.0" />
-    <property name="basename" value="XMSClientTests"/>
-    <property name="debug" value="true"/>
-    <property name="MINADir" value="../minadotnet"/>
-    <property name="XMSCommonDir" value="../xmscommon"/>
-    <property name="XMSClientDir" value="../xmsclient"/>
-<!--
-    <property name="NunitDir" value="../build/nunit"/>
-    <property name="NunitDir" value="C:\Program Files\NUnit-Net-2.0 2.2.8"/>
--->
-    <property name="NunitDir" value="C:\Program Files\NUnit 2.2.8"/>
+<project name="Qpid.Client" default="test">
 
-    <if test="${debug}">
-        <property name="targetdir" value="bin/${nant.settings.currentframework}/Debug"/>
-    </if>
-    <ifnot test="${debug}">
-        <property name="targetdir" value="bin/${nant.settings.currentframework}/Release"/>
-    </ifnot>
-
-    <target name="clean">
-        <delete>
-            <fileset>
-                <include name="${targetdir}/${basename}.dll"/>
-                <include name="${targetdir}/${basename}.pdb"/>
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="init">
-        <mkdir dir="${targetdir}"/>
-    </target>
-
-    <target name="build" depends="init">
-        <csc target="library" output="${targetdir}/${basename}.dll" debug="${debug}">
+   <target name="build">
+        <csc target="library" 
+			define="${build.defines}" 
+			warnaserror="false" debug="${build.debug}" 
+         output="${build.dir}/${project::get-name()}.Tests.dll">
+			
             <sources>
-                <include name="**/*.cs"/>
-                <exclude name="Properties/Settings.Designer.cs" />
+                <include name="**/*.cs" />
             </sources>
             <references>
-                <lib>
-                    <include name="${MINADir}/${targetdir}" />
-                    <include name="${XMSCommonDir}/${targetdir}" />
-                    <include name="${XMSClientDir}/${targetdir}" />
-                    <include name="${XMSCommonDir}/lib/**" />
-                    <include name="${NunitDir}/bin" />
-                </lib>
-                <include name="log4net.dll" />
-                <include name="MINA.dll" />
-                <include name="IBM.XMS.dll" />
-                <include name="XMSCommon.dll" />
-                <include name="XMSClient.dll" />
-                <include name="nunit.framework.dll" />
+               <include name="${build.dir}/log4net.dll" />
+               <include name="${build.dir}/nunit.framework.dll" />
+               <include name="${build.dir}/${project::get-name()}.dll" />
+               <include name="${build.dir}/Qpid.Common.dll" />
+               <include name="${build.dir}/Qpid.Messaging.dll" />
+               <include name="${build.dir}/Qpid.Sasl.dll" />
             </references>
+            <resources dynamicprefix="true" prefix="${project::get-name()}.Tests">
+               <include name="connection/QpidTestCert.pfx"/>
+            </resources>
         </csc>
-        <copy todir="${targetdir}">
-            <fileset>
-                <include name="*.config" />
-                <include name="${MINADir}/${targetdir}/*.dll" />
-                <include name="${XMSCommonDir}/${targetdir}/*.dll" />
-                <include name="${XMSClientDir}/${targetdir}/*.dll" />
-                <include name="${NunitDir}/bin/nunit.framework.dll" />
-                <include name="${XMSCommonDir}/lib/xms/*.dll" />
-            </fileset>
-        </copy>
+         <copy 
+            tofile="${build.dir}/${project::get-name()}.Tests.dll.config" 
+            file="App.config"
+         />
+         <copy 
+            todir="${build.dir}" 
+            file="log4net.config"
+         />
+    </target>
+    <target name="test" depends="build">
+         <nunit2>
+            <formatter type="${nant.formatter}" usefile="false" />
+            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+         </nunit2>
     </target>
 </project>
+