Skip to content

Commit 547c258

Browse files
authored
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' (#51231)
2 parents 7c61d86 + f9a7f1e commit 547c258

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ This file should be imported by eng/Versions.props
140140
<!-- dotnet/core-setup dependencies -->
141141
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
142142
<!-- microsoft/testfx dependencies -->
143-
<MicrosoftTestingPlatformPackageVersion>2.1.0-preview.25511.2</MicrosoftTestingPlatformPackageVersion>
144-
<MSTestPackageVersion>4.1.0-preview.25511.2</MSTestPackageVersion>
143+
<MicrosoftTestingPlatformPackageVersion>2.1.0-preview.25513.3</MicrosoftTestingPlatformPackageVersion>
144+
<MSTestPackageVersion>4.1.0-preview.25513.3</MSTestPackageVersion>
145145
</PropertyGroup>
146146
<!--Property group for alternate package version names-->
147147
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,13 +553,13 @@
553553
<Uri>https://github.com/dotnet/dotnet</Uri>
554554
<Sha>8656e755a6efd273c038b670bc52648783d3f667</Sha>
555555
</Dependency>
556-
<Dependency Name="Microsoft.Testing.Platform" Version="2.1.0-preview.25511.2">
556+
<Dependency Name="Microsoft.Testing.Platform" Version="2.1.0-preview.25513.3">
557557
<Uri>https://github.com/microsoft/testfx</Uri>
558-
<Sha>f820ad104e64123673d850e8f892d84c8cae113c</Sha>
558+
<Sha>524430396f57485613ece3e782ea0d1f617f23bd</Sha>
559559
</Dependency>
560-
<Dependency Name="MSTest" Version="4.1.0-preview.25511.2">
560+
<Dependency Name="MSTest" Version="4.1.0-preview.25513.3">
561561
<Uri>https://github.com/microsoft/testfx</Uri>
562-
<Sha>f820ad104e64123673d850e8f892d84c8cae113c</Sha>
562+
<Sha>524430396f57485613ece3e782ea0d1f617f23bd</Sha>
563563
</Dependency>
564564
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rtm.25510.102">
565565
<Uri>https://github.com/dotnet/dotnet</Uri>

src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,23 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken)
7777
{
7878
_logger.Log(MessageDescriptor.HotReloadSessionStarting);
7979

80-
await _hotReloadService.StartSessionAsync(Workspace.CurrentSolution, cancellationToken);
80+
var solution = Workspace.CurrentSolution;
81+
82+
await _hotReloadService.StartSessionAsync(solution, cancellationToken);
83+
84+
// TODO: StartSessionAsync should do this: https://github.com/dotnet/roslyn/issues/80687
85+
foreach (var project in solution.Projects)
86+
{
87+
foreach (var document in project.AdditionalDocuments)
88+
{
89+
await document.GetTextAsync(cancellationToken);
90+
}
91+
92+
foreach (var document in project.AnalyzerConfigDocuments)
93+
{
94+
await document.GetTextAsync(cancellationToken);
95+
}
96+
}
8197

8298
_logger.Log(MessageDescriptor.HotReloadSessionStarted);
8399
}

src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ private static async ValueTask<SourceText> GetSourceTextAsync(string filePath, E
219219

220220
public async Task ReportSolutionFilesAsync(Solution solution, CancellationToken cancellationToken)
221221
{
222+
#if DEBUG
222223
_logger.LogDebug("Solution: {Path}", solution.FilePath);
223224
foreach (var project in solution.Projects)
224225
{
@@ -245,5 +246,8 @@ async ValueTask InspectDocumentAsync(TextDocument document, string kind)
245246
var text = await document.GetTextAsync(cancellationToken);
246247
_logger.LogDebug(" {Kind}: {FilePath} [{Checksum}]", kind, document.FilePath, Convert.ToBase64String(text.GetChecksum().ToArray()));
247248
}
249+
#else
250+
await Task.CompletedTask;
251+
#endif
248252
}
249253
}

0 commit comments

Comments
 (0)