Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[release/10.0.3xx] Source code updates from dotnet/sdk - #5052

#5052
Closed
dotnet-maestro[bot] wants to merge 8 commits into
release/10.0.3xxdotnet/dotnet:release/10.0.3xxfrom
darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7fdotnet/dotnet:darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7fCopy head branch name to clipboard
Closed

[release/10.0.3xx] Source code updates from dotnet/sdk#5052
dotnet-maestro[bot] wants to merge 8 commits into
release/10.0.3xxdotnet/dotnet:release/10.0.3xxfrom
darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7fdotnet/dotnet:darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7fCopy head branch name to clipboard

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Feb 24, 2026

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/sdk

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/sdk:efbdd0230b4a55ac7c45046431287a3e6c9399a3..https://github.com/dotnet/dotnet:darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7f

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team February 24, 2026 13:04
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303447 of https://github.com/dotnet/sdk/tree/b6ecfca4772c223907a0fe13b0ab944a8e197d53.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303447 with sources from b6ecfca
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303471 of https://github.com/dotnet/sdk/tree/0bc2b576d25813f4c218bd573e3f7689996d16c5.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303471 with sources from 0bc2b57
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303529 of https://github.com/dotnet/sdk/tree/64f31ca8088039aa1a8f3d3efd9e1c3176459447.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • test/dotnet-watch.Tests/dotnet-watch.Tests.csproj
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303529 with sources from 64f31ca
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303621 of https://github.com/dotnet/sdk/tree/449dad76a0830b2af60e0bf59444e1d44ea7ef16.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26127.2 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303621 with sources from 449dad7
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303633 of https://github.com/dotnet/sdk/tree/427fcd8dca20b439023f90cd96c070eab15bb2e0.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26127.2 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303633 with sources from 427fcd8
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303557 of https://github.com/dotnet/sdk/tree/722383a2b5e19596b8771457d5477e9a823a55e4.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26127.2 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303557 with sources from 722383a
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303529 of https://github.com/dotnet/sdk/tree/64f31ca8088039aa1a8f3d3efd9e1c3176459447.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26127.2 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303529 with sources from 64f31ca
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303581 of https://github.com/dotnet/sdk/tree/bdb5a2a5e22dec278a035dc1d84d1bb8a162c149.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303581 with sources from bdb5a2a
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303726 of https://github.com/dotnet/sdk/tree/916b9a76a421333b2c86ba5d99112829c8441188.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303726 with sources from 916b9a7
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303752 of https://github.com/dotnet/sdk/tree/a583f95c50123fcdef1caa78026a1fdbe522e954.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303752 with sources from a583f95
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303798 of https://github.com/dotnet/sdk/tree/e882731ed1713905b0f577277889066dd12a59c4.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303798 with sources from e882731
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 303914 of https://github.com/dotnet/sdk/tree/efbdd0230b4a55ac7c45046431287a3e6c9399a3.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • source-build.slnf
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/HotReloadClient/Utilities/VoidResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Build/ProjectNodeMap.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/CommandLine/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/BuiltInTools/dotnet-watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/None.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/HotReloadClient/Utilities/ResponseFunc.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/BlazorWebAssemblyHostedAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebApplicationAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/AppModels/WebServerAppModel.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Aspire/AspireServiceFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Browser/BrowserRefreshServerFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildNames.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/BuildReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FileItem.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/FilePathExclusions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectGraphUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Build/ProjectInstanceId.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/DotNetWatchContext.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/EnvironmentVariables.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/GlobalOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Context/ProjectOptions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/DirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/EventBasedDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/FileWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/FileWatcher/PollingDirectoryWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/CompilationHandler.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/IRuntimeProcessLauncherFactory.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/LaunchSettingsProfile.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessLaunchResult.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessRunner.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProcessSpec.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Process/WebServerProcessStateObserver.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/BuildOutput.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleInputReader.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/ConsoleReporter.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/OutputLine.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/UI/RestartPrompt.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/CommandLineUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/PathUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/ProcessUtilities.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/Watch/Utilities/Versions.cs
    🔍 View file in dotnet/sdk vs VMR
  • src/Dotnet.Watch/dotnet-watch/Watch/StaticFileHandler.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription c957270a-6a47-49bd-b82c-5fd3bed4f3ca
    This should apply the build 303914 with sources from efbdd02
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@joeloff

joeloff commented Mar 2, 2026

Copy link
Copy Markdown
Member

I'm busy running the VMR resolution commands locally to try and get this unblocked

@joeloff

joeloff commented Mar 2, 2026

Copy link
Copy Markdown
Member

VMR conflict resolution failed to run. Closing and retrying using a new PR

@joeloff joeloff closed this Mar 2, 2026
@dotnet-maestro
dotnet-maestro Bot deleted the darc-release/10.0.3xx-1ec6d8cf-6c28-408d-b985-d87ee62cbf7f branch March 2, 2026 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

Morty Proxy This is a proxified and sanitized view of the page, visit original site.