Skip to content

Use stable outputs in illink targets #64160

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.

Sign up for GitHub

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

Merged
ViktorHofer merged 12 commits into from
Jan 31, 2022
Merged

Use stable outputs in illink targets #64160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc6f39e
Use stable outputs in illink targets
ViktorHofer Jan 23, 2022
29d4983
Update illink-oob.targets
ViktorHofer Jan 23, 2022
98b49eb
Update illink-oob.targets
ViktorHofer Jan 23, 2022
0e82185
Update illink-oob.targets
ViktorHofer Jan 23, 2022
67f1795
Update illink-oob.targets
ViktorHofer Jan 25, 2022
34b263d
Update illink-sharedframework.targets
ViktorHofer Jan 25, 2022
97bb64e
Update illink-oob.targets
ViktorHofer Jan 28, 2022
2bbff13
Update illink-sharedframework.targets
ViktorHofer Jan 28, 2022
572315a
Update illink-oob.targets
ViktorHofer Jan 28, 2022
05182f4
Update illink-sharedframework.targets
ViktorHofer Jan 28, 2022
fe15f3a
Update illink-oob.targets
ViktorHofer Jan 28, 2022
f58af2f
Update illink-sharedframework.targets
ViktorHofer Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/libraries/illink-oob.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
DependsOnTargets="PrepareForAssembliesTrim">

<PropertyGroup>
<OOBAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs'))</OOBAssembliesTrimmedArtifactsPath>
<OOBAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs'))</OOBAssembliesTrimmedArtifactsPath>
<OOBAssembliesMarkerFile>$(IntermediateOutputPath)oob-linker-$(TargetOS)-$(TargetArchitecture)-marker.txt</OOBAssembliesMarkerFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -24,7 +25,7 @@
<OOBAssemblyToIgnore Include="System.Speech" />

<NetCoreAppCurrentAssembly Include="$(NetCoreAppCurrentRuntimePath)*.dll"
Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;
Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator*.dll;
$(NetCoreAppCurrentRuntimePath)*.Native.dll;
$(NetCoreAppCurrentRuntimePath)*msquic.dll" />
<SharedFrameworkAssembly Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" />
Expand Down Expand Up @@ -56,7 +57,7 @@
AfterTargets="Build"
DependsOnTargets="GetOOBAssembliesToTrim;PrepareForAssembliesTrim"
Inputs="$(ILLinkTasksAssembly);@(OOBAssemblyToTrim);@(OOBAssemblyReference);@(OOBLibrarySuppressionsXml)"
Outputs="@(OOBLibraryTrimmed)">
Outputs="$(OOBAssembliesMarkerFile)">

<Message Text="Trimming $(PackageRID) out-of-band assemblies with ILLinker..." Importance="high" />

Expand All @@ -73,6 +74,11 @@
ToolExe="$(_DotNetHostFileName)"
ToolPath="$(_DotNetHostDirectory)" />

<!-- Create a marker file which serves as the target's output to enable incremental builds. -->
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(OOBAssembliesMarkerFile)'))" />
<Touch Files="$(OOBAssembliesMarkerFile)"
AlwaysCreate="true" />

</Target>

</Project>
10 changes: 8 additions & 2 deletions src/libraries/illink-sharedframework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
DependsOnTargets="PrepareForAssembliesTrim">

<PropertyGroup>
<SharedFrameworkAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizePath('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack'))</SharedFrameworkAssembliesTrimmedArtifactsPath>
<SharedFrameworkAssembliesTrimmedArtifactsPath>$([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack'))</SharedFrameworkAssembliesTrimmedArtifactsPath>
<SharedFrameworkAssembliesMarkerFile>$(IntermediateOutputPath)sfx-linker-$(TargetOS)-$(TargetArchitecture)-marker.txt</SharedFrameworkAssembliesMarkerFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -28,7 +29,7 @@
AfterTargets="Build"
DependsOnTargets="GetSharedFrameworkAssembliesToTrim;PrepareForAssembliesTrim"
Inputs="$(ILLinkTasksAssembly);@(SharedFrameworkAssemblyToTrim);@(SharedFrameworkSuppressionsXml)"
Outputs="@(SharedFrameworkAssemblyTrimmed)">
Outputs="$(SharedFrameworkAssembliesMarkerFile)">

<Message Text="Trimming $(PackageRID) shared framework assemblies with ILLinker..." Importance="high" />

Expand All @@ -55,6 +56,11 @@
ToolExe="$(_DotNetHostFileName)"
ToolPath="$(_DotNetHostDirectory)" />

<!-- Create a marker file which serves as the target's output to enable incremental builds. -->
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(SharedFrameworkAssembliesMarkerFile)'))" />
<Touch Files="$(SharedFrameworkAssembliesMarkerFile)"
AlwaysCreate="true" />

</Target>

</Project>