Merge main to main-vs-deps

eng/Version.Details.xml

@@ -13,18 +13,18 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21277.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21281.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c3e0e4070f6cd3873b775e3f4136e29f4d66cb49</Sha>
+ <Sha>c7d6bd607715f334cda90e01967bb0c02dee09be</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
  <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-2.21253.8">
  <Uri>https://github.com/dotnet/roslyn</Uri>
  <Sha>5b972bceb846f5d15f991a479e285067a75103e4</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21277.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21281.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c3e0e4070f6cd3873b775e3f4136e29f4d66cb49</Sha>
+ <Sha>c7d6bd607715f334cda90e01967bb0c02dee09be</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

global.json

@@ -12,7 +12,7 @@
  "xcopy-msbuild": "16.8.0-preview2.1"
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21277.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21277.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21281.1",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21281.1"
  }
 }

src/Deployment/Properties/launchSettings.json

@@ -5,6 +5,14 @@
  "executablePath": "$(DevEnvDir)devenv.exe",
  "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log"
  },
+ "Visual Studio Extension (with ServiceHub Debugging)": {
+ "commandName": "Executable",
+ "executablePath": "$(DevEnvDir)devenv.exe",
+ "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log",
+ "environmentVariables": {
+ "SERVICEHUBDEBUGHOSTONSTARTUP": "All"
+ }
+ },
  "Visual Studio Extension (with Native Debugging)": {
  "commandName": "Executable",
  "executablePath": "$(DevEnvDir)devenv.exe",

src/Features/Core/Portable/Diagnostics/DiagnosticAnalyzerService_BuildSynchronization.cs

@@ -16,20 +16,17 @@ internal partial class DiagnosticAnalyzerService
  /// <summary>
  /// Synchronize build errors with live error.
  /// </summary>
- public Task SynchronizeWithBuildAsync(
+ public ValueTask SynchronizeWithBuildAsync(
  Workspace workspace,
  ImmutableDictionary<ProjectId,
  ImmutableArray<DiagnosticData>> diagnostics,
  TaskQueue postBuildAndErrorListRefreshTaskQueue,
  bool onBuildCompleted,
  CancellationToken cancellationToken)
  {
- if (_map.TryGetValue(workspace, out var analyzer))
- {
- return analyzer.SynchronizeWithBuildAsync(diagnostics, postBuildAndErrorListRefreshTaskQueue, onBuildCompleted, cancellationToken);
- }
-
- return Task.CompletedTask;
+ return _map.TryGetValue(workspace, out var analyzer)
+ ? analyzer.SynchronizeWithBuildAsync(diagnostics, postBuildAndErrorListRefreshTaskQueue, onBuildCompleted, cancellationToken)
+ : default;
  }
  }
 }

src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.AnalysisData.cs

@@ -109,15 +109,15 @@ public ProjectAnalysisData(
  public DiagnosticAnalysisResult GetResult(DiagnosticAnalyzer analyzer)
  => GetResultOrEmpty(Result, analyzer, ProjectId, Version);
 
- public static async Task<ProjectAnalysisData> CreateAsync(IPersistentStorageService persistentService, Project project, IEnumerable<StateSet> stateSets, bool avoidLoadingData, CancellationToken cancellationToken)
+ public static async Task<ProjectAnalysisData> CreateAsync(Project project, IEnumerable<StateSet> stateSets, bool avoidLoadingData, CancellationToken cancellationToken)
  {
  VersionStamp? version = null;
 
  var builder = ImmutableDictionary.CreateBuilder<DiagnosticAnalyzer, DiagnosticAnalysisResult>();
  foreach (var stateSet in stateSets)
  {
  var state = stateSet.GetOrCreateProjectState(project.Id);
- var result = await state.GetAnalysisDataAsync(persistentService, project, avoidLoadingData, cancellationToken).ConfigureAwait(false);
+ var result = await state.GetAnalysisDataAsync(project, avoidLoadingData, cancellationToken).ConfigureAwait(false);
  Contract.ThrowIfFalse(project.Id == result.ProjectId);
 
  if (!version.HasValue)

src/Features/Core/Portable/Diagnostics/EngineV2/DiagnosticIncrementalAnalyzer.Executor.cs

@@ -102,7 +102,7 @@ private async Task<ProjectAnalysisData> GetProjectAnalysisDataAsync(
  // PERF: We need to flip this to false when we do actual diffing.
  var avoidLoadingData = true;
  var version = await GetDiagnosticVersionAsync(project, cancellationToken).ConfigureAwait(false);
- var existingData = await ProjectAnalysisData.CreateAsync(PersistentStorageService, project, stateSets, avoidLoadingData, cancellationToken).ConfigureAwait(false);
+ var existingData = await ProjectAnalysisData.CreateAsync(project, stateSets, avoidLoadingData, cancellationToken).ConfigureAwait(false);
 
  // We can't return here if we have open file only analyzers since saved data for open file only analyzer
  // is incomplete -- it only contains info on open files rather than whole project.