From 85f8fa04985d01c9b1e3384217e8d5c94929d6a3 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Fri, 10 Apr 2026 08:42:23 +1000 Subject: [PATCH 1/3] Try downgrading Nuget, and not explicitly doing solution restore in integration tests --- Directory.Packages.props | 3 +- .../AbstractRazorEditorTest.cs | 1 - .../InProcess/SolutionExplorerInProcess.cs | 40 ------------------- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5ebd0cb4b77..e8f40774433 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -99,7 +99,8 @@ - + + diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs index 0c8f3bcd8a5..c67e8dee8f2 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs @@ -50,7 +50,6 @@ public override async Task InitializeAsync() _projectFilePath = await CreateAndOpenBlazorProjectAsync(ControlledHangMitigatingCancellationToken); - await TestServices.SolutionExplorer.RestoreNuGetPackagesAsync(ControlledHangMitigatingCancellationToken); await TestServices.Workspace.WaitForProjectSystemAsync(ControlledHangMitigatingCancellationToken); // We open the Index.razor file, and wait for 3 RazorComponentElement's to be classified, as that diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs index 3d3f1a784be..806a8279f27 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs @@ -10,12 +10,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.VisualStudio.Razor.IntegrationTests; -using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.TextManager.Interop; using Microsoft.VisualStudio.Threading; -using NuGet.SolutionRestoreManager; using Xunit; using Task = System.Threading.Tasks.Task; @@ -43,44 +41,6 @@ public async Task AddProjectAsync(string projectName, string projectTemplate, st ErrorHandler.ThrowOnFailure(solution.AddNewProjectFromTemplate(projectTemplatePath, args.Any() ? args.ToArray() : null, null, projectPath, projectName, null, out _)); } - public async Task RestoreNuGetPackagesAsync(CancellationToken cancellationToken) - { - await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); - - var dte = await GetRequiredGlobalServiceAsync(cancellationToken); - var solution = (EnvDTE80.Solution2)dte.Solution; - foreach (var project in solution.Projects.OfType()) - { - await RestoreNuGetPackagesAsync(project.FullName, cancellationToken); - } - } - - public async Task RestoreNuGetPackagesAsync(string projectName, CancellationToken cancellationToken) - { - await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); - - await TestServices.Workspace.WaitForProjectSystemAsync(cancellationToken); - - var solutionRestoreService = await GetComponentModelServiceAsync(cancellationToken); - await solutionRestoreService.CurrentRestoreOperation; - - var projectFullPath = (await GetProjectAsync(projectName, cancellationToken)).FullName; - var solutionRestoreStatusProvider = await GetComponentModelServiceAsync(cancellationToken); - if (await solutionRestoreStatusProvider.IsRestoreCompleteAsync(cancellationToken)) - { - return; - } - - var solutionRestoreService2 = (IVsSolutionRestoreService2)solutionRestoreService; - await solutionRestoreService2.NominateProjectAsync(projectFullPath, cancellationToken); - - // Check IsRestoreCompleteAsync until it returns true (this stops the retry because true != default(bool)) - await Helper.RetryAsync( - cancellationToken => solutionRestoreStatusProvider.IsRestoreCompleteAsync(cancellationToken), - TimeSpan.FromMilliseconds(50), - cancellationToken); - } - public async Task CloseSolutionAndWaitAsync(CancellationToken cancellationToken) { await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken); From b55115e9333909f8427f0542019f6210cdb3c0e9 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Fri, 10 Apr 2026 09:54:51 +1000 Subject: [PATCH 2/3] Fix references to eng folder to use the right property --- Directory.Build.props | 2 +- Directory.Build.targets | 2 +- eng/Version.Details.props | 2 +- .../Microsoft.CodeAnalysis.Remote.Razor.csproj | 4 ++-- .../Microsoft.VisualStudio.LanguageServices.Razor.csproj | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 192c9e9b52b..743543dafd8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -80,7 +80,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f058797f856..925aabac12a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,7 +1,7 @@ diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj index 91a1e3aec53..09b97a03329 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj +++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Microsoft.CodeAnalysis.Remote.Razor.csproj @@ -1,4 +1,4 @@ - + $(NetVS);netstandard2.0 @@ -25,7 +25,7 @@ - + diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj index bb886fe92bb..b63b33567b6 100644 --- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj @@ -1,4 +1,4 @@ - + $(NetFxVS) @@ -12,7 +12,7 @@ - + From def864cc887e992685e62a027ab91662438fcabd Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 14 Apr 2026 10:18:46 +1000 Subject: [PATCH 3/3] Revert package downgrade --- Directory.Packages.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e8f40774433..5ebd0cb4b77 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -99,8 +99,7 @@ - - +