premake · lolrobbe2 · Jun 29, 2023 · Jun 29, 2023 · Jun 29, 2023 · Jun 29, 2023
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/tests/_tests.lua b/modules/vstudio/tests/_tests.lua
@@ -15,6 +15,7 @@ return {
 	"cs2005/test_debug_props.lua",
 	"cs2005/test_debug_props_2019.lua",
 	"cs2005/test_documentation_file.lua",
+	"cs2005/test_dotnetsdk.lua",
 	"cs2005/test_files.lua",
 	"cs2005/test_icon.lua",
 	"cs2005/test_netcore.lua",

diff --git a/modules/vstudio/tests/cs2005/test_dotnetsdk.lua b/modules/vstudio/tests/cs2005/test_dotnetsdk.lua
@@ -0,0 +1,121 @@
+--
+-- tests/actions/vstudio/cs2005/test_dotnetsdk.lua
+-- Test DotnetSDK feature Visual Studio 2005+ C# project.
+-- Copyright (c) 2012-2024 Jason Perkins and the Premake project
+--
+	local p = premake
+	local suite = test.declare("vstudio_cs2005_dotnetsdk")
+	local dn2005 = p.vstudio.dotnetbase
+--
+-- Setup
+--
+
+	local wks, prj
+
+--
+-- Setup and teardown
+--
+	function suite.setup()
+		p.action.set("vs2010")
+		wks = test.createWorkspace()
+	 	configurations { "Debug", "Release" }
+		language "C#"
+		dotnetframework "net8.0"
+	end
+
+	local function setConfig()
+		local cfg = test.getconfig(prj, "Debug")
+		dn2005.projectElement(cfg);
+	end
+
+	local function prepare()
+		prj = test.getproject(wks, 1)
+	end
+
+	function suite.testNone()
+		prepare()
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk">
+	]]
+	end
+
+	function suite.testDefault()
+		prepare()
+		setConfig()
+		dotnetsdk "Web"
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk">
+	]]
+	end
+
+	function suite.testWeb()
+		prepare()
+		dotnetsdk "Web"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.Web">
+		]]
+	end
+
+	function suite.testRazor()
+		prepare()
+		dotnetsdk "Razor"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+		]]
+	end
+
+	function suite.testWorker()
+		prepare()
+		dotnetsdk "Worker"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+		]]
+	end
+
+	function suite.testBlazor()
+		prepare()
+		dotnetsdk "Blazor"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+		]]
+	end
+
+	function suite.testWindowsDesktop()
+		prepare()
+		dotnetsdk "WindowsDesktop"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+		]]
+	end
+	function suite.testMSTest()
+		prepare()
+		dotnetsdk "MSTest"
+		setConfig()
+
+		test.capture [[
+<Project Sdk="MSTest.Sdk">
+		]]
+	end
+
+	function suite.testWPFFlag()
+		prepare()
+		dotnetsdk "Web"
+		flags { "WPF" }
+		setConfig()
+
+		test.capture [[
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+		]]
+	end
diff --git a/modules/vstudio/vs2005_csproj.lua b/modules/vstudio/vs2005_csproj.lua
@@ -53,6 +53,7 @@
 				dotnetbase.netcore.useWpf,
 				dotnetbase.csversion,
 				dotnetbase.netcore.enableDefaultCompileItems,
+				dotnetbase.netcore.dotnetsdk
 			}
 		else
 			return {

diff --git a/modules/vstudio/vs2005_dotnetbase.lua b/modules/vstudio/vs2005_dotnetbase.lua
@@ -57,11 +57,7 @@
 
 	function dotnetbase.projectElement(prj)
 		if dotnetbase.isNewFormatProject(prj) then
-			if prj.flags.WPF then
-				_p('<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">')
-			else
-				_p('<Project Sdk="Microsoft.NET.Sdk">')
-			end
+			_p('<Project Sdk="%s">', dotnetbase.netcore.getsdk(prj))
 		else
 			local ver = ''
 			local action = p.action.current()
@@ -820,6 +816,31 @@
 		end
 	end
 
+	function dotnetbase.netcore.getsdk(cfg)
+        local map = {
+			["Default"] = "Microsoft.NET.Sdk",
+            ["Web"] = "Microsoft.NET.Sdk.Web",
+            ["Razor"] = "Microsoft.NET.Sdk.Razor",
+            ["Worker"] = "Microsoft.NET.Sdk.Worker",
+            ["Blazor"] = "Microsoft.NET.Sdk.BlazorWebAssembly",
+            ["WindowsDesktop"] = "Microsoft.NET.Sdk.WindowsDesktop",
+            ["MSTest"] = "MSTest.Sdk",
+        }
+
+		if cfg.flags.WPF then
+			return map["WindowsDesktop"]
+        end
+
+        return map[cfg.dotnetsdk or "Default"]
+	end
+
+	function dotnetbase.netcore.dotnetsdk(cfg)
+		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
+
 	function dotnetbase.allowUnsafeBlocks(cfg)
 		if cfg.clr == "Unsafe" then
 			_p(2,'<AllowUnsafeBlocks>true</AllowUnsafeBlocks>')

diff --git a/website/docs/dotnetsdk.md b/website/docs/dotnetsdk.md
@@ -0,0 +1,36 @@
+Selects a .NET SDK
+
+```lua
+dotnetsdk "SDK"
+```
+
+For more information see the MSDN documentation [here](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/overview)
+
+## parameters ##
+`SDK` is one of:
+
+ * [Default](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props)
+ * [Web](https://learn.microsoft.com/en-us/aspnet/core/razor-pages/web-sdk?toc=%2Fdotnet%2Fnavigate%2Ftools-diagnostics%2Ftoc.json&bc=%2Fdotnet%2Fbreadcrumb%2Ftoc.json)
+ * [Razor](https://learn.microsoft.com/en-us/aspnet/core/razor-pages/sdk?toc=%2Fdotnet%2Fnavigate%2Ftools-diagnostics%2Ftoc.json&bc=%2Fdotnet%2Fbreadcrumb%2Ftoc.json)
+ * [Worker](https://learn.microsoft.com/en-us/dotnet/core/extensions/workers)
+ * [Blazor](https://learn.microsoft.com/en-us/aspnet/core/blazor/)
+ * [WindowsDesktop](https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props-desktop?view=aspnetcore-8.0)
+ * [MSTest](https://learn.microsoft.com/en-us/dotnet/core/testing/unit-testing-mstest-sdk)
+
+
+## mstest ##
+SDK used for MSTest is `"3.6.1"`, to use another version create or update global.json near the solution.
+### Applies To ###
+
+Project configurations.
+
+### Availability ###
+
+Premake 5.0 beta3 or later.
+
+Visual studio is the only toolset currently supported.
+
+### Examples ###
+```lua
+dotnetsdk "Web"
+```
diff --git a/website/sidebars.js b/website/sidebars.js
@@ -135,6 +135,7 @@ module.exports = {
 						'docname',
 						'documentationfile',
 						'dotnetframework',
+						'dotnetsdk',
 						'dpiawareness',
 						'editandcontinue',
 						'editorintegration',