aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/distrib/csharp/DistribTest/DistribTest.project.json
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-09-13 11:01:50 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-09-13 11:01:50 -0700
commitc6dfe859dc53adf87357f9d7f568c00cf25b0dcb (patch)
treecc7bfed667536b87c0adb7bd89a0f427285327d0 /test/distrib/csharp/DistribTest/DistribTest.project.json
parenta587b4136976ab19f370b0ff18a2cd9f4c720cda (diff)
parent6e51f992c6bfdfba61d984ab173305da455bd2e7 (diff)
Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes
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": { }
+ }
+}