Set intermediate path sooner

src/EditorFeatures/Core/Interactive/InteractiveSession.cs

@@ -294,7 +294,7 @@ private Project CreateSubmissionProjectNoLock(Solution solution, ProjectId newSu
                     name: name,
                     assemblyName: name,
                     language: languageName,
-                    compilationOutputFilePaths: default,
+                    compilationOutputInfo: default,
                     checksumAlgorithm: SourceHashAlgorithms.Default,
                     isSubmission: true),
                 compilationOptions: compilationOptions,

src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceGeneratedFileInfo.cs

@@ -97,7 +97,7 @@ public MetadataAsSourceGeneratedFileInfo(string rootPath, Workspace sourceWorksp
                 name: AssemblyIdentity.Name,
                 assemblyName: AssemblyIdentity.Name,
                 language: LanguageName,
-                compilationOutputFilePaths: default,
+                compilationOutputInfo: default,
                 checksumAlgorithm: ChecksumAlgorithm),
             compilationOptions: compilationOptions,
             parseOptions: _parseOptions,

src/Features/Core/Portable/PdbSourceDocument/PdbSourceDocumentMetadataAsSourceFileProvider.cs

@@ -293,7 +293,7 @@ internal sealed class PdbSourceDocumentMetadataAsSourceFileProvider(
                 name: $"{assemblyName} ({assemblyVersion})",
                 assemblyName: assemblyName,
                 language: languageName,
-                compilationOutputFilePaths: default,
+                compilationOutputInfo: default,
                 checksumAlgorithm: checksumAlgorithm),
             compilationOptions: compilationOptions,
             parseOptions: parseOptions,

src/Features/Core/Portable/Workspace/MiscellaneousFileUtilities.cs

@@ -64,7 +64,7 @@ internal static ProjectInfo CreateMiscellaneousProjectInfoForDocument(
                 name: FeaturesResources.Miscellaneous_Files,
                 assemblyName: assemblyName,
                 language: languageInformation.LanguageName,
-                compilationOutputFilePaths: default,
+                compilationOutputInfo: default,
                 checksumAlgorithm: checksumAlgorithm,
                 // Miscellaneous files projects are never fully loaded since, by definition, it won't know
                 // what the full set of information is except when the file is script code.

src/Features/Lsif/Generator/CompilerInvocation.cs

@@ -79,7 +79,7 @@ public static async Task<Project> CreateFromInvocationInfoAsync(CompilerInvocati
                     name: Path.GetFileNameWithoutExtension(invocationInfo.ProjectFilePath),
                     assemblyName: parsedCommandLine.CompilationName!,
                     language: languageName,
-                    compilationOutputFilePaths: default,
+                    compilationOutputInfo: default,
                     checksumAlgorithm: parsedCommandLine.ChecksumAlgorithm,
                     filePath: invocationInfo.ProjectFilePath,
                     outputFilePath: parsedCommandLine.OutputFileName),

src/Features/TestUtilities/EditAndContinue/EditAndContinueTestVerifier.cs

@@ -428,7 +428,7 @@ private void CreateProjects(EditScript<SyntaxNode>[] editScripts, AdhocWorkspace
                     name: "project",
                     assemblyName: "project",
                     language: LanguageName,
-                    compilationOutputFilePaths: default,
+                    compilationOutputInfo: default,
                     filePath: Path.Combine(TempRoot.Root, "project" + ProjectFileExtension),
                     checksumAlgorithm: SourceHashAlgorithms.Default));
 

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LanguageServerProjectSystem.cs

