Fix incompatibility with VS 2013

Fixed VS 2013 incompatibility issues in the QML debug engine.

Change-Id: Ifa6e428e97bc3b3649086949abf2d695071b56d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

5 files changed, 20 insertions, 29 deletions

diff --git a/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs b/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs
index 2410d3d8..0230ef05 100644
--- a/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs
+++ b/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs
@@ -135,28 +135,23 @@ namespace QtVsTools.Qml.Debug
             execCmd = "";
             rccItems = null;
 
-            IEnumHierarchies vsProjects;
-            debugger4.EnumCurrentlyDebuggingProjects(out vsProjects);
-            if (vsProjects == null)
-                return false;
-
-            var vsProject = new IVsHierarchy[1];
-            uint fetched = 0;
-            while (vsProjects.Next(1, vsProject, out fetched) == VSConstants.S_OK) {
-
-                object objProj;
-                vsProject[0].GetProperty(VSConstants.VSITEMID_ROOT,
-                    (int)__VSHPROPID.VSHPROPID_ExtObject, out objProj);
-
-                var project = objProj as EnvDTE.Project;
-                if (project == null)
-                    continue;
+            foreach (var project in HelperFunctions.ProjectsInSolution(Vsix.Instance.Dte)) {
 
                 var vcProject = project.Object as VCProject;
                 if (vcProject == null)
                     continue;
 
-                var vcConfig = vcProject.ActiveConfiguration;
+                var vcConfigs = vcProject.Configurations as IVCCollection;
+                if (vcConfigs == null)
+                    continue;
+                var activeConfig = project.ConfigurationManager.ActiveConfiguration;
+                if (activeConfig == null)
+                    continue;
+                var activeConfigId = string.Format("{0}|{1}",
+                    activeConfig.ConfigurationName, activeConfig.PlatformName);
+                var vcConfig = vcConfigs.Item(activeConfigId) as VCConfiguration;
+                if (vcConfig == null)
+                    continue;
 
                 var props = vcProject as IVCBuildPropertyStorage;
 
diff --git a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4Continue.cs b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4Continue.cs
index 6b0fb496..51dd9829 100644
--- a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4Continue.cs
+++ b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4Continue.cs
@@ -34,7 +34,6 @@ using System.Threading;
 namespace QtVsTools.Qml.Debug.V4
 {
     using Json;
-    using static Json.SerializableEnum;
 
     [DataContract]
     sealed class ContinueRequest : Request<ContinueResponse, ContinueRequest.ArgumentsStruct>
@@ -69,8 +68,8 @@ namespace QtVsTools.Qml.Debug.V4
 
             public StepAction StepAction
             {
-                get { return Deserialize<StepAction>(StepActionString); }
-                set { StepActionString = Serialize<StepAction>(value); }
+                get { return SerializableEnum.Deserialize<StepAction>(StepActionString); }
+                set { StepActionString = SerializableEnum.Serialize<StepAction>(value); }
             }
 
             [DataMember(Name = "stepcount", EmitDefaultValue = false)]
diff --git a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4JsValue.cs b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4JsValue.cs
index 7597fd6a..c0cb64bd 100644
--- a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4JsValue.cs
+++ b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4JsValue.cs
@@ -36,7 +36,6 @@ using System.Runtime.Serialization;
 namespace QtVsTools.Qml.Debug.V4
 {
     using Json;
-    using static Json.SerializableEnum;
 
     [DataContract]
     class JsValue : Serializable<JsValue>
@@ -68,8 +67,8 @@ namespace QtVsTools.Qml.Debug.V4
 
         public DataType Type
         {
-            get { return Deserialize<DataType>(TypeString); }
-            set { TypeString = Serialize<DataType>(value); }
+            get { return SerializableEnum.Deserialize<DataType>(TypeString); }
+            set { TypeString = SerializableEnum.Serialize<DataType>(value); }
         }
 
         [DataMember(Name = "name")]
diff --git a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetBreakpoint.cs b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetBreakpoint.cs
index 7b80a52d..536e1172 100644
--- a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetBreakpoint.cs
+++ b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetBreakpoint.cs
@@ -31,7 +31,6 @@ using System.Runtime.Serialization;
 namespace QtVsTools.Qml.Debug.V4
 {
     using Json;
-    using static Json.SerializableEnum;
 
     [DataContract]
     sealed class SetBreakpointRequest
@@ -75,8 +74,8 @@ namespace QtVsTools.Qml.Debug.V4
 
             public TargetType TargetType
             {
-                get { return Deserialize<TargetType>(TargetTypeString); }
-                set { TargetTypeString = Serialize<TargetType>(value); }
+                get { return SerializableEnum.Deserialize<TargetType>(TargetTypeString); }
+                set { TargetTypeString = SerializableEnum.Serialize<TargetType>(value); }
             }
 
             [DataMember(Name = "target")]
diff --git a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetExceptionBreak.cs b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetExceptionBreak.cs
index 4a00837e..c4ff69d8 100644
--- a/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetExceptionBreak.cs
+++ b/src/qtvstools/QML/Debugging/V4/Messages/QmlDebugV4SetExceptionBreak.cs
@@ -31,7 +31,6 @@ using System.Runtime.Serialization;
 namespace QtVsTools.Qml.Debug.V4
 {
     using Json;
-    using static Json.SerializableEnum;
 
     public enum ExceptionBreakType
     {
@@ -64,8 +63,8 @@ namespace QtVsTools.Qml.Debug.V4
 
             public ExceptionBreakType ExceptionBreakType
             {
-                get { return Deserialize<ExceptionBreakType>(TypeString); }
-                set { TypeString = Serialize<ExceptionBreakType>(value); }
+                get { return SerializableEnum.Deserialize<ExceptionBreakType>(TypeString); }
+                set { TypeString = SerializableEnum.Serialize<ExceptionBreakType>(value); }
             }
 
             [DataMember(Name = "enabled")]