Skip to content

Commit a128f10

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 46859: [internal/release/9.0.2xx] Merge from public
Merge from public release/9.0.2xx to internal/release/9.0.2xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code addition for framework package definitions. #### PR Summary This pull request adds a new file to define framework packages for .NETCoreApp, Version 2.0. - Added `src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs` to define and register framework packages for .NETCoreApp v2.0.
2 parents bc150b0 + 7b29532 commit a128f10

File tree

59 files changed

+2387
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2387
-151
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-runtime -->
2424
<!-- Begin: Package sources from dotnet-templating -->
25-
<add key="darc-pub-dotnet-templating-aaebde7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-aaebde79/nuget/v3/index.json" />
25+
<add key="darc-pub-dotnet-templating-abf3646" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-abf36462/nuget/v3/index.json" />
2626
<!-- End: Package sources from dotnet-templating -->
2727
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2828
<add key="darc-int-dotnet-windowsdesktop-f971ec2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f971ec24/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.200">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>aaebde792d2641f49f42e5acc2f92cbac49d2cbc</Sha>
6+
<Sha>abf364627d0c5325b3e4b1f300ab84c39c68dac7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.200-rtm.25062.7">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.200-rtm.25066.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>aaebde792d2641f49f42e5acc2f92cbac49d2cbc</Sha>
10+
<Sha>abf364627d0c5325b3e4b1f300ab84c39c68dac7</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.200-rtm.25062.7">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.200-rtm.25066.4">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>aaebde792d2641f49f42e5acc2f92cbac49d2cbc</Sha>
15+
<Sha>abf364627d0c5325b3e4b1f300ab84c39c68dac7</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25058.5">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
560+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25058.5">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25065.2">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
564+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25058.5">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
568+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25058.5">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25065.2">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
572+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25058.5">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25065.2">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
576+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25058.5">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25065.2">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
580+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25058.5">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25065.2">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
585+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.2">

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
1616
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
1717
<!-- Enable to remove prerelease label. -->
18-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
18+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1919
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2020
<!-- Calculate prerelease label -->
2121
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
@@ -34,7 +34,7 @@
3434
<VersionFeature50>17</VersionFeature50>
3535
<VersionFeature60>36</VersionFeature60>
3636
<VersionFeature70>20</VersionFeature70>
37-
<VersionFeature80>11</VersionFeature80>
37+
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature80>
3838
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
3939
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4040
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -191,7 +191,7 @@
191191
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
192192
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
193193
<!-- test dependencies -->
194-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.200-rtm.25062.7</MicrosoftTemplateEngineMocksPackageVersion>
194+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.200-rtm.25066.4</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -268,10 +268,10 @@
268268
</PropertyGroup>
269269
<PropertyGroup>
270270
<!-- Dependencies from https://github.com/dotnet/arcade -->
271-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25058.5</MicrosoftDotNetSignToolVersion>
273-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25058.5</MicrosoftDotNetXliffTasksVersion>
274-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25058.5</MicrosoftDotNetXUnitExtensionsVersion>
271+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25065.2</MicrosoftDotNetSignToolVersion>
273+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25065.2</MicrosoftDotNetXliffTasksVersion>
274+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25065.2</MicrosoftDotNetXUnitExtensionsVersion>
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/template-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
5858
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
5959

60-
# Development notes
60+
## Development notes
6161

