Work around d3d redist incompat. #9681
Conversation
Works around dotnet#9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
dotnet-policy-service
bot
requested review from
dipeshmsft and
singhashish-wpf
dotnet-policy-service
bot
added
the
PR
Works around dotnet#9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/wpf/actions/runs/10714354131 |
|
@Kuldeep-MS an error occurred while backporting to release/9.0, please check the run log for details! Error: @Kuldeep-MS is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=Kuldeep-MS |
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/wpf/actions/runs/10714368827 |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/wpf/actions/runs/10820168379 |
|
/backport to release/8.0 |
|
@Kuldeep-MS backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Work around d3d redist incompat. Works around https://github.com/dotnet/wpf/issues/9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
Using index info to reconstruct a base tree...
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Work around d3d redist incompat. Works around https://github.com/dotnet/wpf/issues/9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@Kuldeep-MS an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
Started backporting to release/8.0: https://github.com/dotnet/wpf/actions/runs/10820172202 |
|
@Kuldeep-MS backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Work around d3d redist incompat. Works around https://github.com/dotnet/wpf/issues/9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
Using index info to reconstruct a base tree...
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Work around d3d redist incompat. Works around https://github.com/dotnet/wpf/issues/9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@Kuldeep-MS an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
When the d3d fix is available and rolled out in the windows SDK (on 1ES hosted pool machines), this fix should be reverted. |
3 participants
Works around #9670. An updated redist came in from a recent update. The old redist has been uploaded to netcorenativeassets, and we use that rather than the Windows SDK path to resolve the file paths.
Microsoft Reviewers: Open in CodeFlow