From eeff4f55117ba22358f98f14de31e4fe2550460c Mon Sep 17 00:00:00 2001
From: Robert Greig <rgreig@apache.org>
Date: Tue, 9 Dec 2008 22:32:39 +0000
Subject: QPID-1521 Updated Visual Studio project files to VS 2008, updated
 README and batch files.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724918 13f79535-47bb-0310-9956-ffa450edef68
---
 .../Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj     |  11 +-
 qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj         |  17 +--
 .../Qpid.Client.Tests/Qpid.Client.Tests.csproj     |  69 +++++++---
 qpid/dotnet/Qpid.Client/Qpid.Client.csproj         |  96 +-------------
 qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj           |  26 +---
 .../Qpid.Common.Tests/Qpid.Common.Tests.csproj     |  13 +-
 qpid/dotnet/Qpid.Common/Qpid.Common.csproj         | 144 +--------------------
 .../Qpid.Integration.Tests.csproj                  |  98 +++++++++-----
 qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj   |  75 +++++++----
 qpid/dotnet/Qpid.NET.sln                           |  17 +--
 qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj |  16 +--
 qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj             |  26 +---
 qpid/dotnet/README.txt                             |  72 ++++-------
 qpid/dotnet/TODO.txt                               |   6 -
 qpid/dotnet/TestClient/TestClient.csproj           |  11 +-
 qpid/dotnet/TopicListener/TopicListener.csproj     |   7 +-
 qpid/dotnet/TopicPublisher/TopicPublisher.csproj   |   7 +-
 qpid/dotnet/build-dotnet11                         |   1 -
 qpid/dotnet/build-dotnet11.bat                     |   1 -
 qpid/dotnet/build-dotnet20                         |   3 -
 qpid/dotnet/build-framing                          |   2 -
 qpid/dotnet/build-mono                             |   2 +
 qpid/dotnet/build-msbuild.bat                      |   1 +
 qpid/dotnet/build-nant-release                     |  13 ++
 qpid/dotnet/build-nant.bat                         |   1 +
 qpid/dotnet/release                                |  13 --
 26 files changed, 298 insertions(+), 450 deletions(-)
 delete mode 100644 qpid/dotnet/TODO.txt
 delete mode 100644 qpid/dotnet/build-dotnet11
 delete mode 100644 qpid/dotnet/build-dotnet11.bat
 delete mode 100644 qpid/dotnet/build-dotnet20
 delete mode 100644 qpid/dotnet/build-framing
 create mode 100644 qpid/dotnet/build-msbuild.bat
 create mode 100755 qpid/dotnet/build-nant-release
 create mode 100644 qpid/dotnet/build-nant.bat
 delete mode 100755 qpid/dotnet/release

diff --git a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
index 379997ab11..91be1f943e 100644
--- a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
+++ b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Apache.Qpid.Buffer.Tests</RootNamespace>
     <AssemblyName>Apache.Qpid.Buffer.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,9 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SlicedByteBufferTests.cs" />
-    <Compile Include="SimpleByteBufferTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
diff --git a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
index f1b5a907a1..9cd26b6df1 100644
--- a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
+++ b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,11 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,15 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BufferOverflowException.cs" />
-    <Compile Include="BufferUnderflowException.cs" />
-    <Compile Include="ByteBuffer.cs" />
-    <Compile Include="ByteBufferHexDumper.cs" />
-    <Compile Include="IByteBufferAllocator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SimpleByteBuffer.cs" />
-    <Compile Include="SimpleByteBufferAllocator.cs" />
-    <Compile Include="SlicedByteBuffer.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
index ad54129523..05a650eeff 100644
--- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA1B0032-4CE6-40DD-A2DC-119F0FFA0A1D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -11,6 +11,26 @@
     <AssemblyName>Apache.Qpid.Client.Tests</AssemblyName>
     <StartupObject>
     </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <PublishUrl>http://localhost/Apache.Qpid.Client.Tests/</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,20 +64,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BrokerDetails\BrokerDetailsTest.cs" />
-    <Compile Include="Channel\ChannelMessageCreationTests.cs" />
-    <Compile Include="Channel\ChannelQueueTest.cs" />
-    <Compile Include="interop\InteropClientTestCase.cs" />
-    <Compile Include="interop\TestCases\TestCase1DummyRun.cs" />
-    <Compile Include="interop\TestCases\TestCase2BasicP2P.cs" />
-    <Compile Include="interop\TestCases\TestCase3BasicPubSub.cs" />
-    <Compile Include="interop\TestClient.cs" />
-    <Compile Include="Messages\MessageFactoryRegistryTests.cs" />
-    <Compile Include="interop\TopicListener.cs" />
-    <Compile Include="interop\TopicPublisher.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Security\CallbackHandlerRegistryTests.cs" />
-    <Compile Include="url\ConnectionUrlTest.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
@@ -89,6 +96,36 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="interop\TestCases\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
index 6f4b87773b..fb80e653e4 100644
--- a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
+++ b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Apache.Qpid.Client</RootNamespace>
     <AssemblyName>Apache.Qpid.Client</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,94 +46,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Client\AmqBrokerInfo.cs" />
