Repository navigation
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. |
|
Important
💡 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. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
|
FYI @wtgodbe this needs conflict resolution |
|
@mthalman PTAL - I resolved in favor of dotnet/source-build-assets#1767 (kept |
#791) Updated [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/dotnet) from 10.0.11 to 10.0.12. <details> <summary>Release notes</summary> _Sourced from [Microsoft.Extensions.Logging.Abstractions's releases](https://github.com/dotnet/dotnet/releases)._ ## 10.0.12 [Release](https://github.com/dotnet/core/releases/tag/v10.0.12) ## What's Changed * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8011 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8037 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8038 * Update Source-Build SDK Diff Tests Baselines and Exclusions by @dotnet-sb-bot in dotnet/dotnet#7754 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8101 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8104 * [release/10.0.4xx] Source code updates from dotnet/msbuild by @dotnet-maestro[bot] in dotnet/dotnet#8142 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8132 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8127 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8156 * [release/10.0.4xx] Source code updates from dotnet/roslyn by @dotnet-maestro[bot] in dotnet/dotnet#8148 * [release/10.0.4xx] Source code updates from dotnet/sdk by @dotnet-maestro[bot] in dotnet/dotnet#8176 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8171 * [release/10.0.4xx] Source code updates from dotnet/scenario-tests by @dotnet-maestro[bot] in dotnet/dotnet#8092 * [release/10.0.4xx] Fix IdentityModel shared-components source build by @mthalman in dotnet/dotnet#8189 * [release/10.0.4xx] Source code updates from nuget/nuget.client by @dotnet-maestro[bot] in dotnet/dotnet#8201 * [release/10.0.4xx] Allow submodule changes when reseting submodules by @github-actions[bot] in dotnet/dotnet#8223 * [release/10.0.4xx] Source code updates from dotnet/roslyn by @dotnet-maestro[bot] in dotnet/dotnet#8215 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8210 * [release/10.0.4xx] Cloak SignatureCycle2 binary from VMR by @mthalman in dotnet/dotnet#8226 * [release/10.0.4xx] Ignore spurious SBoM warnings by @akoeplinger in dotnet/dotnet#8165 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8231 * Update to the 10.0.11 August runtimes from build 324376 by @mthalman in dotnet/dotnet#8259 * Merging internal commits for release/10.0.4xx by @dotnet-bot in dotnet/dotnet#8242 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8278 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8304 * [release/10.0.4xx] Source code updates from dotnet/roslyn by @dotnet-maestro[bot] in dotnet/dotnet#8347 * [release/10.0.4xx] Remove duplicate dependency from scenario-tests by @dkurepa in dotnet/dotnet#8350 * [release/10.0.4xx] Source code updates from dotnet/sourcelink by @dotnet-maestro[bot] in dotnet/dotnet#8344 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8354 * [release/10.0.4xx] Fix SignCheckExclusionsFile.txt to allow signed hotreload .js file by @github-actions[bot] in dotnet/dotnet#8383 * [release/10.0.4xx] Remove TSA bug filing from pipelines by @akoeplinger in dotnet/dotnet#8389 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8396 * [release/10.0.4xx] [release/10.0.1xx] Update binskim lastModifiedDate in PipelineAutobaseliningConfig.yml by @github-actions[bot] in dotnet/dotnet#8408 * [release/10.0.4xx] Fix SignCheckExclusionsFile.txt for .js in source-build artifacts by @github-actions[bot] in dotnet/dotnet#8405 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8419 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8422 * [release/10.0.4xx] Source code updates from dotnet/msbuild by @dotnet-maestro[bot] in dotnet/dotnet#8429 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8313 * [release/10.0.4xx] Source code updates from dotnet/templating by @dotnet-maestro[bot] in dotnet/dotnet#8452 * [release/10.0.4xx] Source code updates from dotnet/source-build-assets by @dotnet-maestro[bot] in dotnet/dotnet#8453 * [release/10.0.4xx] Source code updates from dotnet/msbuild by @dotnet-maestro[bot] in dotnet/dotnet#8469 * [release/10.0.4xx] Source code updates from dotnet/fsharp by @dotnet-maestro[bot] in dotnet/dotnet#8521 * [release/10.0.4xx] Source code updates from dotnet/arcade by @dotnet-maestro[bot] in dotnet/dotnet#8574 * [release/10.0.4xx] Bump patch version to 10.0.401 by @vseanreesermsft in dotnet/dotnet#8577 ... (truncated) Commits viewable in [compare view](https://github.com/dotnet/dotnet/commits/v10.0.401). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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/source-build-assets
Diff the source with this PR branch