aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/distrib/csharp/DistribTest/DistribTest.project.json
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-09-30 07:48:00 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-09-30 07:48:00 -0700
commit43b817ced14083de585111c2657bbe34040bdcc7 (patch)
tree3b9e28af5b7e90e9183acae48f0750d1099fbae8 /test/distrib/csharp/DistribTest/DistribTest.project.json
parent366c6ceb8c53a4f8c4a2f9aa2c6fee8f2a070479 (diff)
parentbe43240564891aaa34bbd911332994fe8d197c0b (diff)
Merge remote-tracking branch 'upstream/master' into run_interop_tests_go
Diffstat (limited to 'test/distrib/csharp/DistribTest/DistribTest.project.json')
-rw-r--r--test/distrib/csharp/DistribTest/DistribTest.project.json11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/distrib/csharp/DistribTest/DistribTest.project.json b/test/distrib/csharp/DistribTest/DistribTest.project.json
new file mode 100644
index 0000000000..422545ea8f
--- /dev/null
+++ b/test/distrib/csharp/DistribTest/DistribTest.project.json
@@ -0,0 +1,11 @@
+// This file exists only to prevent VS2015 from mistakenly picking up
+// project.json file when building .csproj project.
+// See https://github.com/Microsoft/msbuild/issues/394
+{
+ "frameworks": {
+ "net45": { }
+ },
+ "runtimes": {
+ "win": { }
+ }
+}