Merge branch 'main' into fully-remove-dispatcher

Author: DustinCampbell

azure-pipelines-official.yml

@@ -286,6 +286,7 @@ extends:
                 dropName: $(VisualStudio.DropName)
                 dropFolder: 'artifacts\VSSetup\$(_BuildConfig)\Insertion'
                 accessToken: $(_DevDivDropAccessToken)
+                dropRetentionDays: 90
               continueOnError: true
               condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
 

eng/pipelines/test-integration-job.yml

@@ -37,6 +37,7 @@ steps:
       -build
       -pack
       -publish
+      -deploy
       /p:BuildDependencyVsix=false
     name: Build
     displayName: Build
@@ -73,6 +74,15 @@ steps:
         artifactType: Container
         parallel: true
 
+  - powershell: ./eng/scripts/InstallProcDump.ps1
+    displayName: Install ProcDump
+
+  - powershell: ./eng/scripts/StartDumpCollectionForHangingBuilds.ps1
+      $(ProcDumpPath)procdump.exe artifacts/log/${{ parameters.configuration }}
+      (Get-Date).AddMinutes(240)
+      devenv, xunit.console, xunit.console.x86
+    displayName: Start background dump collection
+
   - script: eng\cibuild.cmd
       -configuration ${{ parameters.configuration }}
       -msbuildEngine vs
@@ -83,15 +93,20 @@ steps:
     displayName: Run Integration Tests
     condition: succeeded()
 
+  - powershell: ./eng/scripts/FinishDumpCollectionForHangingBuilds.ps1 artifacts/log/${{ parameters.configuration }}
+    displayName: Finish background dump collection
+    continueOnError: true
+    condition: always()
+
   - task: PublishBuildArtifacts@1
     displayName: Upload Run tests BinLog
     condition: always()
     continueOnError: true
     inputs:
-        pathtoPublish: artifacts/log/${{ parameters.configuration }}/Build.binlog
-        artifactName: $(Agent.Os)_$(Agent.JobName) RunTestsBinLog
-        artifactType: Container
-        parallel: true
+      pathtoPublish: artifacts/log/${{ parameters.configuration }}/Build.binlog
+      artifactName: $(Agent.Os)_$(Agent.JobName) RunTestsBinLog
+      artifactType: Container
+      parallel: true
 
   - task: PublishTestResults@2
     displayName: Publish xUnit Test Results
@@ -110,12 +125,13 @@ steps:
       ArtifactName: '$(System.JobAttempt)-TestResults $(Build.BuildNumber)'
       publishLocation: Container
     continueOnError: true
-    condition: succeededOrFailed()
+    condition: always()
+
   - task: PublishBuildArtifacts@1
     displayName: Publish Logs
     inputs:
       PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\${{ parameters.configuration }}'
       ArtifactName: '$(System.JobAttempt)-Logs ${{ parameters.configuration }} $(Build.BuildNumber)'
       publishLocation: Container
     continueOnError: true
-    condition: succeededOrFailed()
+    condition: always()

eng/scripts/CreateVSHive.ps1

@@ -30,3 +30,9 @@ for($i=0; $i -le 3; $i++)
 if($success -eq $false){
   throw "Failed to create hive"
 }
+
+Write-Host "-- VS Info --"
+$vsDir = Split-Path -Parent $devenvExePath
+$isolationIni = Join-Path $vsDir 'devenv.isolation.ini'
+Get-Content $isolationIni | Write-Host
+Write-Host "-- /VS Info --"

eng/scripts/featureflag.ps1

