QPID-2634 VS2010 - Tidy up the Csharp WinSDK VS2010 project files.

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

12 files changed, 101 insertions, 290 deletions

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 25894a3357..1efc9de594 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.direct.receiver</RootNamespace>

     <AssemblyName>csharp.direct.receiver</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
index 71cc77d050..b40ad1145d 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
@@ -28,24 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.direct.sender</RootNamespace>

     <AssemblyName>csharp.direct.sender</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -54,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -69,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
index 5dbde7ad4e..f49ba9e639 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.example.client</RootNamespace>

     <AssemblyName>csharp.example.client</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
index ed59f00163..5e59fbc369 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.example.declare_queues</RootNamespace>

     <AssemblyName>csharp.example.declare_queues</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
index 8df01efa6c..2e2c97370e 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.example.drain</RootNamespace>

     <AssemblyName>csharp.example.drain</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
index fd9df286cd..de54c0feb8 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.example.helloworld</RootNamespace>

     <AssemblyName>csharp.example.helloworld</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+    <TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,15 +70,14 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

-    </Reference>

-  </ItemGroup>

-  <ItemGroup>

     <Compile Include="csharp.example.helloworld.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

   </ItemGroup>

+  <ItemGroup>

+    <Reference Include="org.apache.qpid.messaging">

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

+    </Reference>

+  </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\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/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
index 55fd496528..52e73ee86c 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.example.server</RootNamespace>

     <AssemblyName>csharp.example.server</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
index 67e35cc669..bb26be87a7 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.example.spout</RootNamespace>

     <AssemblyName>csharp.example.spout</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

     <Reference Include="System" />

   </ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
index 2910bafb6b..efedc1eb67 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.map.callback.receiver</RootNamespace>

     <AssemblyName>csharp.map.callback.receiver</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,13 +70,11 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

+      <HintPath>$(ProjectDir)..\..\..\bin\$(Configuration)\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>

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

+    <Reference Include="org.apache.qpid.messaging.sessionreceiver">

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

     </Reference>

     <Reference Include="System" />

   </ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
index 4739818718..148c79bd40 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
@@ -28,35 +28,18 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.map.callback.sender</RootNamespace>

     <AssemblyName>csharp.map.callback.sender</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

     <DebugType>full</DebugType>

@@ -64,7 +47,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -73,7 +56,7 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

     <DebugType>full</DebugType>

@@ -81,7 +64,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -89,9 +72,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

     <Reference Include="System" />

   </ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
index ab1fe9ddcf..3b73be2d5c 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.map.receiver</RootNamespace>

     <AssemblyName>csharp.map.receiver</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>

diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
index bf79556bfd..3d5f94e2e1 100644
--- a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
@@ -28,41 +28,25 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>

     <RootNamespace>csharp.map.sender</RootNamespace>

     <AssemblyName>csharp.map.sender</AssemblyName>

-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

     <OldToolsVersion>3.5</OldToolsVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

+	<TargetFrameworkProfile />

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x86</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -71,14 +55,14 @@ under the License.
   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

     <DebugSymbols>true</DebugSymbols>

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugType>full</DebugType>

     <PlatformTarget>x64</PlatformTarget>

     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>$(ProjectDir)..\..\..\bin\</OutputPath>

+    <OutputPath>$(ProjectDir)..\..\..\bin\$(Configuration)\</OutputPath>

     <DefineConstants>TRACE</DefineConstants>

     <Optimize>true</Optimize>

     <DebugType>pdbonly</DebugType>

@@ -86,9 +70,8 @@ under the License.
     <ErrorReport>prompt</ErrorReport>

   </PropertyGroup>

   <ItemGroup>

-    <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.messaging.dll</HintPath>

+    <Reference Include="org.apache.qpid.messaging">

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

     </Reference>

   </ItemGroup>

   <ItemGroup>