-    <Compile Include="Client\AMQConnection.cs" />
-    <Compile Include="Client\AMQConnectionException.cs" />
-    <Compile Include="Client\AMQDestination.cs" />
-    <Compile Include="Client\AmqChannel.cs" />
-    <Compile Include="Client\AMQAuthenticationException.cs" />
-    <Compile Include="Client\AMQNoConsumersException.cs" />
-    <Compile Include="Client\AMQNoRouteException.cs" />
-    <Compile Include="Client\Configuration\AuthenticationConfigurationSectionHandler.cs" />
-    <Compile Include="Client\Handler\QueueDeleteOkMethodHandler.cs" />
-    <Compile Include="Client\Handler\QueuePurgeOkMethodHandler.cs" />
-    <Compile Include="Client\Protocol\DefaultTimeouts.cs" />
-    <Compile Include="Client\SslOptions.cs" />
-    <Compile Include="Client\Message\QpidHeaders.cs" />
-    <Compile Include="Client\QpidConnectionInfo.cs" />
-    <Compile Include="Client\BasicMessageConsumer.cs" />
-    <Compile Include="Client\BasicMessageProducer.cs" />
-    <Compile Include="Client\Closeable.cs" />
-    <Compile Include="Client\ConnectionTuneParameters.cs" />
-    <Compile Include="Client\Failover\FailoverException.cs" />
-    <Compile Include="Client\Failover\FailoverHandler.cs" />
-    <Compile Include="Client\Failover\FailoverState.cs" />
-    <Compile Include="Client\Failover\FailoverSupport.cs" />
-    <Compile Include="Client\Handler\BasicDeliverMethodHandler.cs" />
-    <Compile Include="Client\Handler\BasicReturnMethodHandler.cs" />
-    <Compile Include="Client\Handler\ChannelCloseMethodHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionCloseMethodHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionCloseOkHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionOpenOkMethodHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionRedirectMethodHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionSecureMethodHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionStartMethodHandler.cs" />
-    <Compile Include="Client\Handler\ConnectionTuneMethodHandler.cs" />
-    <Compile Include="Client\Message\AbstractQmsMessage.cs" />
-    <Compile Include="Client\Message\AMQMessage.cs" />
-    <Compile Include="Client\Message\AMQMessageFactory.cs" />
-    <Compile Include="Client\Message\IMessageFactory.cs" />
-    <Compile Include="Client\Message\MessageFactoryRegistry.cs" />
-    <Compile Include="Client\Message\UnexpectedBodyReceivedException.cs" />
-    <Compile Include="Client\Message\UnprocessedMessage.cs" />
-    <Compile Include="Client\Message\QpidBytesMessage.cs" />
-    <Compile Include="Client\Message\QpidBytesMessageFactory.cs" />
-    <Compile Include="Client\Message\QpidTextMessage.cs" />
-    <Compile Include="Client\Message\QpidTextMessageFactory.cs" />
-    <Compile Include="Client\Protocol\AMQMethodEvent.cs" />
-    <Compile Include="Client\Protocol\AMQProtocolListener.cs" />
-    <Compile Include="Client\Protocol\AMQProtocolSession.cs" />
-    <Compile Include="Client\Protocol\Listener\BlockingMethodFrameListener.cs" />
-    <Compile Include="Client\Protocol\Listener\IAMQMethodListener.cs" />
-    <Compile Include="Client\Protocol\IConnectionCloser.cs" />
-    <Compile Include="Client\Protocol\ProtocolWriter.cs" />
-    <Compile Include="Client\Protocol\IProtocolListener.cs" />
-    <Compile Include="Client\Security\CallbackHandlerRegistry.cs" />
-    <Compile Include="Client\Security\IAMQCallbackHandler.cs" />
-    <Compile Include="Client\Security\UsernamePasswordCallbackHandler.cs" />
-    <Compile Include="Client\State\AMQState.cs" />
-    <Compile Include="Client\State\AMQStateChangedEvent.cs" />
-    <Compile Include="Client\State\AMQStateManager.cs" />
-    <Compile Include="Client\State\IAMQStateListener.cs" />
-    <Compile Include="Client\State\IllegalStateTransitionException.cs" />
-    <Compile Include="Client\State\IStateAwareMethodListener.cs" />
-    <Compile Include="Client\State\IStateListener.cs" />
-    <Compile Include="Client\Protocol\Listener\SpecificMethodFrameListener.cs" />
-    <Compile Include="Client\State\StateWaiter.cs" />
-    <Compile Include="Client\Transport\AmqpChannel.cs" />
-    <Compile Include="Client\Transport\AMQProtocolProvider.cs" />
-    <Compile Include="Client\Transport\IStreamFilter.cs" />
-    <Compile Include="Client\Transport\IoHandler.cs" />
-    <Compile Include="Client\Transport\IByteChannel.cs" />
-    <Compile Include="Client\Transport\IProtocolChannel.cs" />
-    <Compile Include="Client\Transport\IProtocolWriter.cs" />
-    <Compile Include="Client\Transport\ITransport.cs" />
-    <Compile Include="Client\Transport\ProtocolDecoderOutput.cs" />
-    <Compile Include="Client\Transport\SingleProtocolEncoderOutput.cs" />
-    <Compile Include="Client\Transport\Socket\Blocking\BlockingSocketTransport.cs" />
-    <Compile Include="Client\Transport\Socket\Blocking\ByteChannel.cs" />
-    <Compile Include="Client\Transport\Socket\Blocking\SslSocketConnector.cs" />
-    <Compile Include="Client\Transport\Socket\Blocking\SocketConnector.cs" />
-    <Compile Include="Client\Transport\Socket\Blocking\ISocketConnector.cs" />
-    <Compile Include="Client\Util\FlowControlQueue.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="qms\BrokerInfo.cs" />
-    <Compile Include="qms\ConnectionInfo.cs" />
-    <Compile Include="qms\FailoverPolicy.cs" />
-    <Compile Include="qms\failover\FailoverMethod.cs" />
-    <Compile Include="qms\failover\FailoverRoundRobin.cs" />
-    <Compile Include="qms\failover\FailoverSingleServer.cs" />
-    <Compile Include="qms\UrlSyntaxException.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
diff --git a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
index 33677382e0..1194d175f8 100644
--- a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
+++ b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Apache.Qpid.Codec</RootNamespace>
     <AssemblyName>Apache.Qpid.Codec</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,24 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CumulativeProtocolDecoder.cs" />