6262
**Folder / file structure**
6363

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100",
3+
"dotnet": "9.0.102",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ internal enum TestFlags
2727
internal sealed record EnvironmentOptions(
2828
string WorkingDirectory,
2929
string MuxerPath,
30+
TimeSpan ProcessCleanupTimeout,
3031
bool IsPollingEnabled = false,
3132
bool SuppressHandlingStaticContentFiles = false,
3233
bool SuppressMSBuildIncrementalism = false,
@@ -40,6 +41,7 @@ internal sealed record EnvironmentOptions(
4041
(
4142
WorkingDirectory: Directory.GetCurrentDirectory(),
4243
MuxerPath: GetMuxerPathFromEnvironment(),
44+
ProcessCleanupTimeout: EnvironmentVariables.ProcessCleanupTimeout,
4345
IsPollingEnabled: EnvironmentVariables.IsPollingEnabled,
4446
SuppressHandlingStaticContentFiles: EnvironmentVariables.SuppressHandlingStaticContentFiles,
4547
SuppressMSBuildIncrementalism: EnvironmentVariables.SuppressMSBuildIncrementalism,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public static partial class Names
2222
public static bool IsPollingEnabled => ReadBool("DOTNET_USE_POLLING_FILE_WATCHER");
2323
public static bool SuppressEmojis => ReadBool("DOTNET_WATCH_SUPPRESS_EMOJIS");
2424
public static bool RestartOnRudeEdit => ReadBool("DOTNET_WATCH_RESTART_ON_RUDE_EDIT");
25+
public static TimeSpan ProcessCleanupTimeout => ReadTimeSpan("DOTNET_WATCH_PROCESS_CLEANUP_TIMEOUT_MS");
2526

2627
public static string SdkRootDirectory =>
2728
#if DEBUG
@@ -43,4 +44,7 @@ public static partial class Names
4344

4445
private static bool ReadBool(string variableName)
4546
=> Environment.GetEnvironmentVariable(variableName) is var value && (value == "1" || bool.TryParse(value, out var boolValue) && boolValue);
47+
48+
private static TimeSpan ReadTimeSpan(string variableName)
49+
=> Environment.GetEnvironmentVariable(variableName) is var value && long.TryParse(value, out var intValue) && intValue >= 0 ? TimeSpan.FromMilliseconds(intValue) : TimeSpan.FromSeconds(5);
4650
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Watch
1515
internal sealed class CompilationHandler : IDisposable
1616
{
1717
public readonly IncrementalMSBuildWorkspace Workspace;
18+
public readonly EnvironmentOptions EnvironmentOptions;
1819

1920
private readonly IReporter _reporter;
2021
private readonly WatchHotReloadService _hotReloadService;
@@ -43,13 +44,17 @@ internal sealed class CompilationHandler : IDisposable
4344
/// </summary>
4445
private ImmutableArray<string> _currentAggregateCapabilities;
4546

47+
private readonly CancellationToken _shutdownCancellationToken;
48+
4649
private bool _isDisposed;
4750

48-
public CompilationHandler(IReporter reporter)
51+
public CompilationHandler(IReporter reporter, EnvironmentOptions environmentOptions, CancellationToken shutdownCancellationToken)
4952
{
5053
_reporter = reporter;
54+
EnvironmentOptions = environmentOptions;
5155
Workspace = new IncrementalMSBuildWorkspace(reporter);
5256
_hotReloadService = new WatchHotReloadService(Workspace.CurrentSolution.Services, GetAggregateCapabilitiesAsync);
57+
_shutdownCancellationToken = shutdownCancellationToken;
5358
}
5459

5560
public void Dispose()
@@ -154,6 +159,7 @@ private static DeltaApplier CreateDeltaApplier(HotReloadProfile profile, Project
154159
var runningProject = new RunningProject(
155160
projectNode,
156161
projectOptions,
162+
EnvironmentOptions,
157163
deltaApplier,
158164
processReporter,
159165
browserRefreshServer,
@@ -542,16 +548,10 @@ private void UpdateRunningProjects(Func<ImmutableDictionary<string, ImmutableArr
542548
}
543549
}
544550

545-
private static async ValueTask<IReadOnlyList<int>> TerminateRunningProjects(IEnumerable<RunningProject> projects, CancellationToken cancellationToken)
551+
private async ValueTask<IReadOnlyList<int>> TerminateRunningProjects(IEnumerable<RunningProject> projects, CancellationToken cancellationToken)
546552
{
547-
// cancel first, this will cause the process tasks to complete:
548-
foreach (var project in projects)
549-
{
550-
project.ProcessTerminationSource.Cancel();
551-
}
552-
553553
// wait for all tasks to complete:
554-
return await Task.WhenAll(projects.Select(p => p.RunningProcess)).WaitAsync(cancellationToken);
554+
return await Task.WhenAll(projects.Select(p => p.TerminateAsync(_shutdownCancellationToken).AsTask())).WaitAsync(cancellationToken);
555555
}
556556

557557
private static Task ForEachProjectAsync(ImmutableDictionary<string, ImmutableArray<RunningProject>> projects, Func<RunningProject, CancellationToken, Task> action, CancellationToken cancellationToken)

‎src/BuiltInTools/dotnet-watch/HotReload/RunningProject.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Watch
1212
internal sealed class RunningProject(
1313
ProjectGraphNode projectNode,
1414
ProjectOptions options,
15+
EnvironmentOptions environmentOptions,
1516
DeltaApplier deltaApplier,
1617
IReporter reporter,
1718
BrowserRefreshServer? browserRefreshServer,
@@ -68,5 +69,24 @@ public async ValueTask WaitForProcessRunningAsync(CancellationToken cancellation
6869
{
6970
await DeltaApplier.WaitForProcessRunningAsync(cancellationToken);
7071
}
72+
73+
public async ValueTask<int> TerminateAsync(CancellationToken shutdownCancellationToken)
74+
{
75+
if (shutdownCancellationToken.IsCancellationRequested)
76+
{
77+
// Ctrl+C sent, wait for the process to exit
78+
try
79+
{
80+
_ = await RunningProcess.WaitAsync(environmentOptions.ProcessCleanupTimeout, CancellationToken.None);
81+
}
82+
catch (TimeoutException)
83+
{
84+
// nop
85+
}
86+
}
87+
88+
ProcessTerminationSource.Cancel();
89+
return await RunningProcess;
90+
}
7191
}
7292
}

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

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke
7272
var waitForFileChangeBeforeRestarting = true;
7373
EvaluationResult? evaluationResult = null;
7474
RunningProject? rootRunningProject = null;
75-
Task<ImmutableList<ChangedFile>>? fileWatcherTask = null;
7675
IRuntimeProcessLauncher? runtimeProcessLauncher = null;
7776
CompilationHandler? compilationHandler = null;
7877
Action<ChangedPath>? fileChangedCallback = null;
@@ -101,7 +100,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke
101100

102101
await using var browserConnector = new BrowserConnector(Context);
103102
var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, Context.Reporter);
104-
compilationHandler = new CompilationHandler(Context.Reporter);
103+
compilationHandler = new CompilationHandler(Context.Reporter, Context.EnvironmentOptions, shutdownCancellationToken);
105104
var staticFileHandler = new StaticFileHandler(Context.Reporter, projectMap, browserConnector);
106105
var scopedCssFileHandler = new ScopedCssFileHandler(Context.Reporter, projectMap, browserConnector);
107106
var projectLauncher = new ProjectLauncher(Context, projectMap, browserConnector, compilationHandler, iteration);
@@ -517,38 +516,24 @@ async Task<ImmutableList<ChangedFile>> CaptureChangedFilesSnapshot(ImmutableDict
517516
await compilationHandler.TerminateNonRootProcessesAndDispose(CancellationToken.None);
518517
}
519518

520-
if (!rootProcessTerminationSource.IsCancellationRequested)
519+
if (rootRunningProject != null)
521520
{
522-
rootProcessTerminationSource.Cancel();
521+
await rootRunningProject.TerminateAsync(shutdownCancellationToken);
523522
}
524523

525-
try
526-
{
527-
// Wait for the root process to exit.
528-
await Task.WhenAll(new[] { (Task?)rootRunningProject?.RunningProcess, fileWatcherTask }.Where(t => t != null)!);
529-
}
530-
catch (OperationCanceledException) when (!shutdownCancellationToken.IsCancellationRequested)
524+
if (runtimeProcessLauncher != null)
531525
{
532-
// nop
526+
await runtimeProcessLauncher.DisposeAsync();
533527
}
534-
finally
535-
{
536-
fileWatcherTask = null;
537528

538-
if (runtimeProcessLauncher != null)
539-
{
540-
await runtimeProcessLauncher.DisposeAsync();
541-
}
542-
543-
rootRunningProject?.Dispose();
529+
rootRunningProject?.Dispose();
544530

545-
if (waitForFileChangeBeforeRestarting &&
546-
!shutdownCancellationToken.IsCancellationRequested &&
547-
!forceRestartCancellationSource.IsCancellationRequested)
548-
{
549-
using var shutdownOrForcedRestartSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownCancellationToken, forceRestartCancellationSource.Token);
550-
await WaitForFileChangeBeforeRestarting(fileWatcher, evaluationResult, shutdownOrForcedRestartSource.Token);
551-
}
531+
if (waitForFileChangeBeforeRestarting &&
532+
!shutdownCancellationToken.IsCancellationRequested &&
533+
!forceRestartCancellationSource.IsCancellationRequested)
534+
{
535+
using var shutdownOrForcedRestartSource = CancellationTokenSource.CreateLinkedTokenSource(shutdownCancellationToken, forceRestartCancellationSource.Token);
536+
await WaitForFileChangeBeforeRestarting(fileWatcher, evaluationResult, shutdownOrForcedRestartSource.Token);
552537
}
553538
}
554539
}

0 commit comments

Comments
 (0)