Merge branch 'master' into master

Author: filipw

src/OmniSharp.MSBuild/ProjectManager.cs

@@ -670,8 +670,8 @@ private void UpdateProjectReferences(Project project, ImmutableArray<string> pro
                     if (projectFileInfo.ProjectReferenceAliases.TryGetValue(projectReferencePath, out var projectReferenceAliases))
                     {
                         if (!string.IsNullOrEmpty(projectReferenceAliases))
-                        {
-                            aliases = projectReferenceAliases.Split(';').ToImmutableArray();
+                        {                            
+                            aliases = ImmutableArray.CreateRange(projectReferenceAliases.Split(new char[]{','},StringSplitOptions.RemoveEmptyEntries).Select(a => a.Trim()));
                             _logger.LogDebug($"Setting aliases: {projectReferencePath}, {projectReferenceAliases} ");
                         }
                     }
@@ -740,7 +740,7 @@ private void UpdateReferences(Project project, ImmutableArray<string> projectRef
                         {
                             if (!string.IsNullOrEmpty(aliases))
                             {
-                                reference = reference.WithAliases(aliases.Split(';'));
+                                reference = reference.WithAliases(aliases.Split(new char[]{','},StringSplitOptions.RemoveEmptyEntries).Select(a => a.Trim()));
                                 _logger.LogDebug($"setting aliases: {referencePath}, {aliases} ");
                             }
                         }

test-assets/test-projects/ExternAlias/ExternAlias.App/ExternAlias.App.csproj

@@ -7,7 +7,7 @@
   <ItemGroup>
     <Reference Include="ExternAlias.Lib">
         <HintPath>$(ProjectDir)../ExternAlias.Lib/bin/$(Configuration)/netstandard2.0/ExternAlias.Lib.dll</HintPath>
-        <Aliases>abc</Aliases>
+        <Aliases>abc,def</Aliases>
     </Reference>
   </ItemGroup>
 

test-assets/test-projects/ExternAlias/ExternAlias.App/Program.cs

@@ -1,4 +1,5 @@
 extern alias abc;
+extern alias def;
 using System;
 
 namespace ExternAlias.App
@@ -8,6 +9,7 @@ class Program
         static void Main(string[] args)
         {
             new abc::ExternAlias.Lib.Class1();
+            new def::ExternAlias.Lib.Class1();
             Console.WriteLine("Hello World!");
         }
     }

test-assets/test-projects/ExternAlias/ExternAlias.App2/ExternAlias.App2.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../ExternAlias.Lib/ExternAlias.Lib.csproj">
-        <Aliases>abc</Aliases>
+        <Aliases>abc,def</Aliases>
     </ProjectReference>
   </ItemGroup>
 

test-assets/test-projects/ExternAlias/ExternAlias.App2/Program.cs

@@ -1,4 +1,5 @@
 extern alias abc;
+extern alias def;
 using System;
 
 namespace ExternAlias.App
@@ -8,6 +9,7 @@ class Program
         static void Main(string[] args)
         {
             new abc::ExternAlias.Lib.Class1();
+            new def::ExternAlias.Lib.Class1();
             Console.WriteLine("Hello World!");
         }
     }

tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs

@@ -159,7 +159,7 @@ public async Task ExternAliasWithReference()
 
                 var libpath = Path.Combine(testProject.Directory, "ExternAlias.Lib", "bin", "Debug", "netstandard2.0", "ExternAlias.Lib.dll");
                 Assert.True(projectFileInfo.ReferenceAliases.ContainsKey(libpath));
-                Assert.Equal("abc", projectFileInfo.ReferenceAliases[libpath]);
+                Assert.Equal("abc,def", projectFileInfo.ReferenceAliases[libpath]);
             }
         }
 
@@ -179,7 +179,7 @@ public async Task ExternAliasWithProjectReference()
 
                 var projectReferencePath = Path.Combine(testProject.Directory, "ExternAlias.Lib", "ExternAlias.Lib.csproj");
                 Assert.True(projectFileInfo.ProjectReferenceAliases.ContainsKey(projectReferencePath));
-                Assert.Equal("abc", projectFileInfo.ProjectReferenceAliases[projectReferencePath]);
+                Assert.Equal("abc,def", projectFileInfo.ProjectReferenceAliases[projectReferencePath]);
             }
         }
 

tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs

@@ -317,7 +317,9 @@ public async Task TestProjectWithAliasOnProjectReference()
                     .ProjectReferences
                     .Single(x => x.ProjectId == lib.Id);
 
-                Assert.Equal("abc", projectReference.Aliases.Single());
+                Assert.Collection(projectReference.Aliases,
+                    referenceA => Assert.Equal("abc",referenceA),
+                    referenceB => Assert.Equal("def",referenceB));
             }
         }
 
@@ -337,7 +339,9 @@ public async Task TestProjectWithAliasOnReference()
                     .MetadataReferences
                     .Single(x => x.Display == "ExternAlias.Lib.dll");
 
-                Assert.Equal("abc", reference.Properties.Aliases.Single());
+                Assert.Collection(reference.Properties.Aliases,
+                    referenceA => Assert.Equal("abc",referenceA),
+                    referenceB => Assert.Equal("def",referenceB));
             }
         }
     }