-    <Compile Include="Demux\DemuxingProtocolCodecFactory.cs" />
-    <Compile Include="Demux\IMessageDecoder.cs" />
-    <Compile Include="Demux\IMessageDecoderFactory.cs" />
-    <Compile Include="Demux\IMessageEncoder.cs" />
-    <Compile Include="Demux\IMessageEncoderFactory.cs" />
-    <Compile Include="Demux\MessageDecoderResult.cs" />
-    <Compile Include="IProtocolCodecFactory.cs" />
-    <Compile Include="IProtocolDecoder.cs" />
-    <Compile Include="IProtocolDecoderOutput.cs" />
-    <Compile Include="IProtocolEncoder.cs" />
-    <Compile Include="IProtocolEncoderOutput.cs" />
-    <Compile Include="ProtocolCodecException.cs" />
-    <Compile Include="ProtocolDecoderException.cs" />
-    <Compile Include="ProtocolEncoderException.cs" />
-    <Compile Include="Support\SimpleProtocolDecoderOutput.cs" />
-    <Compile Include="Support\SimpleProtocolEncoderOutput.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
index 766bd62c97..89814bec2e 100644
--- a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
+++ b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Apache.Qpid.Tests</RootNamespace>
     <AssemblyName>Apache.Qpid.Common.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,11 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Qpid\Collections\TestConsumerProducerQueue.cs" />
