Added support for Visual Studio 2026 and removed 2017.

Author: dlemstra

Configure.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32014.148
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Configure", "src\Configure.vcxproj", "{EA8B95B3-D0CD-5FEC-5494-F47FE7DEE472}"
 EndProject

src/CommandLineInfo.cpp

@@ -84,12 +84,12 @@ void CommandLineInfo::ParseParam(const wchar_t* pszParam, BOOL bFlag, BOOL bLast
     _options->architecture=Architecture::x86;
   else if (_wcsicmp(pszParam, L"x64") == 0)
     _options->architecture=Architecture::x64;
-  else if (_wcsicmp(pszParam, L"VS2017") == 0)
-    _options->visualStudioVersion=VisualStudioVersion::VS2017;
   else if (_wcsicmp(pszParam, L"VS2019") == 0)
     _options->visualStudioVersion=VisualStudioVersion::VS2019;
   else if (_wcsicmp(pszParam, L"VS2022") == 0)
     _options->visualStudioVersion=VisualStudioVersion::VS2022;
+  else if (_wcsicmp(pszParam, L"VS2026") == 0)
+    _options->visualStudioVersion=VisualStudioVersion::VS2026;
   else if (_wcsicmp(pszParam, L"webSafePolicy") == 0)
     _options->policyConfig=PolicyConfig::WebSafe;
   else if (_wcsicmp(pszParam, L"zeroConfigurationSupport") == 0)

src/Configure.rc

@@ -268,11 +268,11 @@ BEGIN
     IDC_PLATFORM, 0x403, 6, 0,
 0x5241, 0x364d, 0x0034,
     IDC_VISUALSTUDIO, 0x403, 6, 0,
-0x3032, 0x3731, 0x0000,
-    IDC_VISUALSTUDIO, 0x403, 6, 0,
 0x3032, 0x3931, 0x0000,
     IDC_VISUALSTUDIO, 0x403, 6, 0,
 0x3032, 0x3232, 0x0000,
+    IDC_VISUALSTUDIO, 0x403, 6, 0,
+0x3032, 0x3632, 0x0000,
     IDC_POLICYCONFIG, 0x403, 8, 0,
 0x694C, 0x696D, 0x6574, 0x0064,
     IDC_POLICYCONFIG, 0x403, 6, 0,

src/Options.cpp

@@ -122,12 +122,12 @@ wstring Options::getEnvironmentVariable(const wchar_t *name)
 
 VisualStudioVersion Options::getVisualStudioVersion()
 {
-  if (hasVisualStudioDirectory(L"2022"))
+  if (hasVisualStudioDirectory(L"18"))
+    return(VisualStudioVersion::VS2026);
+  else if (hasVisualStudioDirectory(L"2022"))
     return(VisualStudioVersion::VS2022);
   else if (hasVisualStudioDirectory(L"2019"))
     return(VisualStudioVersion::VS2019);
-  else if (hasVisualStudioDirectory(L"2017"))
-    return(VisualStudioVersion::VS2017);
   else
     return(VSLATEST);
 }

src/Project.cpp

@@ -178,14 +178,14 @@ const wstring Project::platformToolset() const
 {
   switch (_options.visualStudioVersion)
   {
+    case VisualStudioVersion::VS2026:
+      return(L"v145");
     case VisualStudioVersion::VS2022:
       return(L"v143");
     case VisualStudioVersion::VS2019:
       return(L"v142");
-    case VisualStudioVersion::VS2017:
-      return(L"v141");
     default:
-      throwException(L"Unknown architecture");
+      throwException(L"Unknown VisualStudio version");
   }
 }
 

src/Shared.h

@@ -31,9 +31,9 @@ enum class ProjectType {Undefined, Application, Coder, Demo, Filter, Fuzz, Dynam
 
 enum class QuantumDepth {Q8, Q16, Q32, Q64};
 
-enum class VisualStudioVersion {VS2017, VS2019, VS2022};
+enum class VisualStudioVersion {VS2019, VS2022, VS2026};
 
-#define VSLATEST VisualStudioVersion::VS2022
+#define VSLATEST VisualStudioVersion::VS2026
 
 static inline bool endsWith(const wstring &s,const wstring &end)
 {

src/Solution.cpp

@@ -148,6 +148,10 @@ void Solution::writeVisualStudioVersion(wofstream& file,const Options &options)
 {
   switch(options.visualStudioVersion)
   {
+    case VisualStudioVersion::VS2026:
+      file << "# Visual Studio Version 18" << endl;
+      file << "VisualStudioVersion = 18.0.11205.157 d18.0" << endl;
+      break;
     case VisualStudioVersion::VS2022:
       file << "# Visual Studio Version 17" << endl;
       file << "VisualStudioVersion = 17.0.31903.59" << endl;
@@ -156,10 +160,6 @@ void Solution::writeVisualStudioVersion(wofstream& file,const Options &options)
       file << "# Visual Studio Version 16" << endl;
       file << "VisualStudioVersion = 16.0.28701.123" << endl;
       break;
-    case VisualStudioVersion::VS2017:
-      file << "# Visual Studio Version 15" << endl;
-      file << "VisualStudioVersion = 15.0.26124.0" << endl;
-      break;
   }
   file << "MinimumVisualStudioVersion = 10.0.40219.1" << endl;
 }

src/VersionInfo.cpp

@@ -83,9 +83,9 @@ const wstring VersionInfo::visualStudioVersionName() const
 {
   switch(_options.visualStudioVersion)
   {
-    case VisualStudioVersion::VS2017: return(L"VS2017");
     case VisualStudioVersion::VS2019: return(L"VS2019");
     case VisualStudioVersion::VS2022: return(L"VS2022");
+    case VisualStudioVersion::VS2026: return(L"VS2026");
     default: throwException(L"Unknown Visual Studio version");
   }
 }