diff options
| author | Rupert Smith <rupertlssmith@apache.org> | 2008-01-14 10:50:28 +0000 |
|---|---|---|
| committer | Rupert Smith <rupertlssmith@apache.org> | 2008-01-14 10:50:28 +0000 |
| commit | 8cfc8befef86eca3686fd2c6720da03fb587ec6c (patch) | |
| tree | 83e51763469eabcd2ada27c381a1c4e4ebfd82fc | |
| parent | 00678d384d3d4caaa803b183e6d25e0d021c6017 (diff) | |
| download | qpid-python-8cfc8befef86eca3686fd2c6720da03fb587ec6c.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@611758 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config | 5 | ||||
| -rw-r--r-- | dotnet/Qpid.Client.Tests/default.build | 32 | ||||
| -rw-r--r-- | dotnet/Qpid.Common/Framing/ProtocolInitiation.cs | 5 |
3 files changed, 17 insertions, 25 deletions
diff --git a/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config b/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config deleted file mode 100644 index e1300549d7..0000000000 --- a/dotnet/Qpid.Client.Tests/Qpid.Common.DLL.config +++ /dev/null @@ -1,5 +0,0 @@ -<configuration> - <assemblySettings> - <add key="OpenAMQ1d4Compatibility" value="false"/> - </assemblySettings> -</configuration>
\ No newline at end of file diff --git a/dotnet/Qpid.Client.Tests/default.build b/dotnet/Qpid.Client.Tests/default.build index d1b1496a8b..2affead984 100644 --- a/dotnet/Qpid.Client.Tests/default.build +++ b/dotnet/Qpid.Client.Tests/default.build @@ -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"> diff --git a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs index a9f5697144..5407bc08d5 100644 --- a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs +++ b/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs @@ -52,12 +52,15 @@ namespace Apache.Qpid.Framing 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 |