diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-21 16:15:28 -0700 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-21 16:15:28 -0700 |
commit | d2350db627b5ef7c9ebe6fd150b3007b0af1e660 (patch) | |
tree | 6817d8679ad3efadb78e7c275429fd9372ee4058 /tools/NUnit/samples/cpp/cpp-cli/syntax/cpp-cli-syntax.build | |
parent | b5c8335f528acbca046ca2844f8e4c12cfa9cba3 (diff) | |
parent | 4f2ccab7a53819c7d0c4008626995e95ece4dd34 (diff) | |
download | DotNetOpenAuth-d2350db627b5ef7c9ebe6fd150b3007b0af1e660.zip DotNetOpenAuth-d2350db627b5ef7c9ebe6fd150b3007b0af1e660.tar.gz DotNetOpenAuth-d2350db627b5ef7c9ebe6fd150b3007b0af1e660.tar.bz2 |
Merge branch 'v3.4' into oauth2
Conflicts:
projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj
projecttemplates/RelyingPartyLogic/CreateDatabase.sql
samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
src/DotNetOpenAuth/Messaging/MessagingStrings.resx
src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
src/DotNetOpenAuth/OAuth/ChannelElements/OAuthChannel.cs
src/version.txt
Diffstat (limited to 'tools/NUnit/samples/cpp/cpp-cli/syntax/cpp-cli-syntax.build')
-rw-r--r-- | tools/NUnit/samples/cpp/cpp-cli/syntax/cpp-cli-syntax.build | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/NUnit/samples/cpp/cpp-cli/syntax/cpp-cli-syntax.build b/tools/NUnit/samples/cpp/cpp-cli/syntax/cpp-cli-syntax.build new file mode 100644 index 0000000..f3b6328 --- /dev/null +++ b/tools/NUnit/samples/cpp/cpp-cli/syntax/cpp-cli-syntax.build @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<project name="cpp-cli-syntax" default="build"> + + <include buildfile="../../../samples.common"/> + + <patternset id="source-files"> + <include name="AssemblyInfo.cpp" /> + <include name="cpp-cli-syntax.cpp" /> + </patternset> + +</project>
\ No newline at end of file |