fixed thr broken global.json test

Author: Beernaert Robbe

modules/vstudio/tests/cs2005/test_dotnetsdk.lua

@@ -132,12 +132,14 @@
 		local cfg = test.getconfig(prj, "Debug")
 		prj.dotnetsdk = "MSTest"
 		dn2005.output_global_json(prj)
-		test.capture[[
-{
-	"msbuild-sdks":
-		{
-			"MSTest.Sdk": "3.6.1"
-		}
-}
-		]]
+		test.capture[[{"msbuild-sdks":{"MSTest.Sdk": "3.6.1"}}]]
+	end
+
+	function suite.testMSTestGlobalJSONExists()
+		prepare()
+		local cfg = test.getconfig(prj, "Debug")
+		prj.dotnetsdk = "MSTest"
+		p.generate(prj, path.join(prj.workspace.location, "global.json"), function() p.outln('{"test":"global"') end)
+		dn2005.output_global_json(prj)
+		test.capture[[{"test":"global","msbuild-sdks":{"MSTest.Sdk": "3.6.1"}}]]
 	end

modules/vstudio/vs2005_dotnetbase.lua

@@ -846,10 +846,10 @@
 
 	function dotnetbase.output_global_json(prj)
 		if prj.dotnetsdk == "MSTest" then
-			globaljson = json.decode(io.readfile(path.join(prj.workspace.location, "global.json")))
-			globaljson = globaljson or {}
+			local globaljson = json.decode(io.readfile(path.join(prj.workspace.location, "global.json"))) or {}
 			globaljson["msbuild-sdks"] = globaljson["msbuild-sdks"] or {}
 			globaljson["msbuild-sdks"]["MSTest.Sdk"] = "3.6.1"
+
 			_p(json.encode(globaljson))
 		end
 	end