QPID-4575: C++ Messaging .NET Binding fixes for Visual Studio 2012

Rename msvc10 folders to msvcx as they hold files 2010, 2012, ... Change projects/solutions to .in templates and cmake configure them. Collapse common example csproj files into common template. Add cmake BUILD_BINDING_DOTNET option setting. Fix up various scripts to accomodate new studio version. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1624604 13f79535-47bb-0310-9956-ffa450edef68
author: Charles E. Rolke <chug@apache.org> 2014-09-12 18:23:31 +0000
committer: Charles E. Rolke <chug@apache.org> 2014-09-12 18:23:31 +0000
commit: b6adec415099501c819fc91c79ff0ff8ef9325dd (patch)
tree: 80a3d5e59095d4613f0d151aa7b96891f722e873
parent: 2b3830bc933095cacf01c3e0894495c30ae11ce9 (diff)
download: qpid-python-b6adec415099501c819fc91c79ff0ff8ef9325dd.tar.gz
79 files changed, 882 insertions, 2306 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index fbf11a0a4e..29a52cbb49 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -212,6 +212,9 @@ if (MSVC)
 
   if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src)
     # Set the windows version for the .NET Binding cpp project
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/windows/resources" DOTNET_src)
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/resource1.h" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_relPathToResource ${DOTNET_src} ${DOTNET_tgt})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
                    ${CMAKE_CURRENT_BINARY_DIR}/src/windows/resources/org.apache.qpid.messaging.rc)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
diff --git a/cpp/bindings/CMakeLists.txt b/cpp/bindings/CMakeLists.txt
index 5ba731af05..3c55871ee6 100644
--- a/cpp/bindings/CMakeLists.txt
+++ b/cpp/bindings/CMakeLists.txt
@@ -144,4 +144,16 @@ if (SWIG_FOUND)
   endif (BUILD_BINDING_PERL)
 endif (SWIG_FOUND)
 
+if (MSVC)
+    set (dotnet_binding_default ON)
+else (MSVC)
+    set (dotnet_binding_default OFF)
+endif (MSVC)
+option(BUILD_BINDING_DOTNET "Build DOTNET bindings" ${dotnet_binding_default})
+
+if (BUILD_BINDING_DOTNET)
+    message(STATUS "Building Dotnet bindings")
+    add_subdirectory(qpid/dotnet)
+endif (BUILD_BINDING_DOTNET)
+
 add_subdirectory(qmf2/examples/cpp)
