Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ILCompiler package reference #107583

Merged
merged 6 commits into from
Sep 12, 2024
Merged

Conversation

agocke
Copy link
Member

@agocke agocke commented Sep 9, 2024

It doesn't look like we need the newest version of the package anymore. This configuration (using the package instead of the SDK version) can be dangerous because it causes a split between the version built against vs. the version AOT'd against.

It doesn't look like we need the newest version of the package
anymore. This configuration (using the package instead of the SDK version)
can be dangerous because it causes a split between the version built
against vs. the version AOT'd against.
@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Sep 9, 2024
Copy link
Member

@sbomer sbomer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@teo-tsirpanis teo-tsirpanis added area-Infrastructure-coreclr and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Sep 9, 2024
Copy link
Contributor

Tagging subscribers to this area: @hoyosjs
See info in area-owners.md if you want to be subscribed.

@MichalStrehovsky
Copy link
Member

Fixes #106740?

@@ -18,11 +18,6 @@
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
</PropertyGroup>

<ItemGroup Condition="'$(UseNativeAotForComponents)' == 'true'">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may want to keep this around and condition it on MicrosoftDotNetILCompilerVersion being set. It is likely that we will need to take newer ILC that what's in SDK at some point in future again to take a critical fix temporarily.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(We are on similar plan with Roslyn: We use Roslyn from SDK in steady state, but we may use a newer one temporarily.)

@jkotas
Copy link
Member

jkotas commented Sep 10, 2024

Is this going to expose us to #105441 in more places until we update the SDK to RC1? (We should not block this PR on this - just making sure that it does not come as a surprise.)

eng/Versions.props Outdated Show resolved Hide resolved
agocke and others added 2 commits September 11, 2024 15:31
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
@MichalStrehovsky
Copy link
Member

Is this going to expose us to #105441 in more places until we update the SDK to RC1? (We should not block this PR on this - just making sure that it does not come as a surprise.)

I have update to RC1 lined up at #107673 so that should mitigate the issue if we can merge it shortly after this one.

@agocke agocke merged commit d62199d into dotnet:main Sep 12, 2024
155 of 158 checks passed
@agocke agocke deleted the remove-ilcompiler-package branch September 12, 2024 15:54
@agocke
Copy link
Member Author

agocke commented Sep 12, 2024

/backport to release/9.0

I think this puts us in a better place for servicing than where we currently are

Copy link
Contributor

Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10836223086

Copy link
Contributor

@agocke backporting to release/9.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Remove ILCompiler package reference
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
Applying: Respond to PR comments
Applying: Move ILCompiler overrides to the top level in liveBuilds
Applying: Update eng/Versions.props
error: sha1 information is lacking or useless (eng/Versions.props).
error: could not build fake ancestor
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 0004 Update eng/Versions.props
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@agocke an error occurred while backporting to release/9.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

jtschuster pushed a commit to jtschuster/runtime that referenced this pull request Sep 17, 2024
It doesn't look like we need the newest version of the package
anymore. This configuration (using the package instead of the SDK version)
can be dangerous because it causes a split between the version built
against vs. the version AOT'd against.
sirntar pushed a commit to sirntar/runtime that referenced this pull request Sep 30, 2024
It doesn't look like we need the newest version of the package
anymore. This configuration (using the package instead of the SDK version)
can be dangerous because it causes a split between the version built
against vs. the version AOT'd against.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants