Merge pull request #7309 from mono/backport-pr-7306-to-release-8.0-integration

[release-8.0-integration] Remove MetadataReferences from ProjectReferences

1 files changed, 3 insertions, 31 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.MetadataReferenceHandler.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.MetadataReferenceHandler.cs
index b070146e50..a310c17129 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.MetadataReferenceHandler.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.MetadataReferenceHandler.cs
@@ -92,9 +92,6 @@ namespace MonoDevelop.Ide.TypeSystem
 
 				if (!await AddMetadataAssemblyReferences (data))
 					return ImmutableArray<MonoDevelopMetadataReference>.Empty;
-
-				if (!AddMetadataProjectReferences (data))
-					return ImmutableArray<MonoDevelopMetadataReference>.Empty;
 				return data.Result.ToImmutableArray ();
 			}
 
@@ -112,6 +109,9 @@ namespace MonoDevelop.Ide.TypeSystem
 				try {
 					var referencedAssemblies = await data.Project.GetReferencedAssemblies (data.ConfigurationSelector, false).ConfigureAwait (false);
 					foreach (var file in referencedAssemblies) {
+						if (file.IsProjectReference)
+							continue;
+
 						if (data.Token.IsCancellationRequested)
 							return false;
 
@@ -132,34 +132,6 @@ namespace MonoDevelop.Ide.TypeSystem
 				}
 			}
 
-			bool AddMetadataProjectReferences (AddMetadataReferencesData data)
-			{
-				try {
-					var referencedProjects = data.Project.GetReferencedItems (data.ConfigurationSelector);
-					foreach (var pr in referencedProjects) {
-						if (data.Token.IsCancellationRequested)
-							return false;
-
-						if (!(pr is MonoDevelop.Projects.DotNetProject referencedProject) || !TypeSystemService.IsOutputTrackedProject (referencedProject))
-							continue;
-
-						var fileName = referencedProject.GetOutputFileName (data.ConfigurationSelector);
-						if (!data.Visited.Add (fileName))
-							continue;
-
-						var metadataReference = manager.GetOrCreateMetadataReference (fileName, MetadataReferenceProperties.Assembly);
-						if (metadataReference != null)
-							data.Result.Add (metadataReference);
-					}
-				} catch (Exception e) {
-					LoggingService.LogError ("Error while getting referenced assemblies", e);
-					// TODO: Check whether this should return false, I retained compat for now.
-					return true;
-				}
-
-				return true;
-			}
-
 			async Task<ImmutableArray<ProjectReference>> CreateProjectReferences (MonoDevelop.Projects.Project p, CancellationToken token)
 			{
 				if (!(p is MonoDevelop.Projects.DotNetProject netProj))