Merge branch 'master' into fsharp4

vsintegration/src/vs/FsPkgs/FSharp.Project/Common.Source.CSharp/Project/ProjectNode.cs

@@ -5214,12 +5214,13 @@ internal int DoAddItem(uint itemIdLoc, VSADDITEMOPERATION op, string itemName, u
             }
             else if (op == VSADDITEMOPERATION.VSADDITEMOP_OPENFILE)
             {
-                // When called via automation API, there seem to always be exactly one element in the array
-                string file = files[0];
-                HierarchyNode n = this.NodeFromItemId(itemIdLoc);
-                string relativeFolder = Path.GetDirectoryName(n.Url);
-                string relPath = PackageUtilities.MakeRelativeIfRooted(Path.Combine(relativeFolder, Path.GetFileName(file)), this.BaseURI);
-                MoveFileToBottomIfNoOtherPendingMove(relPath);
+                foreach (string file in files)
+                {
+                    HierarchyNode n = this.NodeFromItemId(itemIdLoc);
+                    string relativeFolder = Path.GetDirectoryName(n.Url);
+                    string relPath = PackageUtilities.MakeRelativeIfRooted(Path.Combine(relativeFolder, Path.GetFileName(file)), this.BaseURI);
+                    MoveFileToBottomIfNoOtherPendingMove(relPath);
+                }
             }
             else if (op == VSADDITEMOPERATION.VSADDITEMOP_LINKTOFILE)
             {