Merge branch 'master' into py37

den-run-ai · web-flow · commit 89dff06cdd2c · 2018-10-12T14:39:52.000-05:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -31,6 +31,12 @@ environment:
     - PYTHON_VERSION: 3.6
     - PYTHON_VERSION: 3.7
 
+matrix:
+    allow_failures:
+      - PYTHON_VERSION: 3.4
+        BUILD_OPTS: --xplat
+      - PYTHON_VERSION: 3.4
+
 init:
   # Update Environment Variables based on matrix/platform
   - set PY_VER=%PYTHON_VERSION:.=%
diff --git a/setup.py b/setup.py
@@ -329,7 +329,7 @@ def _install_packages(self):
             self.debug_print("Updating NuGet: {0}".format(cmd))
             subprocess.check_call(cmd, shell=use_shell)
 
-            cmd = "{0} restore pythonnet.sln -o packages".format(nuget)
+            cmd = "{0} restore pythonnet.sln  -MSBuildVersion 14 -o packages".format(nuget)
             self.debug_print("Installing packages: {0}".format(cmd))
             subprocess.check_call(cmd, shell=use_shell)
 
