You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2014/09/12 20:23:34 UTC
svn commit: r1624604 [1/3] - in /qpid/trunk/qpid/cpp: ./ bindings/ bindings/qpid/dotnet/ bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/ bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/ bindings/qpid/dotnet/examples/msvc10/csharp...

Author: chug
Date: Fri Sep 12 18:23:31 2014
New Revision: 1624604

URL: http://svn.apache.org/r1624604
Log:
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.

Added:
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in
      - copied, changed from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
Removed:
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.sender/csharp.direct.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.client/csharp.example.client.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.declare_queues/csharp.example.declare_queues.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.helloworld/csharp.example.helloworld.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.server/csharp.example.server.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.receiver/csharp.map.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/app.config
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.direct.sender/csharp.direct.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.client/csharp.example.client.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.declare_queues/csharp.example.declare_queues.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.helloworld/csharp.example.helloworld.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.server/csharp.example.server.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sessionreceiver.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc10/org.apache.qpid.messaging.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj.filters
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc10/org.apache.qpid.messaging.sessionreceiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc10/messaging.test.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.direct.sender/csharp.direct.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.client/csharp.example.client.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.server/csharp.example.server.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.receiver/csharp.map.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/examples/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc10/winsdk_dotnet_examples.sln
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln
Modified:
    qpid/trunk/qpid/cpp/CMakeLists.txt
    qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
    qpid/trunk/qpid/cpp/bld-winsdk.ps1

Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1624604&r1=1624603&r2=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Fri Sep 12 18:23:31 2014
@@ -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

Modified: qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/CMakeLists.txt?rev=1624604&r1=1624603&r2=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/CMakeLists.txt Fri Sep 12 18:23:31 2014
@@ -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)

Added: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt?rev=1624604&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt (added)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt Fri Sep 12 18:23:31 2014
@@ -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)

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1?rev=1624604&r1=1624603&r2=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 Fri Sep 12 18:23:31 2014
@@ -126,6 +126,7 @@ $global:vsVersion = ''       # "Visual S
 $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 WriteDotnetBindingSlnLauncherPs
 $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             -buildRo
 # 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")

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.sender/csharp.map.sender.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in Fri Sep 12 18:23:31 2014
@@ -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

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in Fri Sep 12 18:23:31 2014
@@ -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>

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in Fri Sep 12 18:23:31 2014
@@ -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>

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in Fri Sep 12 18:23:31 2014
@@ -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>

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in Fri Sep 12 18:23:31 2014
@@ -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>

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/csharp.direct.receiver.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in Fri Sep 12 18:23:31 2014
@@ -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>{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>
-  -->
+ï»¿<?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

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.direct.receiver/app.config&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in (from r1624570, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj&r1=1624570&r2=1624604&rev=1624604&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvc10/csharp.example.drain/csharp.example.drain.csproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in Fri Sep 12 18:23:31 2014
@@ -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. 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org