-    <Compile Include="Qpid\Collections\TestLinkedHashtable.cs" />
-    <Compile Include="Qpid\Framing\TestEncodingUtils.cs" />
-    <Compile Include="Qpid\Framing\TestAMQType.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
diff --git a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
index 0b6b1698e5..0c25b86d9d 100644
--- a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
+++ b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,11 @@
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,142 +45,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AMQChannelClosedException.cs" />
-    <Compile Include="AMQConnectionClosedException.cs" />
-    <Compile Include="AMQDisconnectedException.cs" />
-    <Compile Include="AMQException.cs" />
-    <Compile Include="AMQInvalidArgumentException.cs" />
-    <Compile Include="AMQInvalidRoutingKeyException.cs" />
-    <Compile Include="AMQUndeliveredException.cs" />
-    <Compile Include="AssemblySettings.cs" />
-    <Compile Include="Collections\LinkedHashtable.cs" />
-    <Compile Include="Collections\ConsumerProducerQueue.cs" />
-    <Compile Include="Framing\AMQDataBlockDecoder.cs" />
-    <Compile Include="Framing\AMQDataBlockEncoder.cs" />
-    <Compile Include="Framing\AMQFrame.cs" />
-    <Compile Include="Framing\AMQMethodBody.cs" />
-    <Compile Include="Framing\AMQMethodBodyFactory.cs" />
-    <Compile Include="Framing\AMQProtocolHeaderException.cs" />
-    <Compile Include="Framing\AMQType.cs" />
-    <Compile Include="Framing\BasicContentHeaderProperties.cs" />
-    <Compile Include="Framing\CompositeAMQDataBlock.cs" />
-    <Compile Include="Framing\ContentBody.cs" />
-    <Compile Include="Framing\ContentBodyFactory.cs" />
-    <Compile Include="Framing\ContentHeaderBody.cs" />
-    <Compile Include="Framing\ContentHeaderBodyFactory.cs" />
-    <Compile Include="Framing\ContentHeaderPropertiesFactory.cs" />
-    <Compile Include="Framing\AMQTypedValue.cs" />
-    <Compile Include="Framing\AMQTypeMap.cs" />
-    <Compile Include="Framing\EncodingUtils.cs" />
-    <Compile Include="Framing\FieldTable.cs" />
-    <Compile Include="Framing\HeartbeatBody.cs" />
-    <Compile Include="Framing\HeartbeatBodyFactory.cs" />
-    <Compile Include="Framing\IBody.cs" />
-    <Compile Include="Framing\IDataBlock.cs" />
-    <Compile Include="Framing\AMQFrameDecodingException.cs" />
-    <Compile Include="Framing\IEncodableAMQDataBlock.cs" />
-    <Compile Include="Framing\IBodyFactory.cs" />
-    <Compile Include="Framing\IContentHeaderProperties.cs" />
-    <Compile Include="Framing\ProtocolInitiation.cs" />
-    <Compile Include="generated\AccessRequestBody.cs" />
-    <Compile Include="generated\AccessRequestOkBody.cs" />
-    <Compile Include="generated\BasicAckBody.cs" />
-    <Compile Include="generated\BasicCancelBody.cs" />
-    <Compile Include="generated\BasicCancelOkBody.cs" />
-    <Compile Include="generated\BasicConsumeBody.cs" />
-    <Compile Include="generated\BasicConsumeOkBody.cs" />
-    <Compile Include="generated\BasicDeliverBody.cs" />
-    <Compile Include="generated\BasicGetBody.cs" />
-    <Compile Include="generated\BasicGetEmptyBody.cs" />
-    <Compile Include="generated\BasicGetOkBody.cs" />
-    <Compile Include="generated\BasicPublishBody.cs" />
-    <Compile Include="generated\BasicQosBody.cs" />
-    <Compile Include="generated\BasicQosOkBody.cs" />
-    <Compile Include="generated\BasicRecoverBody.cs" />
-    <Compile Include="generated\BasicRecoverOkBody.cs" />
-    <Compile Include="generated\BasicRejectBody.cs" />
-    <Compile Include="generated\BasicReturnBody.cs" />
-    <Compile Include="generated\ChannelAlertBody.cs" />
-    <Compile Include="generated\ChannelCloseBody.cs" />
-    <Compile Include="generated\ChannelCloseOkBody.cs" />
-    <Compile Include="generated\ChannelFlowBody.cs" />
-    <Compile Include="generated\ChannelFlowOkBody.cs" />
-    <Compile Include="generated\ChannelOpenBody.cs" />
-    <Compile Include="generated\ChannelOpenOkBody.cs" />
-    <Compile Include="generated\ConnectionCloseBody.cs" />
-    <Compile Include="generated\ConnectionCloseOkBody.cs" />
-    <Compile Include="generated\ConnectionOpenBody.cs" />
-    <Compile Include="generated\ConnectionOpenOkBody.cs" />
-    <Compile Include="generated\ConnectionRedirectBody.cs" />
-    <Compile Include="generated\ConnectionSecureBody.cs" />
-    <Compile Include="generated\ConnectionSecureOkBody.cs" />
-    <Compile Include="generated\ConnectionStartBody.cs" />
-    <Compile Include="generated\ConnectionStartOkBody.cs" />
-    <Compile Include="generated\ConnectionTuneBody.cs" />
-    <Compile Include="generated\ConnectionTuneOkBody.cs" />
-    <Compile Include="generated\DtxSelectBody.cs" />
-    <Compile Include="generated\DtxSelectOkBody.cs" />
-    <Compile Include="generated\DtxStartBody.cs" />
-    <Compile Include="generated\DtxStartOkBody.cs" />
-    <Compile Include="generated\ExchangeBoundBody.cs" />
-    <Compile Include="generated\ExchangeBoundOkBody.cs" />
-    <Compile Include="generated\ExchangeDeclareBody.cs" />
-    <Compile Include="generated\ExchangeDeclareOkBody.cs" />
-    <Compile Include="generated\ExchangeDeleteBody.cs" />
-    <Compile Include="generated\ExchangeDeleteOkBody.cs" />
-    <Compile Include="generated\FileAckBody.cs" />
-    <Compile Include="generated\FileCancelBody.cs" />
-    <Compile Include="generated\FileCancelOkBody.cs" />
-    <Compile Include="generated\FileConsumeBody.cs" />
-    <Compile Include="generated\FileConsumeOkBody.cs" />
-    <Compile Include="generated\FileDeliverBody.cs" />
-    <Compile Include="generated\FileOpenBody.cs" />
-    <Compile Include="generated\FileOpenOkBody.cs" />
-    <Compile Include="generated\FilePublishBody.cs" />
-    <Compile Include="generated\FileQosBody.cs" />
-    <Compile Include="generated\FileQosOkBody.cs" />
-    <Compile Include="generated\FileRejectBody.cs" />
-    <Compile Include="generated\FileReturnBody.cs" />
-    <Compile Include="generated\FileStageBody.cs" />
-    <Compile Include="generated\MainRegistry.cs" />
-    <Compile Include="generated\MethodBodyDecoderRegistry.cs" />
-    <Compile Include="generated\QueueBindBody.cs" />
-    <Compile Include="generated\QueueBindOkBody.cs" />
-    <Compile Include="generated\QueueDeclareBody.cs" />
-    <Compile Include="generated\QueueDeclareOkBody.cs" />
-    <Compile Include="generated\QueueDeleteBody.cs" />
-    <Compile Include="generated\QueueDeleteOkBody.cs" />
-    <Compile Include="generated\QueuePurgeBody.cs" />
-    <Compile Include="generated\QueuePurgeOkBody.cs" />
-    <Compile Include="generated\StreamCancelBody.cs" />
-    <Compile Include="generated\StreamCancelOkBody.cs" />
-    <Compile Include="generated\StreamConsumeBody.cs" />
-    <Compile Include="generated\StreamConsumeOkBody.cs" />
-    <Compile Include="generated\StreamDeliverBody.cs" />
-    <Compile Include="generated\StreamPublishBody.cs" />
-    <Compile Include="generated\StreamQosBody.cs" />
-    <Compile Include="generated\StreamQosOkBody.cs" />
-    <Compile Include="generated\StreamReturnBody.cs" />
-    <Compile Include="generated\TestContentBody.cs" />
-    <Compile Include="generated\TestContentOkBody.cs" />
-    <Compile Include="generated\TestIntegerBody.cs" />
-    <Compile Include="generated\TestIntegerOkBody.cs" />
-    <Compile Include="generated\TestStringBody.cs" />
-    <Compile Include="generated\TestStringOkBody.cs" />
-    <Compile Include="generated\TestTableBody.cs" />
-    <Compile Include="generated\TestTableOkBody.cs" />
-    <Compile Include="generated\TunnelRequestBody.cs" />
-    <Compile Include="generated\TxCommitBody.cs" />
-    <Compile Include="generated\TxCommitOkBody.cs" />
-    <Compile Include="generated\TxRollbackBody.cs" />
-    <Compile Include="generated\TxRollbackOkBody.cs" />
-    <Compile Include="generated\TxSelectBody.cs" />
-    <Compile Include="generated\TxSelectOkBody.cs" />
-    <Compile Include="Collections\BlockingQueue.cs" />
-    <Compile Include="Collections\LinkedBlockingQueue.cs" />
-    <Compile Include="Collections\SynchronousQueue.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Protocol\AMQConstant.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Buffer\Qpid.Buffer.csproj">
diff --git a/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj b/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
index 51d91f2bd3..332b81263e 100755
--- a/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
+++ b/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectGuid>{DE21CEBC-F38C-43EA-B576-38CA9738A00A}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -6,6 +6,26 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Qpid.Integration.Tests</RootNamespace>
     <AssemblyName>Qpid.Integration.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <PublishUrl>http://localhost/Qpid.Integration.Tests/</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -25,41 +45,59 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\client-010\lib\log4net\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\client-010\lib\nunit\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="framework\Circuit.cs" />
