4.2.4 bug fixes

zeroc-ice · Apr 15, 2016 · 8a17825 · 8a17825
1 parent fbf6131
commit 8a17825
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 39 deletions.
diff --git a/AddinRemoval/Properties/AssemblyInfo.cs b/AddinRemoval/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Visual Studio Extension")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## Changes in Ice Builder for Visual Studio 4.2.4
+
+- Fixed a bug that could cause a NullReferenceException when removing the
+  builder from a project.
+
+- Fixed a bug that could cause a System.OverflowException when building a
+  solution where some projects failed to load.
+
 ## Changes in Ice Builder for Visual Studio 4.2.3
 
 - Added support for reading CSharp settings from Ice distribution.

diff --git a/IceBuilder/DTEUtil.cs b/IceBuilder/DTEUtil.cs
@@ -51,7 +51,27 @@ public static List<IVsProject> GetProjects()
 
         public static void GetSubProjects(IVsProject p, ref List<IVsProject> projects)
         {
-            GetSubProjects((IVsHierarchy)p, VSConstants.VSITEMID_ROOT, ref projects);
+            IVsHierarchy h = p as IVsHierarchy;
+            // Get the first visible child node
+            object value;
+            int result = h.GetProperty(VSConstants.VSITEMID_ROOT, (int)__VSHPROPID.VSHPROPID_FirstVisibleChild, out value);
+            while (ErrorHandler.Succeeded(result))
+            {
+                if (value is int && (uint)(int)value == VSConstants.VSITEMID_NIL)
+                {
+                    // No more nodes
+                    break;
+                }
+                else
+                {
+                    uint child = Convert.ToUInt32(value);
+                    GetSubProjects(h, child, ref projects);
+
+                    // Get the next visible sibling node
+                    value = null;
+                    result = h.GetProperty(child, (int)__VSHPROPID.VSHPROPID_NextVisibleSibling, out value);
+                }
+            }
         }
 
         public static void GetSubProjects(IVsHierarchy h, uint itemId, ref List<IVsProject> projects)
@@ -60,7 +80,7 @@ public static void GetSubProjects(IVsHierarchy h, uint itemId, ref List<IVsProje
             uint nestedId = 0;
             Guid nestedGuid = typeof(IVsHierarchy).GUID;
             int result = h.GetNestedHierarchy(itemId, ref nestedGuid, out nestedValue, out nestedId);
-            if (ErrorHandler.Succeeded(result) && nestedValue != IntPtr.Zero && nestedId == VSConstants.VSITEMID_ROOT)
+            if(ErrorHandler.Succeeded(result) && nestedValue != IntPtr.Zero && nestedId == VSConstants.VSITEMID_ROOT)
             {
                 // Get the nested hierachy
                 IVsProject project = System.Runtime.InteropServices.Marshal.GetObjectForIUnknown(nestedValue) as IVsProject;
@@ -71,30 +91,6 @@ public static void GetSubProjects(IVsHierarchy h, uint itemId, ref List<IVsProje
                     GetSubProjects(project, ref projects);
                 }
             }
-            else
-            {
-                // Get the first visible child node
-                object value;
-                result = h.GetProperty(itemId, (int)__VSHPROPID.VSHPROPID_FirstVisibleChild, out value);
-                while (result == VSConstants.S_OK && value != null)
-                {
-                    if(value is int && (uint)(int)value == VSConstants.VSITEMID_NIL)
-                    {
-                        // No more nodes
-                        break;
-                    }
-                    else
-                    {
-                        uint child = Convert.ToUInt32(value);
-
-                        GetSubProjects(h, child, ref projects);
-
-                        // Get the next visible sibling node
-                        value = null;
-                        result = h.GetProperty(child, (int)__VSHPROPID.VSHPROPID_NextVisibleSibling, out value);
-                    }
-                }
-            }
         }
 
         public static IVsProject GetSelectedProject()

diff --git a/IceBuilder/Package.cs b/IceBuilder/Package.cs
@@ -977,8 +977,7 @@ private void RemoveIceBuilderFromProject(object sender, EventArgs e)
         private void RemoveIceBuilderFromProject(IVsProject p)
         {
             String path = ProjectUtil.GetProjectFullPath(p);
-            Microsoft.Build.Evaluation.Project project = MSBuildUtils.LoadedProject(path, DTEUtil.IsCppProject(p), true);
-            MSBuildUtils.RemoveIceBuilderFromProject(project);
+
             foreach (IVsProject p1 in _buildProjects)
             { 
                 if(path.Equals(ProjectUtil.GetProjectFullPath(p1)))
@@ -988,7 +987,6 @@ private void RemoveIceBuilderFromProject(IVsProject p)
                 }
             }
 
-
             ProjectUtil.DeleteItems(
                 ProjectUtil.GetGeneratedFiles(p).Aggregate(
                     new List<String>(),
@@ -1011,6 +1009,9 @@ private void RemoveIceBuilderFromProject(IVsProject p)
                             }
                         });
             }
+
+            Microsoft.Build.Evaluation.Project project = MSBuildUtils.LoadedProject(path, DTEUtil.IsCppProject(p), true);
+            MSBuildUtils.RemoveIceBuilderFromProject(project);
             ProjectUtil.SaveProject(p);
 
             Guid projectGUID = Guid.Empty;

diff --git a/IceBuilder/Properties/AssemblyInfo.cs b/IceBuilder/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder/source.extension.vsixmanifest b/IceBuilder/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="ef9502be-dbc2-4568-a846-02b8e42d04c2" Version="4.2.3" Language="en-US" Publisher="ZeroC" />
+    <Identity Id="ef9502be-dbc2-4568-a846-02b8e42d04c2" Version="4.2.4" Language="en-US" Publisher="ZeroC" />
     <DisplayName>Ice Builder</DisplayName>
     <Description xml:space="preserve">Ice Builder manages the compilation of Slice (.ice) files to C++ and C#. It compiles your Slice files with slice2cpp and slice2cs, and allows you to specify the parameters provided to these compilers.</Description>
     <MoreInfo>https://github.com/zeroc-ice/ice-builder-visualstudio</MoreInfo>

diff --git a/IceBuilderTasks/Properties/AssemblyInfo.cs b/IceBuilderTasks/Properties/AssemblyInfo.cs
@@ -15,6 +15,6 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilderTemplates/CSharpSliceItemTemplate/Properties/AssemblyInfo.cs b/IceBuilderTemplates/CSharpSliceItemTemplate/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Visual Studio Extension")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/IceBuilderTemplates/VCSliceItemTemplate/Properties/AssemblyInfo.cs b/IceBuilderTemplates/VCSliceItemTemplate/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Visual Studio Extension")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/IceBuilder_Common/Properties/AssemblyInfo.cs b/IceBuilder_Common/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_VS2012/Properties/AssemblyInfo.cs b/IceBuilder_VS2012/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_VS2013/Properties/AssemblyInfo.cs b/IceBuilder_VS2013/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: ComVisibleAttribute(false)]
diff --git a/IceBuilder_VS2015/Properties/AssemblyInfo.cs b/IceBuilder_VS2015/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyProduct("Ice Builder")]
 [assembly: AssemblyCopyright("Copyright (c) 2009-2016 ZeroC, Inc.")]
-[assembly: AssemblyVersion("4.2.3")]
+[assembly: AssemblyVersion("4.2.4")]
 [assembly: ComVisibleAttribute(false)]