Support Visual Studio 2026

Author: RobDangerous

kmake/src/Exporters/VisualStudioExporter.ts

@@ -192,65 +192,78 @@ export class VisualStudioExporter extends Exporter {
 	async exportSolution(project: Project, from: string, to: string, platform: string, vrApi: any, options: any) {
 		this.clion.exportSolution(project, from, to, platform, vrApi, options);
 
-		this.writeFile(path.resolve(to, project.getSafeName() + '.sln'));
-
-		if (Options.visualStudioVersion === VisualStudioVersion.VS2022) {
-			this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
-			this.p('# Visual Studio Version 17');
-			this.p('VisualStudioVersion = 17.0.31903.59');
-			this.p('MinimumVisualStudioVersion = 10.0.40219.1');
-		}
-		else if (Options.visualStudioVersion === VisualStudioVersion.VS2019) {
-			this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
-			this.p('# Visual Studio Version 16');
-			this.p('VisualStudioVersion = 16.0.28729.10');
-			this.p('MinimumVisualStudioVersion = 10.0.40219.1');
-		}
-		else if (Options.visualStudioVersion === VisualStudioVersion.VS2017) {
-			this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
-			this.p('# Visual Studio 15');
-			this.p('VisualStudioVersion = 15.0.26228.4');
-			this.p('MinimumVisualStudioVersion = 10.0.40219.1');
-		}
-		else if (Options.visualStudioVersion === VisualStudioVersion.VS2015) {
-			this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
-			this.p('# Visual Studio 14');
-			this.p('VisualStudioVersion = 14.0.25420.1');
-			this.p('MinimumVisualStudioVersion = 10.0.40219.1');
-		}
-		else if (Options.visualStudioVersion === VisualStudioVersion.VS2013) {
-			this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
-			this.p('# Visual Studio 2013');
-			this.p('VisualStudioVersion = 12.0.21005.1');
-			this.p('MinimumVisualStudioVersion = 10.0.40219.1');
-		}
-		else if (Options.visualStudioVersion === VisualStudioVersion.VS2012) {
-			this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
-			this.p('# Visual Studio 2012');
+		if (Options.visualStudioVersion === VisualStudioVersion.VS2026) {
+			this.writeFile(path.resolve(to, project.getSafeName() + '.slnx'));
+			this.p('<Solution>');
+			this.p('<Configurations>', 1);
+			this.p('<Platform Name="x64" />', 2);
+			this.p('<Platform Name="x86" />', 2);
+			this.p('</Configurations>', 1);
+			this.p('<Project Path="Project1.vcxproj" Id="' + project.getUuid().toString().toLowerCase() + '" />', 1);
+			this.p('</Solution>');
+			this.closeFile();
 		}
 		else {
-			this.p('Microsoft Visual Studio Solution File, Format Version 11.00');
-			this.p('# Visual Studio 2010');
-		}
-		const solutionUuid = crypto.randomUUID();
-		this.writeProjectDeclarations(project, solutionUuid);
-		this.p('Global');
-		this.p('GlobalSection(SolutionConfigurationPlatforms) = preSolution', 1);
-		for (let config of this.getConfigs(platform)) {
-			for (let system of this.getSystems(platform)) {
-				this.p(config + '|' + this.renameSystem(system) + ' = ' + config + '|' + this.renameSystem(system), 2);
+			this.writeFile(path.resolve(to, project.getSafeName() + '.sln'));
+
+			if (Options.visualStudioVersion === VisualStudioVersion.VS2022) {
+				this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
+				this.p('# Visual Studio Version 17');
+				this.p('VisualStudioVersion = 17.0.31903.59');
+				this.p('MinimumVisualStudioVersion = 10.0.40219.1');
 			}
+			else if (Options.visualStudioVersion === VisualStudioVersion.VS2019) {
+				this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
+				this.p('# Visual Studio Version 16');
+				this.p('VisualStudioVersion = 16.0.28729.10');
+				this.p('MinimumVisualStudioVersion = 10.0.40219.1');
+			}
+			else if (Options.visualStudioVersion === VisualStudioVersion.VS2017) {
+				this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
+				this.p('# Visual Studio 15');
+				this.p('VisualStudioVersion = 15.0.26228.4');
+				this.p('MinimumVisualStudioVersion = 10.0.40219.1');
+			}
+			else if (Options.visualStudioVersion === VisualStudioVersion.VS2015) {
+				this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
+				this.p('# Visual Studio 14');
+				this.p('VisualStudioVersion = 14.0.25420.1');
+				this.p('MinimumVisualStudioVersion = 10.0.40219.1');
+			}
+			else if (Options.visualStudioVersion === VisualStudioVersion.VS2013) {
+				this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
+				this.p('# Visual Studio 2013');
+				this.p('VisualStudioVersion = 12.0.21005.1');
+				this.p('MinimumVisualStudioVersion = 10.0.40219.1');
+			}
+			else if (Options.visualStudioVersion === VisualStudioVersion.VS2012) {
+				this.p('Microsoft Visual Studio Solution File, Format Version 12.00');
+				this.p('# Visual Studio 2012');
+			}
+			else {
+				this.p('Microsoft Visual Studio Solution File, Format Version 11.00');
+				this.p('# Visual Studio 2010');
+			}
+			const solutionUuid = crypto.randomUUID();
+			this.writeProjectDeclarations(project, solutionUuid);
+			this.p('Global');
+			this.p('GlobalSection(SolutionConfigurationPlatforms) = preSolution', 1);
+			for (let config of this.getConfigs(platform)) {
+				for (let system of this.getSystems(platform)) {
+					this.p(config + '|' + this.renameSystem(system) + ' = ' + config + '|' + this.renameSystem(system), 2);
+				}
+			}
+			this.p('EndGlobalSection', 1);
+			this.p('GlobalSection(ProjectConfigurationPlatforms) = postSolution', 1);
+			this.writeProjectBuilds(project, platform);
+			this.p('EndGlobalSection', 1);
+			this.p('GlobalSection(SolutionProperties) = preSolution', 1);
+			this.p('HideSolutionNode = FALSE', 2);
+			this.p('EndGlobalSection', 1);
+			this.postSolution();
+			this.p('EndGlobal');
+			this.closeFile();
 		}
-		this.p('EndGlobalSection', 1);
-		this.p('GlobalSection(ProjectConfigurationPlatforms) = postSolution', 1);
-		this.writeProjectBuilds(project, platform);
-		this.p('EndGlobalSection', 1);
-		this.p('GlobalSection(SolutionProperties) = preSolution', 1);
-		this.p('HideSolutionNode = FALSE', 2);
-		this.p('EndGlobalSection', 1);
-		this.postSolution();
-		this.p('EndGlobal');
-		this.closeFile();
 
 		await this.exportProject(from, to, project, platform, project.isCmd(), options.noshaders, options);
 		this.exportFilters(from, to, project, platform);
@@ -502,6 +515,8 @@ export class VisualStudioExporter extends Exporter {
 				return 'v142';
 			case VisualStudioVersion.VS2022:
 				return 'v143';
+			case VisualStudioVersion.VS2026:
+				return 'v145';
 			default:
 				throw 'Unknown Visual Studio version';
 		}
@@ -779,14 +794,26 @@ export class VisualStudioExporter extends Exporter {
 		});
 	}
 
+	getVCProjectVersion() {
+		switch (Options.visualStudioVersion) {
+			case VisualStudioVersion.VS2017:
+				return '15.0';
+			case VisualStudioVersion.VS2019:
+				return '16.0';
+			case VisualStudioVersion.VS2022:
+				return '17.0';
+			case VisualStudioVersion.VS2026:
+				return '18.0';
+			default:
+				return null;
+		}
+	}
+
 	async globals(platform: string, indent: number) {
 		let windowsTargetVersion = Options.visualStudioVersion === VisualStudioVersion.VS2017 ? '10.0.16299.0' : '10.0.14393.0';
 
-		if (Options.visualStudioVersion === VisualStudioVersion.VS2022 || Options.visualStudioVersion === VisualStudioVersion.VS2019) {
-			this.p('<VCProjectVersion>16.0</VCProjectVersion>', indent);
-		}
-		else if (Options.visualStudioVersion === VisualStudioVersion.VS2017) {
-			this.p('<VCProjectVersion>15.0</VCProjectVersion>', indent);
+		if (this.getVCProjectVersion()) {
+			this.p('<VCProjectVersion>' + this.getVCProjectVersion() + '</VCProjectVersion>', indent);
 		}
 
 		if (platform === Platform.WindowsApp) {
@@ -859,7 +886,7 @@ export class VisualStudioExporter extends Exporter {
 		this.p('</ItemGroup>', 1);
 		this.customItemGroups(1);
 		this.p('<PropertyGroup Label="Globals">', 1);
-		this.p('<ProjectGuid>{' + project.getUuid().toString().toUpperCase() + '}</ProjectGuid>', 2);
+		this.p('<ProjectGuid>{' + project.getUuid().toString().toLowerCase() + '}</ProjectGuid>', 2);
 		// p("<Keyword>Win32Proj</Keyword>", 2);
 		// p("<RootNamespace>" + project.Name + "</RootNamespace>", 2);
 		await this.globals(platform, 2);

kmake/src/VisualStudioVersion.ts

@@ -5,5 +5,6 @@
 	VS2015: 'vs2015',
 	VS2017: 'vs2017',
 	VS2019: 'vs2019',
-	VS2022: 'vs2022'
+	VS2022: 'vs2022',
+	VS2026: 'vs2026'
 };