Prevent warning for implicit ILCompiler reference #79240
Conversation
ghost
added
the
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas Issue DetailsFixes dotnet/sdk#28823.
|
|
We only want to produce this on TFM mismatches, right? So users can get patches? |
|
I thought about it some and I think we should be encouraging people to set |
|
@mangod9 how do we typically deliver patch updates to crossgen when customers hit bugs? Do we tell customers to set |
|
If the fix has been released, we tell people to update the SDK that is going to update the runtime too. If we want people to try daily build before the fix is released, https://github.com/dotnet/runtime/blob/main/docs/project/dogfooding.md#advanced-scenario---using-a-daily-build-of-microsoftnetcoreapp has the instructions. These instructions apply to any runtime fix, they are not crossgen specific. |
|
That’s a good point, I forgot we could recommend using nighties. I’m fine with that approach instead. |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3745285250 |
|
@sbomer backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Prevent warning for implicit ILCompiler reference
Using index info to reconstruct a base tree...
M src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
CONFLICT (content): Merge conflict in src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Prevent warning for implicit ILCompiler reference
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@sbomer an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
4 participants
Fixes dotnet/sdk#28823.