Fix assembly version diff test for missing file #44156
Conversation
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/sdk/actions/runs/11441220450 |
|
@mthalman an error occurred while backporting to release/9.0, please check the run log for details! Error: The specified backport target branch release/9.0 wasn't found in the repo. |
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/sdk/actions/runs/11441230615 |
|
/backport to release/9.0.1xx |
|
/backport to release/8.0.1xx |
|
Started backporting to release/9.0.1xx: https://github.com/dotnet/sdk/actions/runs/11441234346 |
|
@mthalman an error occurred while backporting to release/8.0, please check the run log for details! Error: The specified backport target branch release/8.0 wasn't found in the repo. |
|
Started backporting to release/8.0.1xx: https://github.com/dotnet/sdk/actions/runs/11441236828 |
|
@mthalman backporting to release/8.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix assembly version diff test for missing file
Using index info to reconstruct a base tree...
A src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs deleted in HEAD and modified in Fix assembly version diff test for missing file. Version Fix assembly version diff test for missing file of src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs left in tree.
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 Fix assembly version diff test for missing file
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@mthalman an error occurred while backporting to release/8.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Fixes dotnet/source-build#4668
The source build assembly version diff test doesn't handle cases where the source built SDK contains files that do not exist in the Microsoft-built SDK. Some recent changes came in where this file diff was baselined (#43964). Two of the example files in this case are
./sdk/x.y.z/Microsoft.Bcl.AsyncInterfaces.dlland./sdk/x.y.z/Microsoft.Bcl.Cryptography.dll.The logic in the test will see that these files exist in the source built SDK and then try to find the matching file in the Microsoft SDK. When it can't find it, it causes an error. The
Assertthat is causing the error should be replaced with just a message that the file was not found. The rest of the logic gracefully handles it when no matching file exists.