diff --git a/cpp/bindings/qpid/dotnet/CMakeLists.txt b/cpp/bindings/qpid/dotnet/CMakeLists.txt
new file mode 100644
index 0000000000..314990b1db
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/CMakeLists.txt
@@ -0,0 +1,196 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Configure Visual Studio version-specific files into build tree
+
+MACRO (select_msvc9_files)
+    set (sln_proj_SOURCES
+        examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
+        examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
+        examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+        examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+        msvc9/org.apache.qpid.messaging.sessionreceiver.sln
+        msvc9/org.apache.qpid.messaging.sln
+        src/msvc9/org.apache.qpid.messaging.vcproj
+        src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
+        test/messaging.test/msvc9/messaging.test.csproj
+        winsdk_sources/msvc9/winsdk_dotnet_examples.sln
+        winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+        winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
+        winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
+        winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+        winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
+        winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+        winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
+        winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
+        winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+        winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+        winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
+        winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj)
+
+    # Base path from any example project
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/examples/msvc9/csharp.direct.receiver" DOTNET_src)
+    # to source root
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToSrc ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSrc} DOTNET_exampleRelPathToSrc)
+
+    # to org.apache.qpid.messaging.dll through a project reference
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/msvc9/org.apache.qpid.messaging.vcxproj" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToBindingProj ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToBindingProj} DOTNET_exampleRelPathToBindingProj)
+
+    # to org.apache.qpid.messaging.sessionreceiver.dll through a project reference
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToSessionreceiverProj ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSessionreceiverProj} DOTNET_exampleRelPathToSessionreceiverProj)
+
+    # to app.config file
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples/msvc9/app.config" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToAppConfig ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToAppConfig} DOTNET_exampleRelPathToAppConfig)
+ENDMACRO (select_msvc9_files)
+
+MACRO (select_msvcx_files)
+    set (sln_proj_SOURCES
+        examples/msvcx/csharp.example.drain/csharp.example.drain.csproj
+        examples/msvcx/csharp.example.spout/csharp.example.spout.csproj
+        examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+        examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+        msvcx/org.apache.qpid.messaging.sessionreceiver.sln
+        msvcx/org.apache.qpid.messaging.sln
+        src/msvcx/org.apache.qpid.messaging.vcxproj
+        src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj
+        test/messaging.test/msvcx/messaging.test.csproj
+        winsdk_sources/msvcx/winsdk_dotnet_examples.sln
+        winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+        winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj
+        winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj
+        winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+        winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj
+        winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+        winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj
+        winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj
+        winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+        winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+        winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj
+        winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj)
+
+    # Base path from any example project
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/examples/msvcx/csharp.direct.receiver" DOTNET_src)
+    # to source root
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToSrc ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSrc} DOTNET_exampleRelPathToSrc)
+
+    # to org.apache.qpid.messaging.dll through a project reference
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/msvcx/org.apache.qpid.messaging.vcxproj" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToBindingProj ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToBindingProj} DOTNET_exampleRelPathToBindingProj)
+
+    # to org.apache.qpid.messaging.sessionreceiver.dll through a project reference
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToSessionreceiverProj ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSessionreceiverProj} DOTNET_exampleRelPathToSessionreceiverProj)
+
+    # to app.config file
+    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples/msvcx/app.config" DOTNET_tgt)
+    file(RELATIVE_PATH DOTNET_exampleRelPathToAppConfig ${DOTNET_src} ${DOTNET_tgt})
+    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToAppConfig} DOTNET_exampleRelPathToAppConfig)
+ENDMACRO (select_msvcx_files)
+
+MACRO (configure_example_project msvc9_or_x name guid)
+    set(DOTNET_projectName ${name})
+    set(DOTNET_projectGuid ${guid})
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/examples/${msvc9_or_x}/anyproject.csproj.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/examples/${msvc9_or_x}/${DOTNET_projectName}/${DOTNET_projectName}.csproj)
+ENDMACRO (configure_example_project DOTNET_projectName DOTNET_projectGuid)
+
+MACRO (configure_example_projects msvc9_or_x)
+    configure_example_project(${msvc9_or_x} "csharp.direct.receiver"        "52F880E7-D677-4C91-8516-D679CE0F46A8")
+    configure_example_project(${msvc9_or_x} "csharp.direct.sender"          "7B71CE78-8E78-4632-ADBE-F4D5DFAE0068")
+    configure_example_project(${msvc9_or_x} "csharp.example.client"         "0DE01712-C2D1-4CA4-B42C-5856456A8696")
+    configure_example_project(${msvc9_or_x} "csharp.example.declare_queues" "E31B349C-830C-4583-8BD9-30DA4398349F")
+    configure_example_project(${msvc9_or_x} "csharp.example.helloworld"     "8CC1C265-0507-44A3-9483-8FAF48513F4D")
+    configure_example_project(${msvc9_or_x} "csharp.example.server"         "090A081D-E8B5-4949-AA43-EE182B7101E3")
+    configure_example_project(${msvc9_or_x} "csharp.map.receiver"           "AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9")
+    configure_example_project(${msvc9_or_x} "csharp.map.sender"             "5D8252F5-E1D3-44A0-94C7-7CB75E843C10")
+ENDMACRO (configure_example_projects msvc9_or_x)
+
+if (MSVC)
+    # Source and binary folders must be on the same drive so that
+    # relative paths between the two are possible.
+    # Note that this is for the DOTNET binding only and does not apply to the qpid-cpp main build.
+    string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} 0 1 srcDriveLetter)
+    string(SUBSTRING ${CMAKE_CURRENT_BINARY_DIR} 0 1 binDriveLetter)
+    if (NOT (${srcDriveLetter} STREQUAL ${binDriveLetter}))
+        message(FATAL_ERROR "Windows DOTNET binding builds must have source and binary folders on same drive.")
+    endif()
+
+    # General top level folders
+    file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} DOTNET_currentBinaryDir)
+    file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} DOTNET_currentSourceDir)
+    file(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}       DOTNET_projectBinaryDir)
+    file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR}       DOTNET_projectSourceDir)
+
+    # relative path from top-level binary back to top-level source
+    file(RELATIVE_PATH DOTNET_relPathToSrc "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
+    file(TO_NATIVE_PATH ${DOTNET_relPathToSrc} DOTNET_relPathToSrc)
+
+    if((${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008") OR
+       (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64"))
+        # Visual Studio 2008
+        select_msvc9_files()
+        set(DOTNET_MSVC_SELECT              "msvc9")
+        set(DOTNET_SLN_FILE_FORMAT          "10.00")
+        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2008")
+        set(DOTNET_TARGET_FRAMEWORK_VERSION "v3.5")
+        set(DOTNET_PLATFORM_TOOLSET         "")
+
+    elseif((${CMAKE_GENERATOR} STREQUAL "Visual Studio 10") OR
+           (${CMAKE_GENERATOR} STREQUAL "Visual Studio 10 Win64"))
+        # Visual Studio 2010
+        select_msvcx_files()
+        set(DOTNET_MSVC_SELECT              "msvcx")
+        set(DOTNET_SLN_FILE_FORMAT          "11.00")
+        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2010")
+        set(DOTNET_TARGET_FRAMEWORK_VERSION "v4.0")
+        set(DOTNET_PLATFORM_TOOLSET         "")
+
+    elseif((${CMAKE_GENERATOR} STREQUAL "Visual Studio 11") OR
+           (${CMAKE_GENERATOR} STREQUAL "Visual Studio 11 Win64"))
+        # Visual Studio 2012
+        select_msvcx_files()
+        set(DOTNET_MSVC_SELECT              "msvcx")
+        set(DOTNET_SLN_FILE_FORMAT          "12.00")
+        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2012")
+        set(DOTNET_TARGET_FRAMEWORK_VERSION "v4.5")
+        set(DOTNET_PLATFORM_TOOLSET         "<PlatformToolset>v110</PlatformToolset>")
+
+    else()
+        message(FATAL_ERROR "No DOTNET binding support available for ${CMAKE_GENERATOR}")
+    endif()
+
+    # Configure common examples and individual files
+    configure_example_projects( ${DOTNET_MSVC_SELECT} )
+    foreach(slnProjFile ${sln_proj_SOURCES})
+        set (iFile "${slnProjFile}.in")
+        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${iFile} ${CMAKE_CURRENT_BINARY_DIR}/${slnProjFile})
+    endforeach()
+endif (MSVC)
diff --git a/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/cpp/bindings/qpid/dotnet/configure-windows.ps1
index e37ad31129..a698dc88ba 100644
--- a/cpp/bindings/qpid/dotnet/configure-windows.ps1
+++ b/cpp/bindings/qpid/dotnet/configure-windows.ps1
@@ -126,6 +126,7 @@ $global:vsVersion = ''       # "Visual Studio 2010"
 $global:vsShortName = ''     # "2010"
 $global:cmakeGenerator = ''  # "Visual Studio 10"
 $global:vsSubdir = ''        # "msvc10"
+$global:vsSubdirX = ''       # "msvc9" or "msvcx"
 $global:cmakeCompiler = ''   # "-vc100"
 $global:build32or64 = ''     # "32" or "64"
 $global:buildPathSizeId = '' # "x86" or "x64"
@@ -261,7 +262,7 @@ function WriteDotnetBindingSlnLauncherPs1
 $global:txtPath  = ""$boostRoot\lib;$global:txtPath""
 $global:txtQR    = ""$buildRoot""
 $global:txtWH      ""Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment.""
-$cppDir\bindings\qpid\dotnet\$vsSubdir\$slnName
+$buildRoot\bindings\qpid\dotnet\$vsSubdirX\$slnName
 ")
     Write-Host "        $buildRoot\$outfileName"
     $out | Out-File "$buildRoot\$outfileName" -encoding ASCII
@@ -414,6 +415,7 @@ function ParseStudioSelection
         $global:vsVersion = "Visual Studio 2012"
         $global:cmakeGenerator = "Visual Studio 11"
         $global:vsSubdir = "msvc11"
+        $global:vsSubdirX = "msvcx"
         $global:cmakeCompiler = "-vc110"
         $global:vsShortName = "2012"
         $global:vsEnvironment = """%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"""
@@ -421,6 +423,7 @@ function ParseStudioSelection
         $global:vsVersion = "Visual Studio 2010"
         $global:cmakeGenerator = "Visual Studio 10"
         $global:vsSubdir = "msvc10"
+        $global:vsSubdirX = "msvcx"
         $global:cmakeCompiler = "-vc100"
         $global:vsShortName = "2010"
         $global:vsEnvironment = """%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"""
@@ -428,6 +431,7 @@ function ParseStudioSelection
         $global:vsVersion = "Visual Studio 2008"
         $global:cmakeGenerator = "Visual Studio 9 2008"
         $global:vsSubdir = "msvc9"
+        $global:vsSubdirX = "msvc9"
         $global:cmakeCompiler = "-vc90"
         $global:vsShortName = "2008"
         $global:vsEnvironment = """%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"""
@@ -667,5 +671,5 @@ WriteMakeInstallBat             -buildRoot "$build" `
 # an error then the window closes and the user never sees the error. This pause
 # gives him a chance to figure it out.
 #
-Write-Host "Press any key to continue ..."
-[void] $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+#Write-Host "Press any key to continue ..."
+#[void] $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
deleted file mode 100644
index 6339256927..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{52F880E7-D677-4C91-8516-D679CE0F46A8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.direct.receiver</RootNamespace>
-    <AssemblyName>csharp.direct.receiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.direct.receiver\csharp.direct.receiver.cs" />
-    <Compile Include="..\..\csharp.direct.receiver\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj
deleted file mode 100644
index 5d5bcaa2ea..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.direct.sender</RootNamespace>
-    <AssemblyName>csharp.direct.sender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.direct.sender\csharp.direct.sender.cs" />
-    <Compile Include="..\..\csharp.direct.sender\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj
deleted file mode 100644
index 2fb157a453..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E31B349C-830C-4583-8BD9-30DA4398349F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.declare_queues</RootNamespace>
-    <AssemblyName>csharp.example.declare_queues</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.declare_queues\csharp.example.declare_queues.cs" />
-    <Compile Include="..\..\csharp.example.declare_queues\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj
deleted file mode 100644
index b67a2dc9c0..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8CC1C265-0507-44A3-9483-8FAF48513F4D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.helloworld</RootNamespace>
-    <AssemblyName>csharp.example.helloworld</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.helloworld\csharp.example.helloworld.cs" />
-    <Compile Include="..\..\csharp.example.helloworld\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj
deleted file mode 100644
index d2d425b40e..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{090A081D-E8B5-4949-AA43-EE182B7101E3}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.server</RootNamespace>
-    <AssemblyName>csharp.example.server</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.server\csharp.example.server.cs" />
-    <Compile Include="..\..\csharp.example.server\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj
deleted file mode 100644
index 01c9ccc993..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.map.receiver</RootNamespace>
-    <AssemblyName>csharp.map.receiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.map.receiver\csharp.map.receiver.cs" />
-    <Compile Include="..\..\csharp.map.receiver\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
deleted file mode 100644
index a1ff128fab..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj b/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj
deleted file mode 100644
index 25cc785144..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.map.sender</RootNamespace>
-    <AssemblyName>csharp.map.sender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.map.sender\csharp.map.sender.cs" />
-    <Compile Include="..\..\csharp.map.sender\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
index 93735c9ec8..349708b026 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
@@ -1,102 +1,102 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.map.sender</RootNamespace>
-    <AssemblyName>csharp.map.sender</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.map.sender\csharp.map.sender.cs" />
-    <Compile Include="..\..\csharp.map.sender\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{${DOTNET_projectGuid}}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>${DOTNET_projectName}</RootNamespace>
+    <AssemblyName>${DOTNET_projectName}</AssemblyName>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}/${DOTNET_projectName}/${DOTNET_projectName}.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}/${DOTNET_projectName}/Properties/AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
+      <Name>Org.Apache.Qpid.Messaging</Name>
+    </ProjectReference>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
 \ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj
deleted file mode 100644
index 8cea3d7a62..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{52F880E7-D677-4C91-8516-D679CE0F46A8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.direct.receiver</RootNamespace>
-    <AssemblyName>csharp.direct.receiver</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.direct.receiver\csharp.direct.receiver.cs" />
-    <Compile Include="..\..\csharp.direct.receiver\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj
deleted file mode 100644
index 1df7b57d2c..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.direct.sender</RootNamespace>
-    <AssemblyName>csharp.direct.sender</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.direct.sender\csharp.direct.sender.cs" />
-    <Compile Include="..\..\csharp.direct.sender\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj
deleted file mode 100644
index fa1e3de6b1..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0DE01712-C2D1-4CA4-B42C-5856456A8696}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.client</RootNamespace>
-    <AssemblyName>csharp.example.client</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.client\csharp.example.client.cs" />
-    <Compile Include="..\..\csharp.example.client\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj
deleted file mode 100644
index faabb4e099..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E31B349C-830C-4583-8BD9-30DA4398349F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.declare_queues</RootNamespace>
-    <AssemblyName>csharp.example.declare_queues</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.declare_queues\csharp.example.declare_queues.cs" />
-    <Compile Include="..\..\csharp.example.declare_queues\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
index 940b9a2467..b88171db68 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
@@ -30,19 +30,19 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.drain</RootNamespace>
     <AssemblyName>csharp.example.drain</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -50,7 +50,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -59,14 +59,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -74,7 +74,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -82,12 +82,12 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.example.drain\csharp.example.drain.cs" />
-    <Compile Include="..\..\csharp.example.drain\Options.cs" />
-    <Compile Include="..\..\csharp.example.drain\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\csharp.example.drain.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Options.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj
deleted file mode 100644
index b9c99b98a9..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8CC1C265-0507-44A3-9483-8FAF48513F4D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.helloworld</RootNamespace>
-    <AssemblyName>csharp.example.helloworld</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.helloworld\csharp.example.helloworld.cs" />
-    <Compile Include="..\..\csharp.example.helloworld\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj
deleted file mode 100644
index eaec965e19..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{090A081D-E8B5-4949-AA43-EE182B7101E3}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.server</RootNamespace>
-    <AssemblyName>csharp.example.server</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.server\csharp.example.server.cs" />
-    <Compile Include="..\..\csharp.example.server\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
index a8b84252f7..d6c7d43a56 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
@@ -30,19 +30,19 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.spout</RootNamespace>
     <AssemblyName>csharp.example.spout</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -50,7 +50,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -59,14 +59,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -74,7 +74,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -85,12 +85,12 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.example.spout\csharp.example.spout.cs" />
-    <Compile Include="..\..\csharp.example.spout\Options.cs" />
-    <Compile Include="..\..\csharp.example.spout\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\csharp.example.spout.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Options.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index e2c667e6b4..ee851d39f1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
@@ -30,19 +30,19 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.callback.receiver</RootNamespace>
     <AssemblyName>csharp.map.callback.receiver</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -50,7 +50,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -59,14 +59,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -74,7 +74,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -85,15 +85,15 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.map.callback.receiver\csharp.map.callback.receiver.cs" />
-    <Compile Include="..\..\csharp.map.callback.receiver\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\csharp.map.callback.receiver.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToSessionreceiverProj}">
       <Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>
       <Name>org.apache.qpid.messaging.sessionreceiver</Name>
     </ProjectReference>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index eef31c4be2..2fa6a63072 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
@@ -30,12 +30,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.callback.sender</RootNamespace>
     <AssemblyName>csharp.map.callback.sender</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
@@ -43,7 +43,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -51,7 +51,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -60,7 +60,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
@@ -68,7 +68,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -76,7 +76,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -87,11 +87,11 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.map.callback.sender\csharp.map.callback.sender.cs" />
-    <Compile Include="..\..\csharp.map.callback.sender\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\csharp.map.callback.sender.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj
deleted file mode 100644
index a2631b5cd1..0000000000
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.map.receiver</RootNamespace>
-    <AssemblyName>csharp.map.receiver</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.map.receiver\csharp.map.receiver.cs" />
-    <Compile Include="..\..\csharp.map.receiver\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
-\ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj b/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
index 1d98e01505..34fad8d9c3 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
@@ -1,110 +1,116 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0DE01712-C2D1-4CA4-B42C-5856456A8696}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>csharp.example.client</RootNamespace>
-    <AssemblyName>csharp.example.client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\csharp.example.client\csharp.example.client.cs" />
-    <Compile Include="..\..\csharp.example.client\Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{${DOTNET_projectGuid}}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>${DOTNET_projectName}</RootNamespace>
+    <AssemblyName>${DOTNET_projectName}</AssemblyName>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\${DOTNET_projectName}\${DOTNET_projectName}.cs">
+        <Link>${DOTNET_projectName}.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\${DOTNET_projectName}\Properties\AssemblyInfo.cs">
+        <Link>AssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="${DOTNET_exampleRelPathToAppConfig}">
+        <Link>app.config</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
+      <Name>Org.Apache.Qpid.Messaging</Name>
+    </ProjectReference>
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
 \ No newline at end of file
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config b/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
index a1ff128fab..a1ff128fab 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
+++ b/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
index 48572dcfb7..704dab73fd 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
@@ -30,7 +30,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.drain</RootNamespace>
     <AssemblyName>csharp.example.drain</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -40,14 +40,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -55,7 +55,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -64,14 +64,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -79,7 +79,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -87,18 +87,26 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.example.drain\csharp.example.drain.cs" />
-    <Compile Include="..\..\csharp.example.drain\Options.cs" />
-    <Compile Include="..\..\csharp.example.drain\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\csharp.example.drain.cs">
+        <Link>csharp.example.drain.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Options.cs">
+        <Link>Options.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Properties\AssemblyInfo.cs">
+        <Link>AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="${DOTNET_exampleRelPathToAppConfig}">
+        <Link>App.Config</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
index 863e1426cb..492459b96a 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
@@ -30,7 +30,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.spout</RootNamespace>
     <AssemblyName>csharp.example.spout</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -40,14 +40,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -55,7 +55,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -64,14 +64,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -79,7 +79,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -90,18 +90,26 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.example.spout\csharp.example.spout.cs" />
-    <Compile Include="..\..\csharp.example.spout\Options.cs" />
-    <Compile Include="..\..\csharp.example.spout\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\csharp.example.spout.cs">
+        <Link>csharp.example.spout.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Options.cs">
+        <Link>Options.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Properties\AssemblyInfo.cs">
+        <Link>AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="${DOTNET_exampleRelPathToAppConfig}">
+        <Link>App.Config</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index d5155822ab..bf9beef133 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
@@ -30,7 +30,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.callback.receiver</RootNamespace>
     <AssemblyName>csharp.map.callback.receiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -40,14 +40,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -55,7 +55,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -64,14 +64,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -79,7 +79,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -90,21 +90,27 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.map.callback.receiver\csharp.map.callback.receiver.cs" />
-    <Compile Include="..\..\csharp.map.callback.receiver\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\csharp.map.callback.receiver.cs">
+        <Link>csharp.map.callback.receiver.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\Properties\AssemblyInfo.cs">
+        <Link>AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToSessionreceiverProj}">
       <Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>
       <Name>org.apache.qpid.messaging.sessionreceiver</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="${DOTNET_exampleRelPathToAppConfig}">
+        <Link>App.Config</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index 82753f4d66..f475921566 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
@@ -30,7 +30,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.callback.sender</RootNamespace>
     <AssemblyName>csharp.map.callback.sender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
@@ -48,7 +48,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -56,7 +56,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -65,7 +65,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
@@ -73,7 +73,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -81,7 +81,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -92,17 +92,23 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\csharp.map.callback.sender\csharp.map.callback.sender.cs" />
-    <Compile Include="..\..\csharp.map.callback.sender\Properties\AssemblyInfo.cs" />
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\csharp.map.callback.sender.cs">
+        <Link>csharp.map.callback.sender.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\Properties\AssemblyInfo.cs">
+        <Link>AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="${DOTNET_exampleRelPathToAppConfig}">
+        <Link>App.Config</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln b/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
index 112511e5e5..5e754aa752 100644
--- a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
+++ b/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -19,9 +19,9 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # under the License
 #
 
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "..\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "${CMAKE_CURRENT_BINARY_DIR}\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${CMAKE_CURRENT_BINARY_DIR}\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln b/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
index 4ab296ec44..7ebbe7c9e0 100644
--- a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln
+++ b/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
 
 # 
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # under the License
 #
 
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "..\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.Qpid.Messaging", "${CMAKE_CURRENT_BINARY_DIR}\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{34C477FB-B0CC-4AB9-A346-EA7B055469AC}"
 EndProject
@@ -28,58 +28,58 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Direct", "Direct", "{DE58D3
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pub-Sub", "Pub-Sub", "{878FDDF8-A870-41D6-9E36-0A050EC5ACAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "..\examples\msvc9\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "..\examples\msvc9\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{39E9D1BF-3A0B-4D86-BF6B-F463E1A2245A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "..\test\messaging.test\msvc9\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "${CMAKE_CURRENT_BINARY_DIR}\test\messaging.test\msvc9\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuredMessage", "StructuredMessage", "{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "..\examples\msvc9\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "..\examples\msvc9\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${CMAKE_CURRENT_BINARY_DIR}\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "..\examples\msvc9\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "..\examples\msvc9\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client-Server", "Client-Server", "{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "..\examples\msvc9\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "..\examples\msvc9\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "..\examples\msvc9\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "..\examples\msvc9\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "..\examples\msvc9\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hello World", "Hello World", "{4408A2DA-ED2D-44AE-A465-0B6D75E1FF86}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "..\examples\msvc9\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln b/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
index 98355d804f..2909a66784 100644
--- a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
+++ b/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
 
 # 
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # under the License
 #
 
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "..\src\msvc10\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "${DOTNET_currentBinaryDir}\src\msvcx\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${DOTNET_currentBinaryDir}\src\sessionreceiver\msvcx\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln b/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
index ed79c85c1a..aa1820c54a 100644
--- a/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
+++ b/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
 
 # 
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -34,50 +34,50 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client-Server", "Client-Ser
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "..\src\msvc10\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "${DOTNET_currentBinaryDir}\src\msvcx\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "..\examples\msvc10\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "..\examples\msvc10\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "..\test\messaging.test\msvc10\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "${DOTNET_currentBinaryDir}\test\messaging.test\msvcx\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "..\examples\msvc10\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "..\examples\msvc10\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "..\src\sessionreceiver\msvc10\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${DOTNET_currentBinaryDir}\src\sessionreceiver\msvcx\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "..\examples\msvc10\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "..\examples\msvc10\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "..\examples\msvc10\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "..\examples\msvc10\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "..\examples\msvc10\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "..\examples\msvc10\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "..\examples\msvc10\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "..\examples\msvc10\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj b/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in
index bae1239e18..c98252a539 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
+++ b/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in
@@ -41,8 +41,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+			IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			ManagedExtensions="1"
@@ -67,7 +67,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\..\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\src&quot;"
+				AdditionalIncludeDirectories="&quot;${PROJECT_SOURCE_DIR}\include&quot;;&quot;${PROJECT_SOURCE_DIR}\src&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -86,13 +86,13 @@
 			<Tool
 				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.messaging.dll"
+				AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclientd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommond.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessagingd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypesd.lib"
+				OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				TargetMachine="1"
-				KeyFile="..\qpid.snk"
+				KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -119,8 +119,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+			IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			ManagedExtensions="1"
@@ -146,7 +146,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\..\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\src&quot;"
+				AdditionalIncludeDirectories="&quot;${PROJECT_SOURCE_DIR}\include&quot;;&quot;${PROJECT_SOURCE_DIR}\src&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -165,13 +165,13 @@
 			<Tool
 				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.messaging.dll"
+				AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclientd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommond.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessagingd.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypesd.lib"
+				OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				TargetMachine="17"
-				KeyFile="..\qpid.snk"
+				KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -198,8 +198,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+			IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			ManagedExtensions="1"
@@ -224,7 +224,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\..\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\src&quot;"
+				AdditionalIncludeDirectories="&quot;${PROJECT_SOURCE_DIR}\include&quot;;&quot;${PROJECT_SOURCE_DIR}\src&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -243,13 +243,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /STACK:10000000 /machine:I386"
-				AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
-				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+				AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+				OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				TargetMachine="1"
-				KeyFile="..\qpid.snk"
+				KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -275,8 +275,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+			IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			ManagedExtensions="1"
@@ -302,7 +302,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\..\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\src&quot;"
+				AdditionalIncludeDirectories="&quot;${PROJECT_SOURCE_DIR}\include&quot;;&quot;${PROJECT_SOURCE_DIR}\src&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -321,13 +321,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /STACK:10000000"
-				AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
-				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+				AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+				OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				TargetMachine="17"
-				KeyFile="..\qpid.snk"
+				KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -353,8 +353,8 @@
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|Win32"
-			OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+			IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			ManagedExtensions="1"
@@ -379,7 +379,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\..\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\src&quot;"
+				AdditionalIncludeDirectories="&quot;${PROJECT_SOURCE_DIR}\include&quot;;&quot;${PROJECT_SOURCE_DIR}\src&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -398,13 +398,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /STACK:10000000 /machine:I386"
-				AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
-				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+				AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+				OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				TargetMachine="1"
-				KeyFile="..\qpid.snk"
+				KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -430,8 +430,8 @@
 		</Configuration>
 		<Configuration
 			Name="RelWithDebInfo|x64"
-			OutputDirectory="$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)"
+			IntermediateDirectory="${PROJECT_BINARY_DIR}\obj\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			ManagedExtensions="1"
@@ -457,7 +457,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\..\..\include&quot;;&quot;$(ProjectDir)..\..\..\..\..\src&quot;"
+				AdditionalIncludeDirectories="&quot;${PROJECT_SOURCE_DIR}\include&quot;;&quot;${PROJECT_SOURCE_DIR}\src&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -476,13 +476,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /STACK:10000000"
-				AdditionalDependencies="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidclient.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidcommon.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidmessaging.lib $(QPID_BUILD_ROOT)\src\$(ConfigurationName)\qpidtypes.lib"
-				OutputFile="$(QPID_BUILD_ROOT)\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
+				AdditionalDependencies="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidclient.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidcommon.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidmessaging.lib ${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\qpidtypes.lib"
+				OutputFile="${PROJECT_BINARY_DIR}\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				TargetMachine="17"
-				KeyFile="..\qpid.snk"
+				KeyFile="${CMAKE_CURRENT_SOURCE_DIR}\src\qpid.snk"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -526,43 +526,43 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\Address.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Address.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp"
+				RelativePath="${PROJECT_BINARY_DIR}\src\windows\generated_src\AssemblyInfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Connection.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Connection.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\FailoverUpdates.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\FailoverUpdates.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Logger.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Logger.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Message.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Message.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Receiver.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Receiver.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Sender.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Sender.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Session.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Session.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\TypeTranslator.cpp"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\TypeTranslator.cpp"
 				>
 			</File>
 		</Filter>
@@ -572,55 +572,55 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\Address.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Address.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Connection.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Connection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Duration.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Duration.h"
 				>
 			</File>
 			<File
-				RelativePath="..\FailoverUpdates.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\FailoverUpdates.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Logger.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Logger.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Message.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Message.h"
 				>
 			</File>
 			<File
-				RelativePath="..\QpidException.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\QpidException.h"
 				>
 			</File>
 			<File
-				RelativePath="..\QpidMarshal.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\QpidMarshal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\QpidTypeCheck.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\QpidTypeCheck.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Receiver.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Receiver.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Sender.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Sender.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Session.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\Session.h"
 				>
 			</File>
 			<File
-				RelativePath="..\TypeTranslator.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\TypeTranslator.h"
 				>
 			</File>
 		</Filter>
@@ -630,20 +630,20 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\app.ico"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\app.ico"
 				>
 			</File>
 			<File
-				RelativePath="$(QPID_BUILD_ROOT)\src\windows\resources\org.apache.qpid.messaging.rc"
+				RelativePath="${PROJECT_BINARY_DIR}\src\windows\resources\org.apache.qpid.messaging.rc"
 				>
 			</File>
 			<File
-				RelativePath="..\resource1.h"
+				RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\resource1.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\ReadMe.txt"
+			RelativePath="${CMAKE_CURRENT_SOURCE_DIR}\src\ReadMe.txt"
 			>
 		</File>
 	</Files>
diff --git a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters b/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in
index 25ea55f289..5d176e7586 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
+++ b/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in
@@ -33,83 +33,83 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Address.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Address.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AssemblyInfo.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\AssemblyInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Connection.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Connection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FailoverUpdates.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Message.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Message.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Receiver.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Receiver.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Sender.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Sender.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Session.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Session.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TypeTranslator.cpp">
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\TypeTranslator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Address.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Address.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Connection.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Connection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Duration.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Duration.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="FailoverUpdates.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Message.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Message.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="QpidException.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidException.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="QpidMarshal.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidMarshal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="QpidTypeCheck.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidTypeCheck.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Receiver.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Receiver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Sender.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Sender.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Session.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Session.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TypeTranslator.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\TypeTranslator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource1.h">
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\resource1.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.ico">
+    <None Include="${DOTNET_currentSourceDir}\src\app.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="ReadMe.txt" />
+    <None Include="${DOTNET_currentSourceDir}\src\ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="$(QPID_BUILD_ROOT)\src\windows\resources\org.apache.qpid.messaging.rc">
+    <ResourceCompile Include="${DOTNET_projectBinaryDir}\src\windows\resources\org.apache.qpid.messaging.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj b/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in
index c10c2da0dc..db95fa6927 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
+++ b/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in
@@ -48,7 +48,7 @@
     <ProjectGuid>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</ProjectGuid>
     <RootNamespace>org.apache.qpid.messaging</RootNamespace>
     <Keyword>ManagedCProj</Keyword>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
@@ -56,36 +56,42 @@
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    ${DOTNET_PLATFORM_TOOLSET}
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    ${DOTNET_PLATFORM_TOOLSET}
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    ${DOTNET_PLATFORM_TOOLSET}
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    ${DOTNET_PLATFORM_TOOLSET}
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    ${DOTNET_PLATFORM_TOOLSET}
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    ${DOTNET_PLATFORM_TOOLSET}
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -111,32 +117,32 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(ProjectDir)obj\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">${DOTNET_projectBinaryDir}\src\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">${DOTNET_projectBinaryDir}\obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkIncremental>
-    <LinkKeyFile>..\qpid.snk</LinkKeyFile>
+    <LinkKeyFile>${DOTNET_currentSourceDir}\src\qpid.snk</LinkKeyFile>
     <LinkDelaySign>true</LinkDelaySign>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -145,15 +151,15 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclientd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommond.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessagingd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+      <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclientd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommond.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessagingd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+      <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,7 +169,7 @@
     <ClCompile>
       <AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -172,22 +178,22 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalOptions> /STACK:10000000 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclientd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommond.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessagingd.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+      <AdditionalOptions> /STACK:10000000 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclientd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommond.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessagingd.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypesd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+      <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -196,15 +202,15 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+      <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+      <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -214,7 +220,7 @@
     <ClCompile>
       <AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -223,22 +229,22 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalOptions> /STACK:10000000 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+      <AdditionalOptions> /STACK:10000000 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+      <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
     <ClCompile>
       <AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -247,15 +253,15 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+      <AdditionalOptions> /STACK:10000000 /machine:I386 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+      <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
@@ -265,7 +271,7 @@
     <ClCompile>
       <AdditionalOptions> /Zm1000 /wd4244 /wd4800 /wd4355 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\include;$(ProjectDir)..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>${PROJECT_SOURCE_DIR}\include;${PROJECT_SOURCE_DIR}\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -274,15 +280,15 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalOptions> /STACK:10000000 /KEYFILE:..\qpid.snk %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidclient.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidcommon.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidmessaging.lib;$(QPID_BUILD_ROOT)\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(QPID_BUILD_ROOT)\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
+      <AdditionalOptions> /STACK:10000000 /KEYFILE:${DOTNET_currentSourceDir}\src\qpid.snk %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidclient.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidcommon.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidmessaging.lib;${DOTNET_projectBinaryDir}\src\$(Configuration)\qpidtypes.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>${DOTNET_projectBinaryDir}\src\$(Configuration)\org.apache.qpid.messaging.dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>sn.exe -Ra "$(TargetPath)" "..\qpid.snk"</Command>
+      <Command>sn.exe -Ra "$(TargetPath)" "${DOTNET_currentSourceDir}\src\qpid.snk"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -296,39 +302,39 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Address.cpp" />
-    <ClCompile Include="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp" />
-    <ClCompile Include="..\Connection.cpp" />
-    <ClCompile Include="..\FailoverUpdates.cpp" />
-    <ClCompile Include="..\Logger.cpp" />
-    <ClCompile Include="..\Message.cpp" />
-    <ClCompile Include="..\Receiver.cpp" />
-    <ClCompile Include="..\Sender.cpp" />
-    <ClCompile Include="..\Session.cpp" />
-    <ClCompile Include="..\TypeTranslator.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Address.cpp" />
+    <ClCompile Include="${DOTNET_projectBinaryDir}\src\windows\generated_src\AssemblyInfo.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Connection.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Logger.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Message.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Receiver.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Sender.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\Session.cpp" />
+    <ClCompile Include="${DOTNET_currentSourceDir}\src\TypeTranslator.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Address.h" />
-    <ClInclude Include="..\Connection.h" />
-    <ClInclude Include="..\Duration.h" />
-    <ClInclude Include="..\FailoverUpdates.h" />
-    <ClInclude Include="..\Logger.h" />
-    <ClInclude Include="..\Message.h" />
-    <ClInclude Include="..\QpidException.h" />
-    <ClInclude Include="..\QpidMarshal.h" />
-    <ClInclude Include="..\QpidTypeCheck.h" />
-    <ClInclude Include="..\Receiver.h" />
-    <ClInclude Include="..\Sender.h" />
-    <ClInclude Include="..\Session.h" />
-    <ClInclude Include="..\TypeTranslator.h" />
-    <ClInclude Include="..\resource1.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Address.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Connection.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Duration.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\FailoverUpdates.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Logger.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Message.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidException.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidMarshal.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\QpidTypeCheck.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Receiver.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Sender.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\Session.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\TypeTranslator.h" />
+    <ClInclude Include="${DOTNET_currentSourceDir}\src\resource1.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\app.ico" />
-    <None Include="..\ReadMe.txt" />
+    <None Include="${DOTNET_currentSourceDir}\src\app.ico" />
+    <None Include="${DOTNET_currentSourceDir}\src\ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="$(QPID_BUILD_ROOT)\src\windows\resources\org.apache.qpid.messaging.rc" />
+    <ResourceCompile Include="${DOTNET_projectBinaryDir}\src\windows\resources\org.apache.qpid.messaging.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc b/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
index 1c529c285a..8ce231912d 100644
--- a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
+++ b/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
@@ -19,7 +19,7 @@
 
 // Microsoft Visual C++ generated resource script.
 //
-#include "..\resource1.h"
+#include "${DOTNET_relPathToResource}"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource1.h\0"
+    "${DOTNET_relPathToResource}\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj b/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in
index 8020d95591..1c54517823 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
+++ b/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in
@@ -28,16 +28,16 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>org.apache.qpid.messaging.sessionreceiver</RootNamespace>
     <AssemblyName>org.apache.qpid.messaging.sessionreceiver</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\qpid.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>${CMAKE_CURRENT_SOURCE_DIR}/src/qpid.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -45,21 +45,21 @@ under the License.
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -68,14 +68,14 @@ under the License.
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -83,7 +83,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|AnyCPU' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -91,7 +91,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -99,7 +99,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -110,17 +110,17 @@ under the License.
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\sessionreceiver.cs" />
-    <Compile Include="$(QPID_BUILD_ROOT)\src\windows\generated_src\sessionreceiver-AssemblyInfo.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/src/sessionreceiver/sessionreceiver.cs" />
+    <Compile Include="${PROJECT_BINARY_DIR}/src/windows/generated_src/sessionreceiver-AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\msvc9\org.apache.qpid.messaging.vcproj">
+    <ProjectReference Include="../${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\qpid.snk" />
+    <None Include="${CMAKE_CURRENT_SOURCE_DIR}/src/qpid.snk" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj b/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in
index fd24983a87..33d1f562e3 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj
+++ b/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in
@@ -28,10 +28,10 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>org.apache.qpid.messaging.sessionreceiver</RootNamespace>
     <AssemblyName>org.apache.qpid.messaging.sessionreceiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(ProjectDir)..\qpid.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>${DOTNET_currentSourceDir}\src\qpid.snk</AssemblyOriginatorKeyFile>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -42,7 +42,7 @@ under the License.
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -50,21 +50,21 @@ under the License.
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -73,14 +73,14 @@ under the License.
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -88,7 +88,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|AnyCPU' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -96,7 +96,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -104,7 +104,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -115,17 +115,23 @@ under the License.
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\sessionreceiver.cs" />
-    <Compile Include="$(QPID_BUILD_ROOT)\src\windows\generated_src\sessionreceiver-AssemblyInfo.cs" />
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\src\sessionreceiver\sessionreceiver.cs">
+        <Link>sessionreceiver.cs</Link>
+    </Compile>
+    <Compile Include="${DOTNET_projectBinaryDir}\src\windows\generated_src\sessionreceiver-AssemblyInfo.cs">
+        <Link>sessionreceiver-AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\msvc10\org.apache.qpid.messaging.vcxproj">
+    <ProjectReference Include="..\${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(ProjectDir)..\qpid.snk" />
+    <None Include="..\..\..\${DOTNET_relPathToSrc}\src\qpid.snk">
+        <Link>qpid.snk</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj b/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in
index 8e02304f85..13874d35b1 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj
+++ b/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>messaging.test</RootNamespace>
     <AssemblyName>messaging.test</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
     </StartupObject>
@@ -52,7 +52,7 @@ under the License.
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -60,21 +60,21 @@ under the License.
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -83,14 +83,14 @@ under the License.
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -128,12 +128,12 @@ under the License.
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\messaging.test.address.cs" />
-    <Compile Include="..\messaging.test.connection.cs" />
-    <Compile Include="..\messaging.test.cs" />
-    <Compile Include="..\messaging.test.duration.cs" />
-    <Compile Include="..\messaging.test.message.cs" />
-    <Compile Include="..\Properties\AssemblyInfo.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/test/messaging.test/messaging.test.address.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/test/messaging.test/messaging.test.connection.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/test/messaging.test/messaging.test.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/test/messaging.test/messaging.test.duration.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/test/messaging.test/messaging.test.message.cs" />
+    <Compile Include="${CMAKE_CURRENT_SOURCE_DIR}/test/messaging.test/Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@@ -158,7 +158,7 @@ under the License.
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc9\org.apache.qpid.messaging.vcproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj b/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in
index 673877e121..c77315f0be 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj
+++ b/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>messaging.test</RootNamespace>
     <AssemblyName>messaging.test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject>
     </StartupObject>
@@ -57,7 +57,7 @@ under the License.
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -65,21 +65,21 @@ under the License.
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -88,14 +88,14 @@ under the License.
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(QPID_BUILD_ROOT)\src\$(Configuration)\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -103,7 +103,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|AnyCPU' ">
-    <OutputPath>bin\RelWithDebInfo\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -111,7 +111,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>bin\x86\RelWithDebInfo\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -119,7 +119,7 @@ under the License.
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>bin\x64\RelWithDebInfo\</OutputPath>
+    <OutputPath>${PROJECT_BINARY_DIR}/src/$(Configuration)/</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -133,12 +133,24 @@ under the License.
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\messaging.test.address.cs" />
-    <Compile Include="..\messaging.test.connection.cs" />
-    <Compile Include="..\messaging.test.cs" />
-    <Compile Include="..\messaging.test.duration.cs" />
-    <Compile Include="..\messaging.test.message.cs" />
-    <Compile Include="..\Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\test\messaging.test\messaging.test.address.cs">
+      <Link>messaging.test.address.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\test\messaging.test\messaging.test.connection.cs">
+      <Link>messaging.test.connection.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\test\messaging.test\messaging.test.cs">
+      <Link>messaging.test.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\test\messaging.test\messaging.test.duration.cs">
+      <Link>messaging.test.duration.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\test\messaging.test\messaging.test.message.cs">
+      <Link>messaging.test.message.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\${DOTNET_relPathToSrc}\test\messaging.test\Properties\AssemblyInfo.cs">
+      <Link>AssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@@ -163,7 +175,7 @@ under the License.
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\msvc10\org.apache.qpid.messaging.vcxproj">
+    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
       <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
       <Name>Org.Apache.Qpid.Messaging</Name>
     </ProjectReference>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
index 45258fa843..45258fa843 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
index f11603ac69..f11603ac69 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in
index 1d78ff1a66..1d78ff1a66 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
index d3082838ef..d3082838ef 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in
index 0f6832b069..0f6832b069 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
index a8b1b1465e..a8b1b1465e 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in
index d3958ef68f..d3958ef68f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in
index b009ddbf1d..b009ddbf1d 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index ddd5523ba6..ddd5523ba6 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index 747ca6fb3f..747ca6fb3f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
index b71e1667b9..b71e1667b9 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in
index 6775913ede..6775913ede 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in
index 6db55b5590..6db55b5590 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
index 1efc9de594..82f4e384ef 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.direct.receiver</RootNamespace>
     <AssemblyName>csharp.direct.receiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
index b40ad1145d..e7e07064bb 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.direct.sender</RootNamespace>
     <AssemblyName>csharp.direct.sender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in
index f49ba9e639..3baddb12b9 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.client</RootNamespace>
     <AssemblyName>csharp.example.client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
index 5e59fbc369..99d5a598b0 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.declare_queues</RootNamespace>
     <AssemblyName>csharp.example.declare_queues</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in
index 2e2c97370e..5b3eab16ce 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.drain</RootNamespace>
     <AssemblyName>csharp.example.drain</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
index de54c0feb8..1ef196cdce 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.helloworld</RootNamespace>
     <AssemblyName>csharp.example.helloworld</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in
index 52e73ee86c..26f68c8007 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.server</RootNamespace>
     <AssemblyName>csharp.example.server</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in
index bb26be87a7..55a41c8de5 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.example.spout</RootNamespace>
     <AssemblyName>csharp.example.spout</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index efedc1eb67..dc6f6f0db3 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.callback.receiver</RootNamespace>
     <AssemblyName>csharp.map.callback.receiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index 148c79bd40..dbc06ae49f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.callback.sender</RootNamespace>
     <AssemblyName>csharp.map.callback.sender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
index 3b73be2d5c..8ae1bdec87 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.receiver</RootNamespace>
     <AssemblyName>csharp.map.receiver</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in
index 3d5f94e2e1..ed79f871bd 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in
@@ -28,7 +28,7 @@ under the License.
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>csharp.map.sender</RootNamespace>
     <AssemblyName>csharp.map.sender</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in
index c180ded45a..1e82f6833b 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
+++ b/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}
+# ${DOTNET_SLN_VISUAL_STUDIO}
 
 # 
 # Licensed to the Apache Software Foundation (ASF) under one
diff --git a/cpp/bld-winsdk.ps1 b/cpp/bld-winsdk.ps1
index 2f00f203dd..c90cab69fe 100644
--- a/cpp/bld-winsdk.ps1
+++ b/cpp/bld-winsdk.ps1
@@ -22,9 +22,15 @@
 # It builds a single SDK.zip file.
 # The environment for the build has been set up externally so
 # that 'devenv' runs the right version of Visual Studio (2008
-# or 2010) and the right architecture (x86 or x64), typically:
-# C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat or
-# C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64\vcvarsamd64.bat
+# 2010 2012) and the right architecture (x86 or x64), typically:
+#    call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+#    call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
+# or
+#    call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+#    call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
+# or
+#    call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+#    call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
 #
 # On entry:
 #  1. Args[0] holds the BOOST_ROOT directory.            "c:\boost"
@@ -33,7 +39,7 @@
 #     The version number embedded in the built executables and libraries
 #     comes from qpid/cpp/src/CMakeWinVersions.cmake.
 #  3. Args[2] holds the Visual Studio version handle     "VS2010"
-#     Either VS2008 or VS2010. Defaults to VS2008.
+#     Pick VS2008, VS2010, or VS2012. Defaults to VS2008.
 #  4. Args[3] holds the architecture handle              "x86"
 #     Either x86 or x64. Defaults to x86.
 #  5. This file exists in directory kitroot/qpid/cpp.
@@ -127,6 +133,7 @@ function BuildAPlatform
     [string] $platform_dir  = "$global:currentDirectory/$platform-$vsName"
     [string] $qpid_cpp_src  = "$global:currentDirectory/$qpid_cpp_dir"
     [string] $msvcVer       = ""
+    [string] $msvcVerX      = ""
     
     Write-Host "BuildAPlatform"
     Write-Host " qpid_cpp_dir   : $qpid_cpp_dir"
@@ -143,12 +150,19 @@ function BuildAPlatform
     #
     if ($vsName -eq "VS2008") {
         $msvcVer = "msvc9"
+        $msvcVerX = "msvc9"
     } else {
         if ($vsName -eq "VS2010") {
             $msvcVer = "msvc10"
+            $msvcVerX = "msvcx"
         } else {
-            Write-Host "illegal vsName parameter: $vsName Choose VS2008 or VS2010"
-            exit
+            if ($vsName -eq "VS2012") {
+                $msvcVer = "msvc11"
+                $msvcVerX = "msvcx"
+            } else {
+                Write-Host "illegal vsName parameter: $vsName Choose VS2008, VS2010, or VS2012"
+                exit
+            }
         }
     }
     
@@ -189,7 +203,7 @@ function BuildAPlatform
     devenv qpid-cpp.sln /build "$vsTargetDebug"   /project INSTALL
     devenv qpid-cpp.sln /build "$vsTargetRelease" /project INSTALL
 
-    $bindingSln = Resolve-Path $qpid_cpp_src\bindings\qpid\dotnet\$msvcVer\org.apache.qpid.messaging.sln
+    $bindingSln = Resolve-Path $platform_dir\bindings\qpid\dotnet\$msvcVerX\org.apache.qpid.messaging.sln
     
     # Build the .NET binding
     if ("x86" -eq $platform) {
@@ -304,7 +318,7 @@ function BuildAPlatform
     cmd /c "rd /s /q ""$install_dir/dotnet_examples/examples/msvc10"""
     
     # TODO: Fix up the .NET binding example solution/projects before including them.
-    $src = Resolve-Path "$qpid_cpp_src/bindings/qpid/dotnet/winsdk_sources/$msvcVer"
+    $src = Resolve-Path "$platform_dir/bindings/qpid/dotnet/winsdk_sources/$msvcVerX"
     $dst = Resolve-Path "$install_dir/dotnet_examples"
     Copy-Item "$src\*" -destination "$dst\" -recurse -force
 
@@ -368,8 +382,12 @@ if ( !($global:vsVersion -eq $null) ) {
         if ($global:vsVersion -eq "VS2010") {
             $generator = "Visual Studio 10"
         } else {
-            Write-Host "Visual Studio Version must be VS2008 or VS2010"
-            exit
+            if ($global:vsVersion -eq "VS2012") {
+                $generator = "Visual Studio 11"
+            } else {
+                Write-Host "Visual Studio Version must be VS2008, VS2010, or VS2012"
+                exit
+            }
         }
     }
 } else {
author	Charles E. Rolke <chug@apache.org>	2014-09-12 18:23:31 +0000
committer	Charles E. Rolke <chug@apache.org>	2014-09-12 18:23:31 +0000
commit	b6adec415099501c819fc91c79ff0ff8ef9325dd (patch)
tree	80a3d5e59095d4613f0d151aa7b96891f722e873
parent	2b3830bc933095cacf01c3e0894495c30ae11ce9 (diff)
download	qpid-python-b6adec415099501c819fc91c79ff0ff8ef9325dd.tar.gz