diff --git a/openwire-dotnet/activemq.csproj b/openwire-dotnet/activemq.csproj
deleted file mode 100755
index 47b3be0877..0000000000
--- a/openwire-dotnet/activemq.csproj
+++ /dev/null
@@ -1,800 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{E8825D2E-4EC5-43D3-9FAC-F16055294F49}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "activemq"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "activemq"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "src\OpenWire.Client\BrokerException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Connection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ConnectionClosedException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ConnectionFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ConsumerClosedException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\DestinationFilter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IConnection.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IConnectionFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IDestination.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IMessageConsumer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IMessageProducer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IQueue.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ISession.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IStartable.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IStopable.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ITemporaryQueue.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ITemporaryTopic.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ITextMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\ITopic.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\MessageConsumer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\MessageProducer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\OpenWireException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Session.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQBytesMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQDestination.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQMapMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQObjectMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQQueue.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQStreamMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQTempDestination.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQTempQueue.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQTempTopic.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQTextMessage.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ActiveMQTopic.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\BaseCommand.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\BrokerId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\BrokerInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ConnectionError.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ConnectionId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ConnectionInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ConsumerId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ConsumerInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ControlCommand.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\DataArrayResponse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\DataResponse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\DestinationInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\DiscoveryEvent.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ExceptionResponse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\FlushCommand.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\IntegerResponse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\JournalQueueAck.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\JournalTopicAck.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\JournalTrace.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\JournalTransaction.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\KeepAliveInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\LocalTransactionId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\Message.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\MessageAck.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\MessageDispatch.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\MessageDispatchNotification.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\MessageId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ProducerId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ProducerInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\RemoveInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\RemoveSubscriptionInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\Response.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\SessionId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\SessionInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\ShutdownInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\SubscriptionInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\TransactionId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\TransactionInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\WireFormatInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Commands\XATransactionId.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\AbstractCommand.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\BooleanStream.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\BrokerError.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\Command.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\BaseDataStreamMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\DataStructure.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\DataStructureSupport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\Dispatcher.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\FutureResponse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\ITransport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\MarshallAware.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\OpenWireFormat.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\Core\SocketTransport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQBytesMessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQDestinationMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQMapMessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQMessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQObjectMessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQQueueMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQStreamMessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQTempDestinationMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQTempQueueMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQTempTopicMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQTextMessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ActiveMQTopicMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\BaseCommandMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\BrokerIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\BrokerInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ConnectionErrorMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ConnectionIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ConnectionInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ConsumerIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ConsumerInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ControlCommandMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\DataArrayResponseMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\DataResponseMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\DestinationInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\DiscoveryEventMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ExceptionResponseMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\FlushCommandMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\IntegerResponseMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\JournalQueueAckMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\JournalTopicAckMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\JournalTraceMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\JournalTransactionMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\KeepAliveInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\LocalTransactionIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\MarshallerFactory.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\MessageAckMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\MessageDispatchMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\MessageDispatchNotificationMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\MessageIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\MessageMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ProducerIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ProducerInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\RemoveInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\RemoveSubscriptionInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ResponseMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\SessionIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\SessionInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\ShutdownInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\SubscriptionInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\TransactionIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\TransactionInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\WireFormatInfoMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "src\OpenWire.Client\IO\XATransactionIdMarshaller.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/openwire-dotnet/activemq.sln b/openwire-dotnet/activemq.sln
deleted file mode 100755
index 7222891688..0000000000
--- a/openwire-dotnet/activemq.sln
+++ /dev/null
@@ -1,30 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "activemq", "activemq.csproj", "{E8825D2E-4EC5-43D3-9FAC-F16055294F49}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests.csproj", "{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E8825D2E-4EC5-43D3-9FAC-F16055294F49} = {E8825D2E-4EC5-43D3-9FAC-F16055294F49}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Debug.ActiveCfg = Debug|.NET
-		{E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Debug.Build.0 = Debug|.NET
-		{E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Release.ActiveCfg = Release|.NET
-		{E8825D2E-4EC5-43D3-9FAC-F16055294F49}.Release.Build.0 = Release|.NET
-		{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Debug.ActiveCfg = Debug|.NET
-		{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Debug.Build.0 = Debug|.NET
-		{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Release.ActiveCfg = Release|.NET
-		{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}.Release.Build.0 = Release|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/openwire-dotnet/openwire-dotnet.sln b/openwire-dotnet/openwire-dotnet.sln
new file mode 100644
index 0000000000..6555afce78
--- /dev/null
+++ b/openwire-dotnet/openwire-dotnet.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "src", "src/src.csproj", "{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests/tests.csproj", "{B409B247-A311-42A9-B68D-76054D63DD7D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B409B247-A311-42A9-B68D-76054D63DD7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B409B247-A311-42A9-B68D-76054D63DD7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B409B247-A311-42A9-B68D-76054D63DD7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B409B247-A311-42A9-B68D-76054D63DD7D}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/openwire-dotnet/src/src.csproj b/openwire-dotnet/src/src.csproj
new file mode 100644
index 0000000000..eadbeba0ef
--- /dev/null
+++ b/openwire-dotnet/src/src.csproj
@@ -0,0 +1,187 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProductVersion>8.0.30703</ProductVersion>
+        <SchemaVersion>2.0</SchemaVersion>
+        <ProjectGuid>{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <RootNamespace>src</RootNamespace>
+        <AssemblyName>src</AssemblyName>
+        <WarningLevel>4</WarningLevel>
+        <StartupObject/>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugSymbols>false</DebugSymbols>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="System"/>
+        <Reference Include="System.Data"/>
+        <Reference Include="System.Xml"/>
+    </ItemGroup>
+    <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets"/>
+    <ItemGroup>
+        <Compile Include="CommonAssemblyInfo.cs"/>
+        <Compile Include="OpenWire.Client\BrokerException.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQBytesMessage.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQDestination.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQMapMessage.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQMessage.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQObjectMessage.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQQueue.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQStreamMessage.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQTempDestination.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQTempQueue.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQTempTopic.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQTextMessage.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ActiveMQTopic.cs"/>
+        <Compile Include="OpenWire.Client\Commands\BaseCommand.cs"/>
+        <Compile Include="OpenWire.Client\Commands\BrokerId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\BrokerInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ConnectionError.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ConnectionId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ConnectionInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ConsumerId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ConsumerInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ControlCommand.cs"/>
+        <Compile Include="OpenWire.Client\Commands\DataArrayResponse.cs"/>
+        <Compile Include="OpenWire.Client\Commands\DataResponse.cs"/>
+        <Compile Include="OpenWire.Client\Commands\DestinationInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\DiscoveryEvent.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ExceptionResponse.cs"/>
+        <Compile Include="OpenWire.Client\Commands\FlushCommand.cs"/>
+        <Compile Include="OpenWire.Client\Commands\IntegerResponse.cs"/>
+        <Compile Include="OpenWire.Client\Commands\JournalQueueAck.cs"/>
+        <Compile Include="OpenWire.Client\Commands\JournalTopicAck.cs"/>
+        <Compile Include="OpenWire.Client\Commands\JournalTrace.cs"/>
+        <Compile Include="OpenWire.Client\Commands\JournalTransaction.cs"/>
+        <Compile Include="OpenWire.Client\Commands\KeepAliveInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\LocalTransactionId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\Message.cs"/>
+        <Compile Include="OpenWire.Client\Commands\MessageAck.cs"/>
+        <Compile Include="OpenWire.Client\Commands\MessageDispatch.cs"/>
+        <Compile Include="OpenWire.Client\Commands\MessageDispatchNotification.cs"/>
+        <Compile Include="OpenWire.Client\Commands\MessageId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ProducerId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ProducerInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\RemoveInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\RemoveSubscriptionInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\Response.cs"/>
+        <Compile Include="OpenWire.Client\Commands\SessionId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\SessionInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\ShutdownInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\SubscriptionInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\TransactionId.cs"/>
+        <Compile Include="OpenWire.Client\Commands\TransactionInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\WireFormatInfo.cs"/>
+        <Compile Include="OpenWire.Client\Commands\XATransactionId.cs"/>
+        <Compile Include="OpenWire.Client\Connection.cs"/>
+        <Compile Include="OpenWire.Client\ConnectionClosedException.cs"/>
+        <Compile Include="OpenWire.Client\ConnectionFactory.cs"/>
+        <Compile Include="OpenWire.Client\ConsumerClosedException.cs"/>
+        <Compile Include="OpenWire.Client\Core\AbstractCommand.cs"/>
+        <Compile Include="OpenWire.Client\Core\BaseDataStreamMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\Core\BooleanStream.cs"/>
+        <Compile Include="OpenWire.Client\Core\BrokerError.cs"/>
+        <Compile Include="OpenWire.Client\Core\Command.cs"/>
+        <Compile Include="OpenWire.Client\Core\DataStructure.cs"/>
+        <Compile Include="OpenWire.Client\Core\DataStructureSupport.cs"/>
+        <Compile Include="OpenWire.Client\Core\Dispatcher.cs"/>
+        <Compile Include="OpenWire.Client\Core\FutureResponse.cs"/>
+        <Compile Include="OpenWire.Client\Core\ISynchronization.cs"/>
+        <Compile Include="OpenWire.Client\Core\ITransport.cs"/>
+        <Compile Include="OpenWire.Client\Core\MarshallAware.cs"/>
+        <Compile Include="OpenWire.Client\Core\MessagePropertyHelper.cs"/>
+        <Compile Include="OpenWire.Client\Core\OpenWireFormat.cs"/>
+        <Compile Include="OpenWire.Client\Core\PrimitiveMap.cs"/>
+        <Compile Include="OpenWire.Client\Core\SocketTransport.cs"/>
+        <Compile Include="OpenWire.Client\Core\TransactionContext.cs"/>
+        <Compile Include="OpenWire.Client\DestinationFilter.cs"/>
+        <Compile Include="OpenWire.Client\IBytesMessage.cs"/>
+        <Compile Include="OpenWire.Client\IConnection.cs"/>
+        <Compile Include="OpenWire.Client\IConnectionFactory.cs"/>
+        <Compile Include="OpenWire.Client\IDestination.cs"/>
+        <Compile Include="OpenWire.Client\IMapMessage.cs"/>
+        <Compile Include="OpenWire.Client\IMessage.cs"/>
+        <Compile Include="OpenWire.Client\IMessageConsumer.cs"/>
+        <Compile Include="OpenWire.Client\IMessageProducer.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQBytesMessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQDestinationMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQMapMessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQMessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQObjectMessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQQueueMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQStreamMessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQTempDestinationMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQTempQueueMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQTempTopicMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQTextMessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ActiveMQTopicMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\BaseCommandMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\BrokerIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\BrokerInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ConnectionErrorMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ConnectionIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ConnectionInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ConsumerIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ConsumerInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ControlCommandMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\DataArrayResponseMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\DataResponseMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\DataStructureSupportMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\DestinationInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\DiscoveryEventMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ExceptionResponseMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\FlushCommandMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\IntegerResponseMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\JournalQueueAckMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\JournalTopicAckMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\JournalTraceMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\JournalTransactionMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\KeepAliveInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\LocalTransactionIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\MarshallerFactory.cs"/>
+        <Compile Include="OpenWire.Client\IO\MessageAckMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\MessageDispatchMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\MessageDispatchNotificationMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\MessageIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\MessageMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ProducerIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ProducerInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\RemoveInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\RemoveSubscriptionInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ResponseMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\SessionIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\SessionInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\ShutdownInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\SubscriptionInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\TransactionIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\TransactionInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\WireFormatInfoMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IO\XATransactionIdMarshaller.cs"/>
+        <Compile Include="OpenWire.Client\IPrimitiveMap.cs"/>
+        <Compile Include="OpenWire.Client\IQueue.cs"/>
+        <Compile Include="OpenWire.Client\ISession.cs"/>
+        <Compile Include="OpenWire.Client\IStartable.cs"/>
+        <Compile Include="OpenWire.Client\ITemporaryQueue.cs"/>
+        <Compile Include="OpenWire.Client\ITemporaryTopic.cs"/>
+        <Compile Include="OpenWire.Client\ITextMessage.cs"/>
+        <Compile Include="OpenWire.Client\ITopic.cs"/>
+        <Compile Include="OpenWire.Client\MessageConsumer.cs"/>
+        <Compile Include="OpenWire.Client\MessageProducer.cs"/>
+        <Compile Include="OpenWire.Client\OpenWireException.cs"/>
+        <Compile Include="OpenWire.Client\Session.cs"/>
+    </ItemGroup>
+</Project>
diff --git a/openwire-dotnet/tests.csproj b/openwire-dotnet/tests.csproj
deleted file mode 100755
index 5a15beb15c..0000000000
--- a/openwire-dotnet/tests.csproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{3E5FA6F9-08E6-4F0D-86D9-77562D14F8AD}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "tests"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "tests"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "activemq"
-                    Project = "{E8825D2E-4EC5-43D3-9FAC-F16055294F49}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "nunit.framework"
-                    AssemblyName = "nunit.framework"
-                    HintPath = "..\..\..\Program Files\NUnit 2.2.7\bin\nunit.framework.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "tests\OpenWire.Client\ClientTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "tests\OpenWire.Client\CommandTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "tests\OpenWire.Client\ConsumerTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "tests\OpenWire.Client\EndianTest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "tests\OpenWire.Client\TestMain.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "tests\OpenWire.Client\TestSupport.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <Folder RelPath = "tests\OpenWire.Client\IO\" />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/openwire-dotnet/tests/tests.csproj b/openwire-dotnet/tests/tests.csproj
new file mode 100644
index 0000000000..57916ca56d
--- /dev/null
+++ b/openwire-dotnet/tests/tests.csproj
@@ -0,0 +1,57 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProductVersion>8.0.30703</ProductVersion>
+        <SchemaVersion>2.0</SchemaVersion>
+        <ProjectGuid>{B409B247-A311-42A9-B68D-76054D63DD7D}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <RootNamespace>tests</RootNamespace>
+        <AssemblyName>tests</AssemblyName>
+        <WarningLevel>4</WarningLevel>
+        <StartupObject/>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugSymbols>false</DebugSymbols>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="nunit.core"/>
+        <Reference Include="nunit.framework"/>
+        <Reference Include="System"/>
+        <Reference Include="System.Data"/>
+        <Reference Include="System.Xml"/>
+    </ItemGroup>
+    <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets"/>
+    <ItemGroup>
+        <Compile Include="OpenWire.Client\AsyncConsumeTest.cs"/>
+        <Compile Include="OpenWire.Client\BadConsumeTest.cs"/>
+        <Compile Include="OpenWire.Client\BytesMessageTest.cs"/>
+        <Compile Include="OpenWire.Client\ClientTest.cs"/>
+        <Compile Include="OpenWire.Client\CommandTest.cs"/>
+        <Compile Include="OpenWire.Client\ConsumerTest.cs"/>
+        <Compile Include="OpenWire.Client\EndianTest.cs"/>
+        <Compile Include="OpenWire.Client\JMSPropertyTest.cs"/>
+        <Compile Include="OpenWire.Client\MapMessageTest.cs"/>
+        <Compile Include="OpenWire.Client\TestMain.cs"/>
+        <Compile Include="OpenWire.Client\TestSupport.cs"/>
+        <Compile Include="OpenWire.Client\TransactionTest.cs"/>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="../src/src.csproj">
+            <Name>src</Name>
+            <Project>{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}</Project>
+        </ProjectReference>
+    </ItemGroup>
+</Project>