Skip to content

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' #51231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 14, 2025
Merged

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' #51231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f7f808
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Oct 14, 2025
d031a8f
[dotnet-watch] Remove excess logging that slows down Hot Reload (#51220)
tmat Oct 14, 2025
6ddd557
[release/10.0.1xx] Update dependencies from microsoft/testfx (#51229)
SimonZhao888 Oct 14, 2025
f9a7f1e
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
SimonZhao888 Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ This file should be imported by eng/Versions.props
<!-- dotnet/core-setup dependencies -->
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- microsoft/testfx dependencies -->
<MicrosoftTestingPlatformPackageVersion>2.1.0-preview.25511.2</MicrosoftTestingPlatformPackageVersion>
<MSTestPackageVersion>4.1.0-preview.25511.2</MSTestPackageVersion>
<MicrosoftTestingPlatformPackageVersion>2.1.0-preview.25513.3</MicrosoftTestingPlatformPackageVersion>
<MSTestPackageVersion>4.1.0-preview.25513.3</MSTestPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,13 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>8656e755a6efd273c038b670bc52648783d3f667</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Platform" Version="2.1.0-preview.25511.2">
<Dependency Name="Microsoft.Testing.Platform" Version="2.1.0-preview.25513.3">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>f820ad104e64123673d850e8f892d84c8cae113c</Sha>
<Sha>524430396f57485613ece3e782ea0d1f617f23bd</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.1.0-preview.25511.2">
<Dependency Name="MSTest" Version="4.1.0-preview.25513.3">
<Uri>https://github.com/microsoft/testfx</Uri>
<Sha>f820ad104e64123673d850e8f892d84c8cae113c</Sha>
<Sha>524430396f57485613ece3e782ea0d1f617f23bd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rtm.25510.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down
18 changes: 17 additions & 1 deletion src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,23 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken)
{
_logger.Log(MessageDescriptor.HotReloadSessionStarting);

await _hotReloadService.StartSessionAsync(Workspace.CurrentSolution, cancellationToken);
var solution = Workspace.CurrentSolution;

await _hotReloadService.StartSessionAsync(solution, cancellationToken);

// TODO: StartSessionAsync should do this: https://github.com/dotnet/roslyn/issues/80687
foreach (var project in solution.Projects)
{
foreach (var document in project.AdditionalDocuments)
{
await document.GetTextAsync(cancellationToken);
}

foreach (var document in project.AnalyzerConfigDocuments)
{
await document.GetTextAsync(cancellationToken);
}
}

_logger.Log(MessageDescriptor.HotReloadSessionStarted);
}
Expand Down
4 changes: 4 additions & 0 deletions src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ private static async ValueTask<SourceText> GetSourceTextAsync(string filePath, E

public async Task ReportSolutionFilesAsync(Solution solution, CancellationToken cancellationToken)
{
#if DEBUG
_logger.LogDebug("Solution: {Path}", solution.FilePath);
foreach (var project in solution.Projects)
{
Expand All @@ -245,5 +246,8 @@ async ValueTask InspectDocumentAsync(TextDocument document, string kind)
var text = await document.GetTextAsync(cancellationToken);
_logger.LogDebug(" {Kind}: {FilePath} [{Checksum}]", kind, document.FilePath, Convert.ToBase64String(text.GetChecksum().ToArray()));
}
#else
await Task.CompletedTask;
#endif
}
}