Author: rupertlssmith
Date: Mon Jan 14 02:50:28 2008
New Revision: 611758
URL: http://svn.apache.org/viewvc?rev=611758&view=rev
Log:
Qpid-725 missing config file with option for 0.7. Support for 0.7 option has
been removed so the config file is no longer needed.
Removed:
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build
incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
Modified: incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build?rev=611758&r1=611757&r2=611758&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build Mon Jan
14 02:50:28 2008
@@ -1,32 +1,26 @@
<?xml version="1.0"?>
<project name="Apache.Qpid.Client" default="test">
- <target name="build">
+ <target name="build">
<csc target="library"
- define="${build.defines}"
- warnaserror="false" debug="${build.debug}"
- output="${build.dir}/${project::get-name()}.Tests.dll">
-
+ define="${build.defines}"
+ warnaserror="false" debug="${build.debug}"
+ output="${build.dir}/${project::get-name()}.Tests.dll">
+
<sources>
<include name="**/*.cs" />
</sources>
<references>
- <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}/Apache.Qpid.Common.dll" />
- <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
- <include name="${build.dir}/Apache.Qpid.Sasl.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}/Apache.Qpid.Common.dll" />
+ <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
+ <include name="${build.dir}/Apache.Qpid.Sasl.dll" />
</references>
</csc>
- <copy
- tofile="${build.dir}/${project::get-name()}.Tests.dll.config"
- file="App.config"
- />
- <copy
- todir="${build.dir}"
- file="log4net.config"
- />
+ <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">
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs?rev=611758&r1=611757&r2=611758&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
Mon Jan 14 02:50:28 2008
@@ -52,12 +52,15 @@
static ProtocolInitiation()
{
AssemblySettings settings = new AssemblySettings();
+
+ /*
string openAMQ = settings["OpenAMQ1d4Compatibility"];
if (openAMQ.Equals("true"))
{
_log.Warn("Starting in OpenAMQ-1.0d4 compatibility mode.
ProtocolMajorVersion is 7 and Basic.Qos will not be sent.");
CURRENT_PROTOCOL_VERSION_MAJOR = 7;
- }
+ }
+ */
}
public uint Size