-    <Compile Include="framework\FrameworkBaseCase.cs" />
-    <Compile Include="framework\Publisher.cs" />
-    <Compile Include="framework\Receiver.cs" />
-    <Compile Include="framework\TestClientDetails.cs" />
-    <Compile Include="framework\TestModel.cs" />
-    <Compile Include="interactive\SendReceiveTest.cs" />
-    <Compile Include="interop\InteropClientTestCase.cs" />
-    <Compile Include="interop\TestCases\TestCase1DummyRun.cs" />
-    <Compile Include="interop\TestCases\TestCase3BasicPubSub.cs" />
-    <Compile Include="testcases\BaseMessagingTestFixture.cs" />
-    <Compile Include="testcases\ChannelQueueTest.cs" />
-    <Compile Include="testcases\CommitRollbackTest.cs" />
-    <Compile Include="testcases\ConnectionTest.cs" />
-    <Compile Include="testcases\DurableSubscriptionTest.cs" />
-    <Compile Include="testcases\HeadersExchangeTest.cs" />
-    <Compile Include="testcases\MandatoryMessageTest.cs" />
-    <Compile Include="testcases\ProducerMultiConsumerTest.cs" />
-    <Compile Include="testcases\SslConnectionTest.cs" />
-    <Compile Include="testcases\SustainedTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="framework\Assertion.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="interactive\FailoverTest.cs" />
-  </ItemGroup>
+    <Compile Include="**\*.cs" />    
+  </ItemGroup>  
   <ItemGroup>
