QPID-2924 Refactor WinSDK to create separate debug and release /bin directories

This checkin gets rid of the "d" in the debug version of the .NET Binding org.apache.qpid.messaging.dll. It applies to the project that creates the dll and to twelve CSharp projects that use the dll.

This simple change greatly reduces the burden on customers that QPID-2924 tries to address. Now to switch between debug and release for .NET examples, the customer unpacks the correct DLLs into the \bin directory and relinks the examples. The user does not have to remove and restore project references to the correct DLL for each project.

Note that these name changes have zero effect on a developer's view of the examples. In those .csproj files the DLL reference is resolved by a _project_ reeference and not by a DLL reference.

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

13 files changed, 26 insertions, 26 deletions

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
index 286e4ad1c4..f3a0071aeb 100644
--- a/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
+++ b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
@@ -87,7 +87,7 @@
 				Name="VCLinkerTool"

 				AdditionalOptions=" /STACK:10000000 /machine:I386"

 				AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclientd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommond.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessagingd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypesd.lib"

-				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messagingd.dll"

+				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"

 				LinkIncremental="1"

 				GenerateDebugInformation="true"

 				AssemblyDebug="1"

@@ -166,7 +166,7 @@
 				Name="VCLinkerTool"

 				AdditionalOptions=" /STACK:10000000"

 				AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclientd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommond.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessagingd.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypesd.lib"

-				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messagingd.dll"

+				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"

 				LinkIncremental="1"

 				GenerateDebugInformation="true"

 				AssemblyDebug="1"

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 8761a9fd95..5ebeb28b2a 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
index f70c26874e..57c10326fd 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
@@ -64,9 +64,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
index 982faebb3e..ed307e7f98 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index 0dca7a2d39..cf6df68d6f 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
index c807657a27..1c25871462 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
index 5261bfd821..c97bf7d3bc 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
index 508ae8e829..3ab00f4a32 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
index bc284b42c4..783545f74f 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index a30996bcaa..3803720cce 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="org.apache.qpid.messaging.sessionreceiver, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index c3a8918452..79313b9827 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
@@ -84,9 +84,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
index d2e50eac1b..cd4329a38f 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
index 36b63a47ca..285804b8fd 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
@@ -81,9 +81,9 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

+    <Reference Include="org.apache.qpid.messaging, Version=1.0.3890.18681, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=$(Platform)">

       <SpecificVersion>False</SpecificVersion>

-      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll</HintPath>

+      <HintPath>$(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.dll</HintPath>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">