Run ILC after ComputeResolvedFilesToPublishList #111514
Open
+38
−48
Conversation
This file contains 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
|
Did you consider using the scheme that ILLink/R2R/SingleFile use right now? It feels like it would make the sequencing most "standard". We'd probably need to wait for the new SDK to flow to this repo but we just did an upgrade and we could do another one. |
|
This moves us in that direction - now this target will be sequenced appropriately - and we can change from AfterTargets to DependsOnTargets in a later change. I'm looking at the native aot targets all-up to see if there's other logic that needs cleanup, but wanted to start with this piece. |
agocke
reviewed
Jan 17, 2025
| --> | ||
| <Target Name="ComputeLinkedFilesToPublish" | ||
| BeforeTargets="ComputeResolvedFilesToPublishList" | ||
| AfterTargets="ComputeResolvedFilesToPublishList" |
| @@ -92,40 +118,4 @@ | |||
|
|
|||
| </Target> | |||
|
|
|||
| <Target Name="CopyNativeBinary" AfterTargets="Publish"> | |||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(CopyOutputSymbolsToPublishDirectory)' == 'true'"> | ||
| <_symbolRecursivePath Include="$(NativeOutputPath)$(TargetName)$(_symbolExt)/**/*" /> |
There was a problem hiding this comment.
I think it may be possible to simplify this -- I'll have to refresh my MSbuild knowledge to remember if it's easy to just track everything in a subdir.
agocke
approved these changes
Jan 17, 2025
am11
reviewed
Jan 17, 2025
Comment on lines
+49
to
+58
| Condition="'$(_symbolIsFile)' == 'true' and Exists('$(_symbolSourcePath)')"> | ||
| <RelativePath>$(TargetName)$(_symbolExt)</RelativePath> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| </ResolvedFileToPublish> | ||
|
|
||
| <!-- Add folder otherwise --> | ||
| <ResolvedFileToPublish Include="@(_symbolRecursivePath)" | ||
| Condition="'$(_symbolIsFile)' == 'false' and Exists('$(_symbolSourcePath)')"> | ||
| <RelativePath>$(TargetName)$(_symbolExt)/%(RecursiveDir)%(Filename)%(Extension)</RelativePath> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> |
There was a problem hiding this comment.
nit: limit the scope of condition
Suggested change
| Condition="'$(_symbolIsFile)' == 'true' and Exists('$(_symbolSourcePath)')"> | |
| <RelativePath>$(TargetName)$(_symbolExt)</RelativePath> | |
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |
| </ResolvedFileToPublish> | |
| <!-- Add folder otherwise --> | |
| <ResolvedFileToPublish Include="@(_symbolRecursivePath)" | |
| Condition="'$(_symbolIsFile)' == 'false' and Exists('$(_symbolSourcePath)')"> | |
| <RelativePath>$(TargetName)$(_symbolExt)/%(RecursiveDir)%(Filename)%(Extension)</RelativePath> | |
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |
| Condition="Exists('$(_symbolSourcePath)')"> | |
| <!-- If the symbol is a dSYM bundle, it's a folder not a file. --> | |
| <RelativePath Condition="'$(NativeSymbolExt)' != '.dSYM'">$(TargetName)$(_symbolExt)</RelativePath> | |
| <RelativePath Condition="'$(NativeSymbolExt)' == '.dSYM'">$(TargetName)$(_symbolExt)</RelativePath> | |
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> |
am11
reviewed
Jan 17, 2025
Comment on lines
+39
to
+41
| <!-- If the symbol is a dSYM bundle, it's a folder not a file. --> | ||
| <_symbolIsFile Condition="'$(NativeSymbolExt)' == '.dSYM'">false</_symbolIsFile> | ||
| <_symbolIsFile Condition="'$(_symbolIsFile)' == ''">true</_symbolIsFile> |
There was a problem hiding this comment.
Suggested change
| <!-- If the symbol is a dSYM bundle, it's a folder not a file. --> | |
| <_symbolIsFile Condition="'$(NativeSymbolExt)' == '.dSYM'">false</_symbolIsFile> | |
| <_symbolIsFile Condition="'$(_symbolIsFile)' == ''">true</_symbolIsFile> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #108909
Needs more testing, but seems to work with a small repro so far.