[release/10.0.1xx] Cloak and condition the obfuscated test binaries#4631
Merged
NikolaMilosavljevic merged 1 commit intorelease/10.0.1xxfrom Feb 3, 2026
Merged
Conversation
NikolaMilosavljevic
approved these changes
Feb 3, 2026
Member
|
/backport to release/10.0.2xx |
Contributor
Author
|
Started backporting to |
Member
|
/backport to release/10.0.3xx |
Contributor
Author
|
Started backporting to |
Contributor
Author
|
@ellahathaway backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Cloak and condition the obfuscated test binaries
Using index info to reconstruct a base tree...
A src/roslyn/src/Compilers/Test/Resources/Core/MetadataTests/Invalid/Obfuscated.dll
A src/roslyn/src/Compilers/Test/Resources/Core/MetadataTests/Invalid/Obfuscated2.dll
M src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
M src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
M src/source-mappings.json
Falling back to patching base and 3-way merge...
Auto-merging src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
CONFLICT (content): Merge conflict in src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
Auto-merging src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
CONFLICT (content): Merge conflict in src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
Auto-merging src/source-mappings.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 set advice.mergeConflict false"
Patch failed at 0001 Cloak and condition the obfuscated test binaries
Error: The process '/usr/bin/git' failed with exit code 128 |
Contributor
Author
|
@ellahathaway backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Cloak and condition the obfuscated test binaries
Using index info to reconstruct a base tree...
A src/roslyn/src/Compilers/Test/Resources/Core/MetadataTests/Invalid/Obfuscated.dll
A src/roslyn/src/Compilers/Test/Resources/Core/MetadataTests/Invalid/Obfuscated2.dll
M src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
M src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
M src/source-mappings.json
Falling back to patching base and 3-way merge...
Auto-merging src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
CONFLICT (content): Merge conflict in src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
Auto-merging src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
CONFLICT (content): Merge conflict in src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
Auto-merging src/source-mappings.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 set advice.mergeConflict false"
Patch failed at 0001 Cloak and condition the obfuscated test binaries
Error: The process '/usr/bin/git' failed with exit code 128 |
ellahathaway
pushed a commit
to ellahathaway/dotnet
that referenced
this pull request
Feb 26, 2026
…otnet#4631) Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
ellahathaway
pushed a commit
to ellahathaway/dotnet
that referenced
this pull request
Feb 26, 2026
…otnet#4631) Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
github-actions bot
added a commit
that referenced
this pull request
Feb 27, 2026
…4631) Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #4603 to release/10.0.1xx
/cc @NikolaMilosavljevic