Skip to content

Commit 88fad08

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-0bf0304c-4f66-432d-8ed9-f1bea8eb9c11
2 parents 5d57500 + eed65d6 commit 88fad08

19 files changed

+468
-223
lines changed

‎eng/Version.Details.xml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>5a39d0ad691ee88dcf163808d9ed7a46b168a1c9</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rtm.24466.12">
134+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rtm.24468.6">
135135
<Uri>https://github.com/dotnet/aspnetcore</Uri>
136-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
136+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
137137
</Dependency>
138-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24466.12">
138+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rtm.24468.6">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
140-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
140+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
141141
</Dependency>
142142
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.0-rc.108">
143143
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -271,89 +271,89 @@
271271
<Uri>https://github.com/dotnet/wpf</Uri>
272272
<Sha>d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3</Sha>
273273
</Dependency>
274-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24466.12">
274+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24468.6">
275275
<Uri>https://github.com/dotnet/aspnetcore</Uri>
276-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
276+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
277277
</Dependency>
278-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rtm.24466.12">
278+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rtm.24468.6">
279279
<Uri>https://github.com/dotnet/aspnetcore</Uri>
280-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
280+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
281281
</Dependency>
282-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24466.12">
282+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-rtm.24468.6">
283283
<Uri>https://github.com/dotnet/aspnetcore</Uri>
284-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
284+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
285285
</Dependency>
286-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24466.12">
286+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24468.6">
287287
<Uri>https://github.com/dotnet/aspnetcore</Uri>
288-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
288+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
289289
</Dependency>
290-
<Dependency Name="dotnet-dev-certs" Version="9.0.0-rtm.24466.12">
290+
<Dependency Name="dotnet-dev-certs" Version="9.0.0-rtm.24468.6">
291291
<Uri>https://github.com/dotnet/aspnetcore</Uri>
292-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
292+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
293293
</Dependency>
294-
<Dependency Name="dotnet-user-jwts" Version="9.0.0-rtm.24466.12">
294+
<Dependency Name="dotnet-user-jwts" Version="9.0.0-rtm.24468.6">
295295
<Uri>https://github.com/dotnet/aspnetcore</Uri>
296-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
296+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
297297
</Dependency>
298-
<Dependency Name="dotnet-user-secrets" Version="9.0.0-rtm.24466.12">
298+
<Dependency Name="dotnet-user-secrets" Version="9.0.0-rtm.24468.6">
299299
<Uri>https://github.com/dotnet/aspnetcore</Uri>
300-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
300+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
301301
</Dependency>
302-
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="9.0.0-rtm.24466.12">
302+
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="9.0.0-rtm.24468.6">
303303
<Uri>https://github.com/dotnet/aspnetcore</Uri>
304-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
304+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
305305
</Dependency>
306-
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="9.0.0-rtm.24466.12">
306+
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="9.0.0-rtm.24468.6">
307307
<Uri>https://github.com/dotnet/aspnetcore</Uri>
308-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
308+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
309309
</Dependency>
310-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="9.0.0-rtm.24466.12">
310+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="9.0.0-rtm.24468.6">
311311
<Uri>https://github.com/dotnet/aspnetcore</Uri>
312-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
312+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="9.0.0-rtm.24466.12">
314+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="9.0.0-rtm.24468.6">
315315
<Uri>https://github.com/dotnet/aspnetcore</Uri>
316-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
316+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
317317
</Dependency>
318318
<!-- Intermediate is necessary for source build. -->
319-
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-rtm.24466.12">
319+
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-rtm.24468.6">
320320
<Uri>https://github.com/dotnet/aspnetcore</Uri>
321-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
321+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
322322
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
323323
</Dependency>
324-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24467.4">
324+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24469.1">
325325
<Uri>https://github.com/dotnet/razor</Uri>
326-
<Sha>4b3e4096e8b7aa647340e9f1cc21720741c35f86</Sha>
326+
<Sha>c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24467.4">
328+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24469.1">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>4b3e4096e8b7aa647340e9f1cc21720741c35f86</Sha>
330+
<Sha>c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24467.4">
332+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24469.1">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334-
<Sha>4b3e4096e8b7aa647340e9f1cc21720741c35f86</Sha>
334+
<Sha>c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e</Sha>
335335
</Dependency>
336336
<!-- Intermediate is necessary for source build. -->
337-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24467.4">
337+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24469.1">
338338
<Uri>https://github.com/dotnet/razor</Uri>
339-
<Sha>4b3e4096e8b7aa647340e9f1cc21720741c35f86</Sha>
339+
<Sha>c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e</Sha>
340340
<SourceBuild RepoName="razor" ManagedOnly="true" />
341341
</Dependency>
342-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-rtm.24466.12">
342+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-rtm.24468.6">
343343
<Uri>https://github.com/dotnet/aspnetcore</Uri>
344-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
344+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
345345
</Dependency>
346-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-rtm.24466.12">
346+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="9.0.0-rtm.24468.6">
347347
<Uri>https://github.com/dotnet/aspnetcore</Uri>
348-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
348+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
349349
</Dependency>
350-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-rtm.24466.12">
350+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="9.0.0-rtm.24468.6">
351351
<Uri>https://github.com/dotnet/aspnetcore</Uri>
352-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
352+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
353353
</Dependency>
354-
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-rtm.24466.12">
354+
<Dependency Name="Microsoft.JSInterop" Version="9.0.0-rtm.24468.6">
355355
<Uri>https://github.com/dotnet/aspnetcore</Uri>
356-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
356+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
357357
</Dependency>
358358
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
359359
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -535,9 +535,9 @@
535535
<Uri>https://github.com/dotnet/runtime</Uri>
536536
<Sha>7832c5d3028cf206ab7faf4a889ee8ed34abee5c</Sha>
537537
</Dependency>
538-
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24466.12">
538+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="9.0.0-rtm.24468.6">
539539
<Uri>https://github.com/dotnet/aspnetcore</Uri>
540-
<Sha>0d72ad5e4c5b1394e9708f47ed81e9748e4fd819</Sha>
540+
<Sha>d962763e8e7d1efb409f9688d6dd7c87aab93b3d</Sha>
541541
</Dependency>
542542
<Dependency Name="Microsoft.Win32.SystemEvents" Version="9.0.0-rc.2.24466.12">
543543
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -246,25 +246,25 @@
246246
</PropertyGroup>
247247
<PropertyGroup>
248248
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
249-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRefPackageVersion>
250-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
251-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
252-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
253-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
254-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAnalyzersPackageVersion>
255-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreTestHostPackageVersion>
256-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
257-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rtm.24466.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
258-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rtm.24466.12</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
259-
<dotnetdevcertsPackageVersion>9.0.0-rtm.24466.12</dotnetdevcertsPackageVersion>
260-
<dotnetuserjwtsPackageVersion>9.0.0-rtm.24466.12</dotnetuserjwtsPackageVersion>
261-
<dotnetusersecretsPackageVersion>9.0.0-rtm.24466.12</dotnetusersecretsPackageVersion>
249+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRefPackageVersion>
250+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
251+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
252+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
253+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
254+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAnalyzersPackageVersion>
255+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreTestHostPackageVersion>
256+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
257+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rtm.24468.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
258+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rtm.24468.6</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
259+
<dotnetdevcertsPackageVersion>9.0.0-rtm.24468.6</dotnetdevcertsPackageVersion>
260+
<dotnetuserjwtsPackageVersion>9.0.0-rtm.24468.6</dotnetuserjwtsPackageVersion>
261+
<dotnetusersecretsPackageVersion>9.0.0-rtm.24468.6</dotnetusersecretsPackageVersion>
262262
</PropertyGroup>
263263
<PropertyGroup>
264264
<!-- Dependencies from https://github.com/dotnet/razor -->
265-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24467.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
266-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24467.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
267-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24467.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
265+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24469.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
266+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24469.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
267+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24469.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
268268
</PropertyGroup>
269269
<PropertyGroup>
270270
<!-- Dependencies from https://github.com/dotnet/wpf -->

