Clean up AOT publish process - #73416

Merged

LakshanF merged 29 commits into

dotnet:mainfrom

LakshanF:CleanPublishAot

Aug 15, 2022

LakshanF commented Aug 4, 2022

Contributor

Fixes#72415, the plan is in the comments.

Clean up AOT publish process

b9d18e1

LakshanF requested review from MichalStrehovsky and sbomer

August 4, 2022 23:31

ghost added the area-NativeAOT-coreclr label

ghost assigned LakshanF

sbomer reviewed

View reviewed changes

sbomer left a comment

Member

Nice! I noticed one thing I missed in #72346 - I think file Microsoft.DotNet.ILCompiler.targets should be renamed to not match the package name. Otherwise with a packagereference, those targets will be imported twice, once via nuget, and once by the SDK.

On the SDK side, I think the PublishAot condition should also be removed here: https://github.com/dotnet/sdk/blob/e8dc19097ac6b20ba1c8fc87500251e815e5e984/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets#L1166

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets Outdated

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets Outdated

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets Outdated

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets Outdated

LakshanFand others added 3 commits

August 5, 2022 05:46

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…

62a302a

…iler.targets
Co-authored-by: Sven Boemer <sbomer@gmail.com>

Update src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILComp…

b5f37f0

…iler.targets
Co-authored-by: Sven Boemer <sbomer@gmail.com>

Merge branch 'main' ofhttps://github.com/dotnet/runtimeinto CleanPu…

3b86b66

…blishAot

This was referenced Aug 5, 2022

Infra improvements for Helix #68176

Closed

GC/API/GC/GetGCMemoryInfo/GetGCMemoryInfo.sh test failing intermittently on CoreCLR Linux ARM32 #73247

Closed

sbomer reviewed

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.targets Outdated

LakshanF added 2 commits

August 7, 2022 10:41

FB and working around running native aot tests

e992c9b

update crossgen2 reference

dcf710c

LakshanF commented Aug 8, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 8, 2022

Azure Pipelines successfully started running 1 pipeline(s).

runfoappBot mentioned this pull request

DataContractSerializerTests.DCS_MyPersonSurrogate_Stress fails in CI #73405

Closed

moving package version change out of a target as per FB

da529fd

LakshanF commented Aug 8, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 8, 2022

Azure Pipelines successfully started running 1 pipeline(s).

Fix nativeaot test take 2

3cb58e6

LakshanF commented Aug 9, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 9, 2022

Azure Pipelines successfully started running 1 pipeline(s).

disabling a failing test

5696f2d

LakshanF commented Aug 10, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 10, 2022

Azure Pipelines successfully started running 1 pipeline(s).

LakshanF requested review from lewing, pavelsavara, radical and thaystg as code owners

August 10, 2022 19:00

azure-pipelinesBot commented Aug 11, 2022

Azure Pipelines successfully started running 1 pipeline(s).

LakshanF commented Aug 12, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 12, 2022

Azure Pipelines successfully started running 1 pipeline(s).

LakshanF added 2 commits

August 12, 2022 11:36

update the version check for package

80faf94

Cross target support, requires changes from SDK

141c61f

LakshanF commented Aug 14, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 14, 2022

Azure Pipelines successfully started running 1 pipeline(s).

karelz mentioned this pull request

mono minijit runtime tests failing with coreclr_initialize failed - Error: 0x80004005#72114

Closed

LakshanF mentioned this pull request

[NativeAOT] Clean up AOT Publishing #72415

Closed

LakshanF added 2 commits

August 15, 2022 07:50

Change ResolvedTargetILCompilerPack to match SDK changes

de74e2b

Merge branch 'main' into CleanPublishAot

3d48f00

LakshanF commented Aug 15, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 15, 2022

Azure Pipelines successfully started running 1 pipeline(s).

sbomer approved these changes

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets Outdated

FB

62ce9bd

LakshanF commented Aug 15, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 15, 2022

Azure Pipelines successfully started running 1 pipeline(s).

Trigger Build to fix interop break

ff574f8

LakshanF commented Aug 15, 2022

ContributorAuthor

/azp run runtime-extra-platforms

azure-pipelinesBot commented Aug 15, 2022

Azure Pipelines successfully started running 1 pipeline(s).

LakshanF merged commit 06339dc into dotnet:main

LakshanF deleted the CleanPublishAot branch

August 15, 2022 21:54

LakshanF mentioned this pull request

Cross-Architecture publish user experience should be better #71395

Closed

runfoappBot mentioned this pull request

Long Running Test: Interop/MonoAPI/MonoMono/PInvokeDetach/PInvokeDetach.sh #73040

Closed

lewing mentioned this pull request

[main] Update dependencies from dotnet/runtime dotnet/sdk#27149

Merged

lewing added a commit that referenced this pull request

Revert "Clean up AOT publish process (#73416)"

0e205a8

This reverts commit 06339dc.

lewing mentioned this pull request

Revert "Clean up AOT publish process" #74036

Closed

github-actionsBot pushed a commit that referenced this pull request

Revert "Clean up AOT publish process (#73416)"

f292130

This reverts commit 06339dc.

MichalStrehovsky reviewed

View reviewed changes

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.props

  <PropertyGroup>
+ <!-- Set the publishAot property to true if not set-->
+ <PublishAot Condition="'$(PublishAot)' == ''">true</PublishAot>

MichalStrehovskyAug 17, 2022

Member

If I understand it correctly, this was needed because we do the ".targets included from a .props file" antipattern - I think we discussed this in one of the past pull request - to do the real fix, we likely need to break up Microsoft.DotNet.ILCompiler.targets into Microsoft.DotNet.ILCompiler.targets and Microsoft.DotNet.ILCompiler.props as needed.

(The convention is that .props are included before the user project, .targets get included after the user provided stuff - we would see PublishAot being set there if the user wants it.)

MichalStrehovskyAug 17, 2022

Member

Most of the stuff that is already in .targets should be in .targets. We wouldn't probably have much (if anything?) in the props.

sbomerAug 17, 2022

Member

I don't think it's because we are importing targets from props (if we are, that should probably be fixed) - this was needed to preserve the OOB package behavior where the packagereference was all that was needed to turn on AOT publish (you didn't need to set PublishAot explicitly).

MichalStrehovskyAug 17, 2022

Member

Ah, you're right. I saw .targets in a .props and I thought it's an Import, but it's just storing it in a property for later.

ghost locked as resolved and limited conversation to collaborators

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.