Merge pull request #298 from RevenantX/master

Fix for - Lots of mscorlib issues with 3rd party packages #265
OmniSharp · Sep 15, 2015 · 66f1ee1 · 66f1ee1
2 parents ceda8a9 + a7bebef
commit 66f1ee1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/OmniSharp/MSBuild/MSBuildProjectSystem.cs b/src/OmniSharp/MSBuild/MSBuildProjectSystem.cs
@@ -115,12 +115,17 @@ public void Initalize()
                     continue;
                 }
 
+                var compilationOptions = new CSharpCompilationOptions(projectFileInfo.OutputKind);
+#if DNX451
+                compilationOptions = compilationOptions.WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default);
+#endif
                 var projectInfo = ProjectInfo.Create(ProjectId.CreateNewId(projectFileInfo.Name),
                                                      VersionStamp.Create(),
                                                      projectFileInfo.Name,
                                                      projectFileInfo.AssemblyName,
                                                      LanguageNames.CSharp,
-                                                     projectFileInfo.ProjectFilePath);
+                                                     projectFileInfo.ProjectFilePath,
+                                                     compilationOptions: compilationOptions);
 
                 _workspace.AddProject(projectInfo);
 

diff --git a/src/OmniSharp/MSBuild/ProjectFile/ProjectFileInfo.cs b/src/OmniSharp/MSBuild/ProjectFile/ProjectFileInfo.cs
@@ -47,6 +47,8 @@ public class ProjectFileInfo
 
         public IList<string> DefineConstants { get; private set; }
 
+        public OutputKind OutputKind { get; private set; }
+
         public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, string solutionDirectory, string projectFilePath, ICollection<MSBuildDiagnosticsMessage> diagnostics)
         {
             var projectFileInfo = new ProjectFileInfo();
@@ -90,6 +92,17 @@ public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, str
                 projectFileInfo.SpecifiedLanguageVersion = ToLanguageVersion(projectInstance.GetPropertyValue("LangVersion"));
                 projectFileInfo.ProjectId = new Guid(projectInstance.GetPropertyValue("ProjectGuid").TrimStart('{').TrimEnd('}'));
                 projectFileInfo.TargetPath = projectInstance.GetPropertyValue("TargetPath");
+                var outputType = projectInstance.GetPropertyValue("OutputType");
+                switch(outputType)
+                {
+                    case "Library": projectFileInfo.OutputKind = OutputKind.DynamicallyLinkedLibrary;
+                        break;
+                    case "WinExe": projectFileInfo.OutputKind = OutputKind.WindowsApplication;
+                        break;
+                    default:
+                    case "Exe": projectFileInfo.OutputKind = OutputKind.ConsoleApplication;
+                        break;
+                }
 
                 projectFileInfo.SourceFiles =
                     projectInstance.GetItems("Compile")