Fix issues with arranging elements in root

 - Fix the sorting of elements when the CombineRootElements option is
   off.
 - Fix the sorting of elements in root to retain comments.

Author: schmalls

Projects/CsProjArrange/CsProjArrange/CsProjArrange.cs

@@ -115,8 +115,8 @@ public void Arrange(string inputFile, string outputFile, IList<string> stickyEle
                         )
                 ;
             foreach (var group in combineGroups) {
-                var first = group.First();
                 if (options.HasFlag(ArrangeOptions.CombineRootElements)) {
+                    var first = group.First();
                     // Combine multiple elements if they have the same name and attributes.
                     if (group.Count() > 1) {
                         var restGroup = group.Skip(1);
@@ -125,9 +125,13 @@ public void Arrange(string inputFile, string outputFile, IList<string> stickyEle
                             rest.Remove();
                         }
                     }
+                    // Do the sorting.
+                    ArrangeElement(first);
+                } else {
+                    foreach (var element in group) {
+                        ArrangeElement(element);
+                    }
                 }
-                // Do the sorting.
-                ArrangeElement(first);
             }
 
             if (options.HasFlag(ArrangeOptions.SplitItemGroups)) {
@@ -154,7 +158,11 @@ public void Arrange(string inputFile, string outputFile, IList<string> stickyEle
             }
             if (options.HasFlag(ArrangeOptions.SortRootElements)) {
                 // Sort the elements in root.
-                input.Root.ReplaceNodes(input.Root.Elements().OrderBy(x => x, nodeNameComparer).ThenBy(x => x.Attributes(), attributeKeyComparer));
+                input.Root.ReplaceNodes(
+                    input.Root.Nodes()
+                        .OrderBy(x => x, nodeNameComparer)
+                        .ThenBy(x => x.NodeType == XmlNodeType.Element ? ((XElement)x).Attributes() : null, attributeKeyComparer)
+                    );
             }
             // Backup input file if we are overwriting.
             if ((inputFile != null) && (inputFile == outputFile)) {

Projects/CsProjArrange/CsProjArrange/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]