updated dotnetsdk to now accept version localy and removed global.json file generation

Author: Beernaert Robbe

modules/vstudio/_preload.lua

@@ -298,15 +298,37 @@
 		name = "dotnetsdk",
 		scope = "project",
 		kind = "string",
-		allowed = {
-			"Default",
-			"Web",
-			"Razor",
-			"Worker",
-			"Blazor",
-			"WindowsDesktop",
-			"MSTest"
-		}
+		allowed = function (value)
+    -- value is expected to be in the format <sdk>/<version>
+    local parts = value:explode("/", true, 1)
+	local sdk = parts[1] or value
+	local allowedSdks = {
+				"Default",
+				"Web",
+				"Razor",
+				"Worker",
+				"Blazor",
+				"WindowsDesktop",
+				"MSTest"
+			}
+    -- Only perform the check when a version is provided to avoid infinite recursing.
+    -- Check that the specified sdk is in the allowed list
+   	for _, allowed in ipairs(allowedSdks) do
+        if sdk == allowed then
+        	return value
+        end
+	end
+
+    -- The specified sdk is not recognized
+	if parts and #parts == 2 then
+		if sdk and sdk:match("^[%w%-]+$") then
+			return value
+		end
+	end
+
+	return nil
+end
+
 	}
 
 --

modules/vstudio/tests/cs2005/test_dotnetsdk.lua

@@ -50,7 +50,7 @@
 	function suite.testDefault()
 		prepare()
 		setConfig()
-		dotnetsdk "Web"
+		dotnetsdk "Default"
 		test.capture [[
 <Project Sdk="Microsoft.NET.Sdk">
 	]]
@@ -108,11 +108,11 @@
 
 	function suite.testMSTest()
 		prepare()
-		dotnetsdk "MSTest"
+		dotnetsdk "MSTest/3.4.0"
 		setConfig()
 
 		test.capture [[
-<Project Sdk="MSTest.Sdk">
+<Project Sdk="MSTest.Sdk/3.4.0">
 		]]
 	end
 
@@ -127,19 +127,62 @@
 		]]
 	end
 
-	function suite.testMSTestGlobalJSON()
+	function suite.testWebVersion()
 		prepare()
-		local cfg = test.getconfig(prj, "Debug")
-		prj.dotnetsdk = "MSTest"
-		dn2005.output_global_json(prj)
-		test.capture[[{"msbuild-sdks":{"MSTest.Sdk": "3.6.1"}}]]
+		dotnetsdk "Web/3.4.0"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.Web/3.4.0">
+		]]
 	end
 
-	function suite.testMSTestGlobalJSONExists()
+	function suite.testRazorVersion()
 		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"}}]]
+		dotnetsdk "Razor/3.4.0"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.Razor/3.4.0">
+		]]
+	end
+
+	function suite.testWorkerVersion()
+		prepare()
+		dotnetsdk "Worker/3.4.0"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.Worker/3.4.0">
+		]]
+	end
+
+	function suite.testBlazorVersion()
+		prepare()
+		dotnetsdk "Blazor/3.4.0"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly/3.4.0">
+		]]
+	end
+
+	function suite.testWindowsDesktopVersion()
+		prepare()
+		dotnetsdk "WindowsDesktop/3.4.0"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop/3.4.0">
+		]]
+	end
+
+	function suite.testCustomSDKVersion()
+		prepare()
+		dotnetsdk "CustomSdk/3.4.0"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="CustomSdk/3.4.0">
+		]]
 	end

modules/vstudio/vs2005_dotnetbase.lua

@@ -826,36 +826,35 @@
             ["WindowsDesktop"] = "Microsoft.NET.Sdk.WindowsDesktop",
             ["MSTest"] = "MSTest.Sdk",
         }
+		local parts = nil
+		if cfg.dotnetsdk then
+			parts = cfg.dotnetsdk:explode("/", true, 1)
+		end
 
-		if cfg.flags.WPF then
-			return map["WindowsDesktop"]
-        end
+		local sdk = (parts and #parts > 0 and parts[1]) or cfg.dotnetsdk
+		if not parts or #parts < 2 then
+			-- prioritize WPF flag for compatibility
+			if cfg.flags.WPF then
+				return map["WindowsDesktop"]
+			end
 
-        return map[cfg.dotnetsdk or "Default"]
-	end
+			if sdk == "MSTest" then
+				-- If sdk is MSTest, we need exactly 2 parts
+				p.error("MSTest requires a version to be specified!")
+				return nil
+			end
+
+			return map[sdk or "Default"]
 
-	function dotnetbase.netcore.dotnetsdk(cfg)
-		dotnetbase.generate_global_json(cfg)
+		elseif parts and #parts == 2 then
+			return string.format("%s/%s",map[parts[1]] or parts[1],parts[2])
+		end
+		
+		return map["Default"]
 	end
 
 	function dotnetbase.allowUnsafeBlocks(cfg)
 		if cfg.clr == "Unsafe" then
 			_p(2,'<AllowUnsafeBlocks>true</AllowUnsafeBlocks>')
 		end
 	end
-
-	function dotnetbase.output_global_json(prj)
-		if prj.dotnetsdk == "MSTest" then
-			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
-	function dotnetbase.generate_global_json(prj)
-		local content = p.capture(function() dotnetbase.output_global_json(prj) end)
-		if content ~= nil and #content > 0 then
-			p.generate(prj, path.join(prj.workspace.location, "global.json"), function() p.outln(content) end)
-		end
-	end