@@ -1,4 +1,4 @@
-[CmdletBinding(PositionalBinding=$false)]
+[CmdletBinding(PositionalBinding = $false)]
 param(
   [string]$flag = $null,
   [switch]$enable,
@@ -9,53 +9,59 @@ param(
 )
 
 if ($null -eq $flag -or '' -eq $flag) {
-    throw "Specify a -flag to set"
+  throw "Specify a -flag to set"
 }
 
 if ($flag.EndsWith("\")) {
   throw "Provided flag '$flag' ends with '\', which is not valid"
 }
 
-$value = 0
+if ($set -and $get) {
+  throw "Use only one of set or get"
+}
 
-if ($enable)
-{
-  $value = 1
+if (-not ($set -or $get)) {
+  throw "Specify one of -set or -get"
 }
 
-# If the flag contains \ assume that the intention was to provide a full path, otherwise use the default for razor lsp feature flags
-if (-not $flag.Contains("\"))
-{
-  $flag = "FeatureFlags\Razor\LSP\" + $flag
+if ($set) {
+  if ($enable -and $disable) {
+    throw "Use only one of -enable or -disable"
+  }
+
+  if (-not ($enable -or $disable)) {
+    throw "Specify one of -enable or -disable"
+  }
 }
 
-Write-Host "Attempting to modify '$flag' to '$value'"
+$value = 0
 
+if ($enable) {
+  $value = 1
+}
 
 $slashIndex = $flag.LastIndexOf("\")
 
 if ($slashIndex -ge 0) {
-    $flagBase = $flag.Substring(0, $slashIndex)
-    $flag = $flag.Substring($slashIndex + 1) #+1 to trim the \
-}
-
-if ($set -and $get) {
-    throw "Use only one of set or get"
+  $flagBase = $flag.Substring(0, $slashIndex)
+  $flag = $flag.Substring($slashIndex + 1) #+1 to trim the \
 }
 
-if (-not ($set -or $get)) {
-    throw "Specify one of -set or -get"
+if ($flag.IndexOf('.') -ge 0) {
+  Write-Host "Replacing . in $flag with \"
+  $flag = $flag.Replace(".", "\")
+  Write-Host "New value for flag: $flag"
 }
 
-if ($set)
+if (-not ($flag -like "FeatureFlags*"))
 {
-  if ($enable -and $disable) {
-    throw "Use only one of -enable or -disable"
-  }
+  Write-Host "FeatureFlags was not present, modifying $flag"
+  $flag = "FeatureFlags\" + $flag
+  Write-Host "New value for flag: $flag"
+}
 
-  if (-not ($enable -or $disable)) {
-    throw "Specify one of -enable or -disable"
-  }
+if ($set) {
+  Write-Host "Attempting to modify '$flag' to '$value'"
 }
 
 $engPath = Join-Path $PSScriptRoot ".."
@@ -74,9 +80,10 @@ Write-Host "Running VsRegEdit"
 $vsDir = $vsInfo.installationPath.TrimEnd("\")
 $vsRegEdit = Join-Path (Join-Path (Join-Path $vsDir 'Common7') 'IDE') 'VsRegEdit.exe'
 
+Write-Host "Current value:"
+&$vsRegEdit read "$vsDir" $hive HKCU $flag VALUE dword
+
 if ($set) {
+  Write-Host "Running $vsRegEdit set `"$vsDir`" $hive HKCU $flag VALUE dword $value"
   &$vsRegEdit set "$vsDir" $hive HKCU $flag VALUE dword $value
 }
-else {
-  &$vsRegEdit read "$vsDir" $hive HKCU $flag VALUE dword
-}

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Logging/EmptyLoggingFactory.EmptyLogger.cs

@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.CodeAnalysis.Razor.Logging;
+
+namespace Microsoft.AspNetCore.Razor.Logging;
+
+internal sealed partial class EmptyLoggingFactory
+{
+    private sealed class EmptyLogger : ILogger
+    {
+        public static readonly EmptyLogger Instance = new();
+
+        private EmptyLogger()
+        {
+        }
+
+        public bool IsEnabled(LogLevel logLevel) => false;
+
+        public void Log(LogLevel logLevel, string message, Exception? exception)
+        {
+        }
+    }
+}

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Logging/EmptyLoggingFactory.cs

@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.CodeAnalysis.Razor.Logging;
+
+namespace Microsoft.AspNetCore.Razor.Logging;
+
+internal sealed partial class EmptyLoggingFactory : ILoggerFactory
+{
+    public static readonly EmptyLoggingFactory Instance = new();
+
+    private EmptyLoggingFactory()
+    {
+    }
+
+    public void AddLoggerProvider(ILoggerProvider provider)
+        => throw new NotImplementedException();
+
+    public ILogger GetOrCreateLogger(string categoryName)
+        => EmptyLogger.Instance;
+}

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.TestErrorReporter.cs

@@ -5,13 +5,11 @@
 using System.Collections.Immutable;
 using System.IO;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Logging;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
-using Moq;
 
 namespace Microsoft.AspNetCore.Razor.Microbenchmarks;
 
@@ -21,7 +19,6 @@ public abstract partial class ProjectSnapshotManagerBenchmarkBase
     internal ImmutableArray<HostDocument> Documents { get; }
     internal ImmutableArray<TextLoader> TextLoaders { get; }
     protected string RepoRoot { get; }
-    private protected IErrorReporter ErrorReporter { get; }
 
     protected ProjectSnapshotManagerBenchmarkBase(int documentCount = 100)
     {
@@ -59,19 +56,12 @@ protected ProjectSnapshotManagerBenchmarkBase(int documentCount = 100)
         }
 
         Documents = documents.ToImmutable();
-
-        var loggerFactoryMock = new Mock<ILoggerFactory>(MockBehavior.Strict);
-        loggerFactoryMock
-            .Setup(x => x.GetOrCreateLogger(It.IsAny<string>()))
-            .Returns(Mock.Of<ILogger>(MockBehavior.Strict));
-
-        ErrorReporter = new TestErrorReporter();
     }
 
     internal ProjectSnapshotManager CreateProjectSnapshotManager()
     {
         return new ProjectSnapshotManager(
             projectEngineFactoryProvider: StaticProjectEngineFactoryProvider.Instance,
-            errorReporter: ErrorReporter);
+            loggerFactory: EmptyLoggingFactory.Instance);
     }
 }

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs

@@ -105,8 +105,6 @@ protected override ILspServices ConstructLspServices()
         // Add the logger as a service in case anything in CLaSP pulls it out to do logging
         services.AddSingleton<ILspLogger>(_logger);
 
-        services.AddSingleton<IErrorReporter, LanguageServerErrorReporter>();
-
         services.AddSingleton<IAdhocWorkspaceFactory, AdhocWorkspaceFactory>();
         services.AddSingleton<IWorkspaceProvider, LspWorkspaceProvider>();