Update PlatformColorHelper to handle Visual Studio 2013

mjtworks · Oct 24, 2013 · d50daa4 · d50daa4
1 parent 8f9fed9
commit d50daa4
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/PlatformUI/PlatformColorHelper.cs b/PlatformUI/PlatformColorHelper.cs
@@ -41,6 +41,21 @@ private object GetResourceKey(string resourceName)
 
         private static PlatformColorHelper LookupPlatformColorHelper(Type wrapperType)
         {
+            // first try to find the Visual Studio 2013 assembly
+            foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                AssemblyName name = assembly.GetName();
+                if (!name.Name.Equals("Microsoft.VisualStudio.Shell.12.0"))
+                    continue;
+
+                Type type = assembly.GetType("Microsoft.VisualStudio.PlatformUI." + wrapperType.Name, false);
+                if (type == null)
+                    continue;
+
+                return new PlatformColorHelper(type);
+            }
+
+            // fall back to the Visual Studio 2012 assembly
             foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
                 AssemblyName name = assembly.GetName();