[main] Source code updates from dotnet/sdk#6389
Conversation
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Diff: https://github.com/dotnet/sdk/compare/2bbd50d58b9410d7808520fe986f79041952f04f..2bbd50d58b9410d7808520fe986f79041952f04f From: dotnet/sdk@2bbd50d To: dotnet/sdk@2bbd50d The following files had conflicts that were resolved by a user: - src/efcore/.agents/skills/ci-analysis/references/helix-artifacts.md - src/efcore/.agents/skills/ci-analysis/scripts/Get-CIStatus.ps1 - src/razor/.github/skills/ci-analysis/SKILL.md - src/razor/.github/skills/ci-analysis/references/azdo-helix-reference.md - src/razor/.github/skills/ci-analysis/references/azure-cli.md - src/razor/.github/skills/ci-analysis/references/binlog-comparison.md - src/razor/.github/skills/ci-analysis/references/build-progression-analysis.md - src/razor/.github/skills/ci-analysis/references/delegation-patterns.md - src/razor/.github/skills/ci-analysis/references/manual-investigation.md - src/razor/.github/skills/ci-analysis/references/sql-tracking.md - src/sdk/src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs - src/sdk/src/Cli/dotnet/Installer/Windows/InstallMessageBase.cs - src/sdk/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs - src/sdk/src/Cli/dotnet/Installer/Windows/InstallResponseMessage.cs - src/sdk/src/Cli/dotnet/Installer/Windows/MsiPayload.cs - src/sdk/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj # Conflicts: # src/efcore/.agents/skills/ci-analysis/references/helix-artifacts.md # src/efcore/.agents/skills/ci-analysis/scripts/Get-CIStatus.ps1 # src/razor/.github/skills/ci-analysis/SKILL.md # src/razor/.github/skills/ci-analysis/references/azdo-helix-reference.md # src/razor/.github/skills/ci-analysis/references/azure-cli.md # src/razor/.github/skills/ci-analysis/references/binlog-comparison.md # src/razor/.github/skills/ci-analysis/references/build-progression-analysis.md # src/razor/.github/skills/ci-analysis/references/delegation-patterns.md # src/razor/.github/skills/ci-analysis/references/manual-investigation.md # src/razor/.github/skills/ci-analysis/references/sql-tracking.md # src/sdk/.claude/settings.json # src/sdk/.github/copilot/settings.json # src/sdk/documentation/general/dotnet-run-file.md # src/sdk/eng/Signing.props # src/sdk/eng/Versions.props # src/sdk/eng/common/tools.ps1 # src/sdk/eng/common/tools.sh # src/sdk/src/BuiltInTools/Watch/Process/ProcessLaunchResult.cs # src/sdk/src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs # src/sdk/src/Cli/Microsoft.DotNet.FileBasedPrograms/InternalAPI.Unshipped.txt # src/sdk/src/Cli/Microsoft.TemplateEngine.Cli/JExtensions.cs # src/sdk/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliHostSearchCacheData.cs # src/sdk/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs # src/sdk/src/Cli/dotnet/Commands/CliCommandStrings.resx # src/sdk/src/Cli/dotnet/Commands/DotNetCommandFactory.cs # src/sdk/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs # src/sdk/src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommand.cs # src/sdk/src/Cli/dotnet/Commands/Run/Api/RunApiCommand.cs # src/sdk/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs # src/sdk/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf # src/sdk/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf # src/sdk/src/Cli/dotnet/Installer/Windows/InstallMessageBase.cs # src/sdk/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs # src/sdk/src/Cli/dotnet/Installer/Windows/InstallResponseMessage.cs # src/sdk/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs # src/sdk/src/Cli/dotnet/Installer/Windows/MsiPayload.cs # src/sdk/src/Cli/dotnet/ParserOptionActions.cs # src/sdk/src/Common/EnvironmentVariableNames.cs # src/sdk/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj # src/sdk/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs # src/sdk/src/Containers/packaging/build/Microsoft.NET.Build.Containers.props # src/sdk/src/Dotnet.Watch/HotReloadAgent.Host/Listener.cs # src/sdk/src/Dotnet.Watch/HotReloadAgent.Host/WebSocketTransport.cs # src/sdk/src/Dotnet.Watch/HotReloadClient/Logging/LogEvents.cs # src/sdk/src/Dotnet.Watch/HotReloadClient/Web/WebAssemblyHotReloadClient.cs # src/sdk/src/Dotnet.Watch/HotReloadClient/WebSocketClientTransport.cs # src/sdk/src/Dotnet.Watch/Watch.Aspire/Server/AspireWatcherLauncher.cs # src/sdk/src/Dotnet.Watch/Watch/AppModels/HotReloadAppModel.cs # src/sdk/src/Dotnet.Watch/Watch/Build/EvaluationResult.cs # src/sdk/src/Dotnet.Watch/Watch/Build/LoadedProjectGraph.cs # src/sdk/src/Dotnet.Watch/Watch/Build/ProjectGraphFactory.cs # src/sdk/src/Dotnet.Watch/Watch/Context/ProjectOptions.cs # src/sdk/src/Dotnet.Watch/Watch/HotReload/HotReloadDotNetWatcher.cs # src/sdk/src/Dotnet.Watch/Watch/Process/ProcessRunner.cs # src/sdk/src/Dotnet.Watch/Watch/Process/ProjectLauncher.cs # src/sdk/src/Dotnet.Watch/Watch/UI/IReporter.cs # src/sdk/src/Dotnet.Watch/Watch/UI/PhysicalConsole.cs # src/sdk/src/Dotnet.Watch/Watch/UI/TargetFrameworkSelectionPrompt.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/CommandLine/CommandLineOptions.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/CommandLine/DotnetWatchCommandDefinition.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Program.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Resources.resx # src/sdk/src/Dotnet.Watch/dotnet-watch/UI/SpectreTargetFrameworkSelectionPrompt.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Watch/BuildEvaluator.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/Watch/MsBuildFileSetFactory.cs # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.cs.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.de.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.es.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.fr.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.it.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ja.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ko.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.pl.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.pt-BR.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.ru.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.tr.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hans.xlf # src/sdk/src/Dotnet.Watch/dotnet-watch/xlf/Resources.zh-Hant.xlf # src/sdk/src/Microsoft.DotNet.ProjectTools/PublicAPI.Unshipped.txt # src/sdk/src/Microsoft.DotNet.ProjectTools/VirtualProjectBuilder.cs # src/sdk/src/Tasks/sdk-tasks/sdk-tasks.InTree.targets # src/sdk/src/TemplateEngine/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj # src/sdk/src/TemplateEngine/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj # src/sdk/src/TemplateEngine/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj # src/sdk/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/AspireLauncherTests.cs # src/sdk/test/Microsoft.TemplateEngine.Cli.UnitTests/TemplateSearchCoordinatorTests.cs # src/sdk/test/TemplateEngine/Microsoft.TemplateEngine.TestTemplates/test_templates/PostActions/Instructions/Basic/Class1.cs # src/sdk/test/TestAssets/TestPackages/TemplateEngine/test_templates/PostActions/Instructions/Basic/Class1.cs # src/sdk/test/dotnet-watch.Tests/Browser/BrowserTests.cs # src/sdk/test/dotnet-watch.Tests/Build/EvaluationTests.cs # src/sdk/test/dotnet-watch.Tests/Build/ProjectGraphFactoryTests.cs # src/sdk/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs # src/sdk/test/dotnet-watch.Tests/CommandLine/ProgramTests.GetProjectOptions.cs # src/sdk/test/dotnet-watch.Tests/HotReload/BuildProjectsTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/MauiHotReloadTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/MobileHotReloadTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/RazorHotReloadTests.cs # src/sdk/test/dotnet-watch.Tests/HotReload/SourceFileUpdateTests.HotReloadNotSupported.cs # src/sdk/test/dotnet-watch.Tests/HotReload/TargetFrameworkSelectionPromptTests.cs # src/sdk/test/dotnet-watch.Tests/TestUtilities/DotNetWatchTestBase.cs # src/sdk/test/dotnet-watch.Tests/TestUtilities/MockFileSetFactory.cs # src/sdk/test/dotnet-watch.Tests/TestUtilities/TestOptions.cs # src/sdk/test/dotnet-watch.Tests/Watch/FileUpdateTests.cs # src/sdk/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTestBase.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_BuildCommands.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_BuildOptions.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_CscOnlyAndApi.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_Directives.cs # src/sdk/test/dotnet.Tests/CommandTests/Run/RunFileTests_General.cs # src/source-manifest.json
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
Resolve unmerged conflict in InstallRequestMessage.cs and MsiPayload.cs by keeping both System.Diagnostics.CodeAnalysis (needed for UnconditionalSuppressMessage attributes) and System.Text.Json (the actual serialization library), dropping the obsolete Newtonsoft.Json using directive. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Note PRs from original repository included in this codeflow update: 💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
|
Note This retry was triggered by Copilot based on CI analysis. The F# /azp run |
|
Note PRs from original repository included in this codeflow update:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
ViktorHofer
left a comment
There was a problem hiding this comment.
Changes under src/efcore and src/razor
|
The removal of a few skills is hardly going to break anything when it flows back, but seems very surprising that an sdk update could modify other products. Are we sure this isn't a sign of a questionable flow? |
|
I think it was user error. Just undid the efcore/razor changes to unblock this PR |
Note that I ran the vmr resolve command and then asked copilot to fix the merge conflicts. Not sure why copilot would have done that as part of resolving the merge conflicts. |
16463c0 to
f3455fe
Compare
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