-    <Compile Include="interop\TestClient.cs" />
+    <ProjectReference Include="..\Qpid.Client\Qpid.Client.csproj">
+      <Project>{68987C05-3768-452C-A6FC-6BA1D372852F}</Project>
+      <Name>Qpid.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Qpid.Common\Qpid.Common.csproj">
+      <Project>{77064C42-24D2-4CEB-9EA2-0EF481A43205}</Project>
+      <Name>Qpid.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Qpid.Messaging\Qpid.Messaging.csproj">
+      <Project>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</Project>
+      <Name>Qpid.Messaging</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="interop\TestCases\TestCase2BasicP2P.cs" />
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
index 403911ee3f..319f15865b 100644
--- a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
+++ b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -10,6 +10,26 @@
     <RootNamespace>Apache.Qpid.Messaging</RootNamespace>
     <AssemblyName>Apache.Qpid.Messaging</AssemblyName>
     <SignAssembly>true</SignAssembly>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <PublishUrl>http://localhost/Apache.Qpid.Messaging/</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Web</InstallFrom>
+    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,29 +54,34 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AcknowledgeMode.cs" />
-    <Compile Include="ChannelLimitReachedException.cs" />
-    <Compile Include="DeliveryMode.cs" />
-    <Compile Include="ExchangeClassConstants.cs" />
-    <Compile Include="ExchangeNameDefaults.cs" />
-    <Compile Include="IBytesMessage.cs" />
-    <Compile Include="IConnection.cs" />
-    <Compile Include="IConnectionFactory.cs" />
-    <Compile Include="IConnectionListener.cs" />
-    <Compile Include="IFieldTable.cs" />
-    <Compile Include="IHeaders.cs" />
-    <Compile Include="IMessage.cs" />
-    <Compile Include="IMessageConsumer.cs" />
-    <Compile Include="IMessagePublisher.cs" />
-    <Compile Include="IChannel.cs" />
-    <Compile Include="ITextMessage.cs" />
-    <Compile Include="MessageConsumerBuilder.cs" />
-    <Compile Include="MessageNotReadableException.cs" />
-    <Compile Include="MessageNotWritableException.cs" />
-    <Compile Include="MessagePublisherBuilder.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QpidException.cs" />
-    <Compile Include="ResourceAllocationException.cs" />
+    <Compile Include="**\*.cs" />    
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/qpid/dotnet/Qpid.NET.sln b/qpid/dotnet/Qpid.NET.sln
index 8bccc6ec26..07deccf237 100644
--- a/qpid/dotnet/Qpid.NET.sln
+++ b/qpid/dotnet/Qpid.NET.sln
@@ -1,7 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-# SharpDevelop 2.2.1.2648
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Messaging", "Qpid.Messaging\Qpid.Messaging.csproj", "{6688F826-C58E-4C1B-AA1F-22AFAB4B7D07}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Common.Tests", "Qpid.Common.Tests\Qpid.Common.Tests.csproj", "{F83624B0-762B-4D82-900D-FF4C1B36E36E}"
@@ -26,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopicPublisher", "TopicPubl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopicListener", "TopicListener\TopicListener.csproj", "{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "TestClient\TestClient.csproj", "{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "TestClient\TestClient.csproj", "{6E0374D9-99BE-4D4F-B41D-B227E37E04C6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Qpid.Integration.Tests", "Qpid.Integration.Tests\Qpid.Integration.Tests.csproj", "{DE21CEBC-F38C-43EA-B576-38CA9738A00A}"
 EndProject
@@ -84,14 +83,12 @@ Global
 		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{666C2D04-C9DC-4D43-B4DF-0989225EABC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{666C2D04-C9DC-4D43-B4DF-0989225EABC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{666C2D04-C9DC-4D43-B4DF-0989225EABC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{666C2D04-C9DC-4D43-B4DF-0989225EABC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE21CEBC-F38C-43EA-B576-38CA9738A00A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E0374D9-99BE-4D4F-B41D-B227E37E04C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E0374D9-99BE-4D4F-B41D-B227E37E04C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE21CEBC-F38C-43EA-B576-38CA9738A00A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE21CEBC-F38C-43EA-B576-38CA9738A00A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE21CEBC-F38C-43EA-B576-38CA9738A00A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE21CEBC-F38C-43EA-B576-38CA9738A00A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE21CEBC-F38C-43EA-B576-38CA9738A00A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
index 2868b1d73c..8214b778b3 100644
--- a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
+++ b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Apache.Qpid.Sasl.Tests</RootNamespace>
     <AssemblyName>Apache.Qpid.Sasl.Tests</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,14 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Mechanisms\ExternalSaslClientTests.cs" />
-    <Compile Include="TestClientFactory.cs" />
-    <Compile Include="Mechanisms\AnonymousSaslClientTests.cs" />
-    <Compile Include="Mechanisms\DigestSaslClientTests.cs" />
-    <Compile Include="Mechanisms\CramMD5SaslClientTests.cs" />
-    <Compile Include="Mechanisms\PlainSaslClientTests.cs" />
-    <Compile Include="SaslTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Qpid.Sasl\Qpid.Sasl.csproj">
diff --git a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
index 33619f2495..d2482d32a8 100644
--- a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
+++ b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Apache.Qpid.Sasl</RootNamespace>
     <AssemblyName>Apache.Qpid.Sasl</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,24 +39,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Callbacks.cs" />
-    <Compile Include="Configuration\SaslConfiguration.cs" />
-    <Compile Include="Configuration\SaslConfigurationSectionHandler.cs" />
-    <Compile Include="MD5HMAC.cs" />
-    <Compile Include="Mechanisms\ExternalSaslClient.cs" />
-    <Compile Include="SaslException.cs" />
-    <Compile Include="Mechanisms\AnonymousSaslClient.cs" />
-    <Compile Include="Mechanisms\DigestSaslClient.cs" />
-    <Compile Include="Sasl.cs" />
-    <Compile Include="DefaultClientFactory.cs" />
-    <Compile Include="ISaslCallbackHandler.cs" />
-    <Compile Include="ISaslClientFactory.cs" />
-    <Compile Include="Mechanisms\CramMD5SaslClient.cs" />
-    <Compile Include="SaslProperties.cs" />
-    <Compile Include="ISaslClient.cs" />
-    <Compile Include="Mechanisms\PlainSaslClient.cs" />
-    <Compile Include="SaslClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="**\*.cs" />    
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/qpid/dotnet/README.txt b/qpid/dotnet/README.txt
index 1f616c824f..617fd871d3 100644
--- a/qpid/dotnet/README.txt
+++ b/qpid/dotnet/README.txt
@@ -1,76 +1,57 @@
 Info
 ====
 
-There are two seperate .Net clients.
+There are two separate .NET clients: one that implements AMQP 0.9 and another that
+implements 0-10. 0-10 is required to communicate with the Qpid C++ broker.
 
-One implements the AMQP 0-10 protocol and is located in the client-010
-directory, this can communicate with the C++ broker.
+This README contains instructions for building the 0-9 client.
 
 Instructions for building and installing the 0-10 client are located in client-010/README.txt.
 
-
-The other, located in the root of the dotnet directory implements the
-0-8 protocol, which can communicate with the Java broker.
-
-Instructions for building and installing the 0-9 client are below.
-
-
-
-NOTE: The rest of this file is 0-8 specific 
-      For 0-10 go to client-010/README.txt
-
 Setup
 =====
 
-Install:
-  Microsoft Visual Studio 2005 (VS2005) or Mono 2.0
-  NAnt 0.85 - only required for builds outside VS2005 (.net 1.1, .net 2.0, mono 2.0)
-  Ant 1.6.5
-  Cygwin (or alternatively build via cmd but alter instructions below accordingly)
+Essential:
 
-Set up PATH to include Nant.exe:
+  .NET 2.0 or later
+  Ant 1.6.5 (Java build tool, http://ant.apache.org)
+  
+Either:
+  NAnt 0.85 - only required for builds outside Visual Studio
+OR
+  Microsoft Visual Studio 2008 (VS2008)
+  
+Ensure that your PATH includes ant, e.g.:
 
-  $ PATH=/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727:$PATH
+  $ PATH=c:\java\ant\bin:%PATH%
+  
+If using nant, set up PATH to include Nant.exe, e.g.:
 
-Set up PATH to include ant:
-
-  $ PATH=$ANT_HOME/bin:$PATH
+  $ set PATH=C:\dotnet\nant\bin;%PATH%
 
+If using msbuild, it is recommended to use a "Visual Studio Command Prompt"
 
 Building
 ========
 
-Generate framing from Qpid.Common/amqp.xml specificiation file:
+Generate framing from /Qpid.Common/amqp.xml specification file by running this script:
 
-  $ build-framing
+  $ build-framing.bat
 
 Alternatively, just switch to /Qpid.Common and run "ant" there.
 
-You can build from Visual Studio 2005 normally. Alternatively, you
-can build debug releases for any supported framework from the 
-command line using Nant:
-
-To build .NET 2.0 executables (to bin/net-2.0):
+You can build from Visual Studio 2008 or from the command-line by running msbuild.
 
-  $ build-dotnet20
-
-To build .NET 1.1 executables (to bin/net-1.1):
-
-  $ build-dotnet11
-
-To build for Mono on Linux (to bin/mono-2.0):
-
-  $ build-mono
+The script build-msbuild.bat provides some standard options to do a full build.
 
+If you are using nant, the script build-nant.bat contains standard arguments that do a full build.
+ 
+To build for Mono on Linux (to bin/mono-2.0) the build-mono shell script is provided.
 
 Releasing
 =========
 
-For .NET 1.1
-
-  $ release net-1.1
-
-Generates ./bin/net-1.1/release/Qpid.NET-net-1.1-yyyyMMdd.zip
+nant can be used to create a release zip archive. A script is provided:
 
 For .NET 2.0
 
@@ -83,3 +64,4 @@ For Mono
   $ release mono-2.0
 
 Generates ./bin/mono-2.0/release/Qpid.NET-mono-2.0-yyyyMMdd.zip
+
diff --git a/qpid/dotnet/TODO.txt b/qpid/dotnet/TODO.txt
deleted file mode 100644
index d79fb8f5f7..0000000000
--- a/qpid/dotnet/TODO.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-* Implement durable subscriptions.
-* Implement prefetching
-* support multiple versions of AMQP from the same client.
-* Add new unit and integration tests
-* Implement Transactions
diff --git a/qpid/dotnet/TestClient/TestClient.csproj b/qpid/dotnet/TestClient/TestClient.csproj
index b00994b265..0066b5164c 100644
--- a/qpid/dotnet/TestClient/TestClient.csproj
+++ b/qpid/dotnet/TestClient/TestClient.csproj
@@ -1,14 +1,19 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9A112DF2-146F-4CF4-919B-9D3BE7D088E9}</ProjectGuid>
+    <ProjectGuid>{6E0374D9-99BE-4D4F-B41D-B227E37E04C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestClient</RootNamespace>
     <AssemblyName>TestClient</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/qpid/dotnet/TopicListener/TopicListener.csproj b/qpid/dotnet/TopicListener/TopicListener.csproj
index 5522ada191..1411c06858 100644
--- a/qpid/dotnet/TopicListener/TopicListener.csproj
+++ b/qpid/dotnet/TopicListener/TopicListener.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TopicListener</RootNamespace>
     <AssemblyName>TopicListener</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
index 2e03ce858e..c4874a2b22 100644
--- a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
+++ b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TopicPublisher</RootNamespace>
     <AssemblyName>TopicPublisher</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/qpid/dotnet/build-dotnet11 b/qpid/dotnet/build-dotnet11
deleted file mode 100644
index 918010bf1f..0000000000
--- a/qpid/dotnet/build-dotnet11
+++ /dev/null
@@ -1 +0,0 @@
-nant -t:net-1.1
diff --git a/qpid/dotnet/build-dotnet11.bat b/qpid/dotnet/build-dotnet11.bat
deleted file mode 100644
index 4b58f13b2a..0000000000
--- a/qpid/dotnet/build-dotnet11.bat
+++ /dev/null
@@ -1 +0,0 @@
-nant -t:net-1.1
diff --git a/qpid/dotnet/build-dotnet20 b/qpid/dotnet/build-dotnet20
deleted file mode 100644
index 713a7aa55a..0000000000
--- a/qpid/dotnet/build-dotnet20
+++ /dev/null
@@ -1,3 +0,0 @@
-MSBuild.exe Qpid.NET.sln \
-  /p:Configuration=Release \
-  /t:rebuild
diff --git a/qpid/dotnet/build-framing b/qpid/dotnet/build-framing
deleted file mode 100644
index 315a1a1cb2..0000000000
--- a/qpid/dotnet/build-framing
+++ /dev/null
@@ -1,2 +0,0 @@
-cd Qpid.Common
-ant
diff --git a/qpid/dotnet/build-mono b/qpid/dotnet/build-mono
index 6f5cad5744..275922e623 100755
--- a/qpid/dotnet/build-mono
+++ b/qpid/dotnet/build-mono
@@ -1 +1,3 @@
+#!/bin/sh
+
 nant -t:mono-2.0
diff --git a/qpid/dotnet/build-msbuild.bat b/qpid/dotnet/build-msbuild.bat
new file mode 100644
index 0000000000..f3f797403a
--- /dev/null
+++ b/qpid/dotnet/build-msbuild.bat
@@ -0,0 +1 @@
+MSBuild.exe Qpid.NET.sln /p:Configuration=Release /t:rebuild
diff --git a/qpid/dotnet/build-nant-release b/qpid/dotnet/build-nant-release
new file mode 100755
index 0000000000..25087626e6
--- /dev/null
+++ b/qpid/dotnet/build-nant-release
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+Usage() 
+{
+  echo "usage: $0 net-2.0|mono-2.0"
+  exit 2
+}
+
+if [[ $# -ne 1 ]]; then
+  Usage
+fi
+
+nant -t:$1 release-pkg -D:build.config=release
diff --git a/qpid/dotnet/build-nant.bat b/qpid/dotnet/build-nant.bat
new file mode 100644
index 0000000000..2296c50003
--- /dev/null
+++ b/qpid/dotnet/build-nant.bat
@@ -0,0 +1 @@
+nant -t:net-2.0
diff --git a/qpid/dotnet/release b/qpid/dotnet/release
deleted file mode 100755
index 11291e87d6..0000000000
--- a/qpid/dotnet/release
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-Usage() 
-{
-  echo "usage: $0 net-1.1|net-2.0|mono-2.0"
-  exit 2
-}
-
-if [[ $# -ne 1 ]]; then
-  Usage
-fi
-
-nant -t:$1 release-pkg -D:build.config=release
-- 
cgit v1.2.1