Merge branch 'jsp/optimize-GetVisualStudioVCToolsCompilerVersion' int…

…o 'main' Add cache for GetVisualStudioVCToolsCompilerVersion() See merge request Sharpmake/sharpmake!574
ubisoft · Nov 13, 2024 · a47e8de · a47e8de
2 parents 8d2b1da + 3f0d2da
commit a47e8de
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Sharpmake/ExtensionMethods.cs b/Sharpmake/ExtensionMethods.cs
@@ -393,11 +393,18 @@ public static Version GetVisualStudioVCToolsVersion(this DevEnv visualVersion)
             return version;
         }
 
+        private static ConcurrentDictionary<(DevEnv, Platform), Version> s_visualStudioCompilerVersionCache = new ConcurrentDictionary<(DevEnv, Platform), Version>();
+
         public static Version GetVisualStudioVCToolsCompilerVersion(this DevEnv visualVersion, Platform platform)
         {
-            string clExeFile = Path.Combine(visualVersion.GetVisualStudioBinPath(platform), "cl.exe");
-            FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(clExeFile);
-            return new Version(fileVersionInfo.FileMajorPart, fileVersionInfo.FileMinorPart, fileVersionInfo.FileBuildPart, fileVersionInfo.FilePrivatePart);
+            var cacheKey = (visualVersion, platform);
+            Version version = s_visualStudioCompilerVersionCache.GetOrAdd(cacheKey, ((DevEnv, Platform) key) =>
+            {
+                string clExeFile = Path.Combine(visualVersion.GetVisualStudioBinPath(platform), "cl.exe");
+                FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(clExeFile);
+                return new Version(fileVersionInfo.FileMajorPart, fileVersionInfo.FileMinorPart, fileVersionInfo.FileBuildPart, fileVersionInfo.FilePrivatePart);
+            });
+            return version;
         }
 
         /// <summary>