‎src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ public static void Initialize()
2626
// When launching the application process dotnet-watch sets Hot Reload environment variables via CLI environment directives (dotnet [env:X=Y] run).
2727
// Currently, the CLI parser sets the env variables to the dotnet.exe process itself, rather then to the target process.
2828
// This may cause the dotnet.exe process to connect to the named pipe and break it for the target process.
29-
if (Path.ChangeExtension(processPath, ".exe") != Path.ChangeExtension(s_targetProcessPath, ".exe"))
29+
var processExe = Path.ChangeExtension(processPath, ".exe");
30+
var expectedExe = Path.ChangeExtension(s_targetProcessPath, ".exe");
31+
if (!string.Equals(processExe, expectedExe, Path.DirectorySeparatorChar == '\\' ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal))
3032
{
31-
Log($"Ignoring process '{processPath}', expecting '{s_targetProcessPath}'");
33+
Log($"Ignoring process '{processExe}', expecting '{expectedExe}'");
3234
return;
3335
}
3436

‎src/BuiltInTools/dotnet-watch/DotNetWatcher.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken)
2727

2828
var environmentBuilder = EnvironmentVariablesBuilder.FromCurrentEnvironment();
2929

30-
FileItem? changedFile = null;
30+
ChangedFile? changedFile = null;
3131
var buildEvaluator = new BuildEvaluator(Context, RootFileSetFactory);
3232
await using var browserConnector = new BrowserConnector(Context);
3333

