Merge remote-tracking branch 'refs/remotes/origin/master' into develop

drieseng · drieseng · commit 52527aef9dad · 2016-07-14T22:56:00.000+02:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 before_build:
-  - nuget restore
+  - nuget restore src\SshNet.Security.Cryptography.VS2015.sln
 
 build:
   project: src\Renci.SshNet.VS2015.sln
diff --git a/src/Renci.SshNet.UAP10/project.json b/src/Renci.SshNet.UAP10/project.json
@@ -1,6 +1,6 @@
 ﻿{
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.0",
     "SshNet.Security.Cryptography": "1.2.0",
     "System.Xml.XPath.XmlDocument": "4.0.1"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",`
	`3`	`+ "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.0",`
`4`	`4`	`"SshNet.Security.Cryptography": "1.2.0",`
`5`	`5`	`"System.Xml.XPath.XmlDocument": "4.0.1"`
`6`	`6`	`},`