implemented feedback from Jarod42

premake · Oct 9, 2024 · 566a587 · 566a587
1 parent 3698bec
commit 566a587
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 36 deletions.
diff --git a/modules/vstudio/_preload.lua b/modules/vstudio/_preload.lua
@@ -65,7 +65,7 @@
 			"Hull",
 			"Domain",
 			"Compute",
-			"Library",		
+			"Library",
 			"Mesh",
 			"Amplification",
 			"Texture",
@@ -255,7 +255,7 @@
 		scope = "config",
 		kind = "string",
 	}
-	
+
 	-- Relative per-project directory. Set to empty for the entire project to be copied as is
 	-- Should default to empty really for the more seamless experience
 	p.api.register {
@@ -294,6 +294,21 @@
 		tokens = "true",
 	}
 
+	p.api.register {
+		name = "dotnetsdk",
+		scope = "project",
+		kind = "string",
+		allowed = {
+			"Default",
+			"Web",
+			"Razor",
+			"Worker",
+			"Blazor",
+			"WindowsDesktop",
+			"MSTest"
+		}
+	}
+
 --
 -- Decide when the full module should be loaded.
 --

diff --git a/modules/vstudio/vs2005_dotnetbase.lua b/modules/vstudio/vs2005_dotnetbase.lua
@@ -835,9 +835,9 @@
 	end
 
 	function dotnetbase.netcore.dotnetsdk(cfg)
-		local globalpath = string.format("%s/global.json", cfg.workspace.location)
-		if cfg.dotnetsdk == "mstest" and not os.isfile(globalpath) then
-			io.writefile(globalpath, "{\"msbuild-sdks\": {\"MSTest.Sdk\": \"3.6.1\"}}")
+		local globalpath = path.join(cfg.workspace.location, "global.json")
+		if cfg.dotnetsdk == "MSTest" and not os.isfile(globalpath) then
+			io.writefile(globalpath, '{"msbuild-sdks": {"MSTest.Sdk": "3.6.1"}}')
 		end
 	end
 

diff --git a/src/_premake_init.lua b/src/_premake_init.lua
@@ -618,21 +618,6 @@
 		kind = "string",
 	}
 
-	api.register {
-		name = "dotnetsdk",
-		scope = "project",
-		kind = "string",
-		allowed = {
-			"Default",
-			"Web",
-			"Razor",
-			"Worker",
-			"Blazor",
-			"WindowsDesktop",
-			"MSTest"
-		}
-	}
-
 	api.register {
 		name = "enabledefaultcompileitems",
 		scope = "config",

diff --git a/website/docs/dotnetsdk.md b/website/docs/dotnetsdk.md
@@ -19,22 +19,7 @@ For more information see the MSDN documentation [here](https://learn.microsoft.c
 
 
 ## mstest ##
-To make the MSTest SDK work you need to add the version to `global.json`:
-```json
-{
-    "msbuild-sdks": {
-        "MSTest.Sdk": "3.6.1"
-    }
-}
-```
-:::note
-`global.json` will be auto generated when it does not exist!
-:::
-
-:::warning
-`global.json` needs to be located in the same folder as your solution.
-:::
-
+SDK used for MSTest is `"3.6.1"`, to use another version create or update global.json near the solution.
 ### Applies To ###
 
 Project configurations.