@@ -264,7 +264,12 @@ private async Task<bool> LoadOrReloadProjectAsync(ProjectToLoad projectToLoad, T
                 else
                 {
                     var projectSystemName = $"{projectPath} (${loadedProjectInfo.TargetFramework})";
-                    var projectCreationInfo = new ProjectSystemProjectCreationInfo { AssemblyName = projectSystemName, FilePath = projectPath };
+                    var projectCreationInfo = new ProjectSystemProjectCreationInfo
+                    {
+                        AssemblyName = projectSystemName,
+                        FilePath = projectPath,
+                        CompilationOutputAssemblyFilePath = loadedProjectInfo.IntermediateOutputFilePath
+                    };
 
                     var projectSystemProject = await _workspaceFactory.ProjectSystemProjectFactory.CreateAndAddToWorkspaceAsync(
                         projectSystemName,

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LoadedProject.cs

@@ -101,6 +101,7 @@ public void Dispose()
         _projectSystemProject.DisplayName = projectDisplayName;
         _projectSystemProject.OutputFilePath = newProjectInfo.OutputFilePath;
         _projectSystemProject.OutputRefFilePath = newProjectInfo.OutputRefFilePath;
+        _projectSystemProject.CompilationOutputAssemblyFilePath = newProjectInfo.IntermediateOutputFilePath;
 
         if (newProjectInfo.TargetFrameworkIdentifier != null)
         {

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/WorkspaceProject.cs

@@ -170,8 +170,7 @@ public async Task SetBuildSystemPropertiesAsync(IReadOnlyDictionary<string, stri
             }
         }
 
-        // Workaround for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1830960
-        _project.CompilationOutputAssemblyFilePath = _project.OutputFilePath;
+        _project.CompilationOutputAssemblyFilePath = _project.CompilationOutputAssemblyFilePath;
 
         string? GetFullyQualifiedPath(string? propertyValue)
         {

src/VisualStudio/LiveShare/Impl/Client/Projects/RoslynRemoteProjectInfoProvider.cs

@@ -103,7 +103,7 @@ private static ProjectInfo CreateProjectInfo(string projectName, string language
                     name: projectName,
                     assemblyName: projectName,
                     language,
-                    compilationOutputFilePaths: default,
+                    compilationOutputInfo: default,
                     checksumAlgorithm),
                 documents: docInfos);
         }

src/VisualStudio/LiveShare/Impl/Client/RemoteLanguageServiceWorkspace.cs

@@ -322,7 +322,7 @@ private Document AddDocumentToProject(string filePath, string language, string p
                         name: projectName,
                         assemblyName: projectName,
                         language,
-                        compilationOutputFilePaths: default,
+                        compilationOutputInfo: default,
                         checksumAlgorithm: SourceHashAlgorithms.Default));
 
                 OnProjectAdded(projectInfo);

src/Workspaces/Core/MSBuild/MSBuild/MSBuildProjectLoader.Worker.cs

@@ -302,7 +302,7 @@ private Task<ProjectInfo> CreateProjectInfoAsync(ProjectFileInfo projectFileInfo
                                 name: projectName,
                                 assemblyName: assemblyName,
                                 language: language,
-                                compilationOutputFilePaths: new CompilationOutputInfo(projectFileInfo.IntermediateOutputFilePath),
+                                compilationOutputInfo: new CompilationOutputInfo(projectFileInfo.IntermediateOutputFilePath),
                                 checksumAlgorithm: SourceHashAlgorithms.Default,
                                 filePath: projectPath),
                             compilationOptions: compilationOptions,
@@ -370,7 +370,7 @@ private Task<ProjectInfo> CreateProjectInfoAsync(ProjectFileInfo projectFileInfo
                             projectName,
                             assemblyName,
                             language,
-                            compilationOutputFilePaths: new CompilationOutputInfo(projectFileInfo.IntermediateOutputFilePath),
+                            compilationOutputInfo: new CompilationOutputInfo(projectFileInfo.IntermediateOutputFilePath),
                             checksumAlgorithm: commandLineArgs.ChecksumAlgorithm,
                             filePath: projectPath,
                             outputFilePath: projectFileInfo.OutputFilePath,

src/Workspaces/Core/Portable/Workspace/CommandLineProject.cs

@@ -119,7 +119,7 @@ public static ProjectInfo CreateProjectInfo(string projectName, string language,
                 name: projectName,
                 assemblyName: assemblyName,
                 language: language,
-                compilationOutputFilePaths: new CompilationOutputInfo(commandLineArguments.OutputFileName != null ? commandLineArguments.GetOutputFilePath(commandLineArguments.OutputFileName) : null),
+                compilationOutputInfo: new CompilationOutputInfo(commandLineArguments.OutputFileName != null ? commandLineArguments.GetOutputFilePath(commandLineArguments.OutputFileName) : null),
                 checksumAlgorithm: commandLineArguments.ChecksumAlgorithm),
             compilationOptions: commandLineArguments.CompilationOptions
                 .WithXmlReferenceResolver(xmlFileResolver)

src/Workspaces/Core/Portable/Workspace/ProjectSystem/ProjectSystemProject.cs

@@ -148,7 +148,8 @@ internal ProjectSystemProject(
         string assemblyName,
         CompilationOptions? compilationOptions,
         string? filePath,
-        ParseOptions? parseOptions)
+        ParseOptions? parseOptions,
+        string? compilationOutputAssemblyFilePath)
     {
         _projectSystemProjectFactory = projectSystemProjectFactory;
         _hostInfo = hostInfo;
@@ -196,6 +197,7 @@ internal ProjectSystemProject(
         _compilationOptions = compilationOptions;
         _filePath = filePath;
         _parseOptions = parseOptions;
+        _compilationOutputAssemblyFilePath = compilationOutputAssemblyFilePath;
 
         var watchedDirectories = GetWatchedDirectories(language, filePath);
         _documentFileChangeContext = _projectSystemProjectFactory.FileChangeWatcher.CreateContext(watchedDirectories);

src/Workspaces/Core/Portable/Workspace/ProjectSystem/ProjectSystemProjectCreationInfo.cs

@@ -12,6 +12,7 @@ internal class ProjectSystemProjectCreationInfo
     public CompilationOptions? CompilationOptions { get; set; }
     public string? FilePath { get; set; }
     public ParseOptions? ParseOptions { get; set; }
+    public string? CompilationOutputAssemblyFilePath { get; set; }
 
     public Guid TelemetryId { get; set; }
 }

src/Workspaces/Core/Portable/Workspace/ProjectSystem/ProjectSystemProjectFactory.cs

@@ -94,7 +94,8 @@ public async Task<ProjectSystemProject> CreateAndAddToWorkspaceAsync(string proj
             assemblyName,
             creationInfo.CompilationOptions,
             creationInfo.FilePath,
-            creationInfo.ParseOptions);
+            creationInfo.ParseOptions,
+            creationInfo.CompilationOutputAssemblyFilePath);
 
         var versionStamp = creationInfo.FilePath != null
             ? VersionStamp.Create(File.GetLastWriteTimeUtc(creationInfo.FilePath))
@@ -107,7 +108,7 @@ public async Task<ProjectSystemProject> CreateAndAddToWorkspaceAsync(string proj
                 name: projectSystemName,
                 assemblyName,
                 language,
-                compilationOutputFilePaths: default, // will be updated when command line is set
+                compilationOutputInfo: new(creationInfo.CompilationOutputAssemblyFilePath), // will be updated when command line is set
                 SourceHashAlgorithms.Default, // will be updated when command line is set
                 filePath: creationInfo.FilePath,
                 telemetryId: creationInfo.TelemetryId),

src/Workspaces/Core/Portable/Workspace/Solution/ProjectInfo.cs

@@ -230,7 +230,7 @@ public static ProjectInfo Create(
                 name ?? throw new ArgumentNullException(nameof(name)),
                 assemblyName ?? throw new ArgumentNullException(nameof(assemblyName)),
                 language ?? throw new ArgumentNullException(nameof(language)),
-                compilationOutputFilePaths: default,
+                compilationOutputInfo: default,
                 checksumAlgorithm: SourceHashAlgorithm.Sha1,
                 defaultNamespace: null,
                 filePath: filePath,
@@ -401,7 +401,7 @@ internal sealed class ProjectAttributes(
         string name,
         string assemblyName,
         string language,
-        CompilationOutputInfo compilationOutputFilePaths,
+        CompilationOutputInfo compilationOutputInfo,
         SourceHashAlgorithm checksumAlgorithm,
         string? defaultNamespace = null,
         string? filePath = null,
@@ -460,7 +460,7 @@ internal sealed class ProjectAttributes(
         /// <summary>
         /// Paths to the compiler output files.
         /// </summary>
-        public CompilationOutputInfo CompilationOutputInfo { get; } = compilationOutputFilePaths;
+        public CompilationOutputInfo CompilationOutputInfo { get; } = compilationOutputInfo;
 
         /// <summary>
         /// The default namespace of the project.

src/Workspaces/CoreTestUtilities/Workspaces/TestHostProject`1.cs

@@ -311,7 +311,7 @@ public ProjectInfo ToProjectInfo()
                     name: Name,
                     assemblyName: AssemblyName,
                     language: Language,
-                    compilationOutputFilePaths: default,
+                    compilationOutputInfo: default,
                     checksumAlgorithm: Text.SourceHashAlgorithms.Default,
                     defaultNamespace: DefaultNamespace,
                     filePath: FilePath,