@@ -86,17 +86,17 @@ public override async Task WatchAsync(CancellationToken cancellationToken)
8686

8787
var processTask = ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: true, processExitedSource: null, combinedCancellationSource.Token);
8888

89-
Task<FileItem?> fileSetTask;
89+
Task<ChangedFile?> fileSetTask;
9090
Task finishedTask;
9191

9292
while (true)
9393
{
9494
fileSetTask = fileSetWatcher.GetChangedFileAsync(startedWatching: null, combinedCancellationSource.Token);
9595
finishedTask = await Task.WhenAny(processTask, fileSetTask, cancelledTaskSource.Task);
9696

97-
if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result is FileItem fileItem)
97+
if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result.HasValue)
9898
{
99-
if (await staticFileHandler.HandleFileChangesAsync([fileItem], combinedCancellationSource.Token))
99+
if (await staticFileHandler.HandleFileChangesAsync([fileSetTask.Result.Value], combinedCancellationSource.Token))
100100
{
101101
// We're able to handle the file change event without doing a full-rebuild.
102102
continue;
@@ -131,7 +131,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken)
131131
Debug.Assert(finishedTask == fileSetTask);
132132
changedFile = fileSetTask.Result;
133133
Debug.Assert(changedFile != null, "ChangedFile should only be null when cancelled");
134-
Context.Reporter.Output($"File changed: {changedFile.Value.FilePath}");
134+
Context.Reporter.Output($"File changed: {changedFile.Value.Item.FilePath}");
135135
}
136136
}
137137
}

‎src/BuiltInTools/dotnet-watch/FileItem.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using Microsoft.DotNet.Watcher.Internal;
5+
46
namespace Microsoft.DotNet.Watcher
57
{
6-
internal readonly struct FileItem
8+
internal readonly record struct FileItem
79
{
810
public string FilePath { get; init; }
911

@@ -14,7 +16,7 @@ internal readonly struct FileItem
1416

1517
public string? StaticWebAssetPath { get; init; }
1618

17-
public bool IsNewFile { get; init; }
19+
public ChangeKind Change { get; init; }
1820

1921
public bool IsStaticFile => StaticWebAssetPath != null;
2022
}

‎src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ public IReadOnlyList<string> GetProcessArguments(int iteration)
4646
return [context.RootProjectOptions.Command, .. context.RootProjectOptions.CommandArguments];
4747
}
4848

49-
public async ValueTask<EvaluationResult> EvaluateAsync(FileItem? changedFile, CancellationToken cancellationToken)
49+
public async ValueTask<EvaluationResult> EvaluateAsync(ChangedFile? changedFile, CancellationToken cancellationToken)
5050
{
5151
if (context.EnvironmentOptions.SuppressMSBuildIncrementalism)
5252
{
5353
RequiresRevaluation = true;
5454
return _evaluationResult = await CreateEvaluationResult(cancellationToken);
5555
}
5656

57-
if (_evaluationResult == null || RequiresMSBuildRevaluation(changedFile))
57+
if (_evaluationResult == null || RequiresMSBuildRevaluation(changedFile?.Item))
5858
{
5959
RequiresRevaluation = true;
6060
}

0 commit comments

Comments
 (0)