diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets index 4775c20bd93016..d609c1d47bdf26 100644 --- a/src/libraries/illink-oob.targets +++ b/src/libraries/illink-oob.targets @@ -4,7 +4,8 @@ DependsOnTargets="PrepareForAssembliesTrim"> - $([MSBuild]::NormalizePath('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs')) + $([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-oobs')) + $(IntermediateOutputPath)oob-linker-$(TargetOS)-$(TargetArchitecture)-marker.txt @@ -24,7 +25,7 @@ @@ -56,7 +57,7 @@ AfterTargets="Build" DependsOnTargets="GetOOBAssembliesToTrim;PrepareForAssembliesTrim" Inputs="$(ILLinkTasksAssembly);@(OOBAssemblyToTrim);@(OOBAssemblyReference);@(OOBLibrarySuppressionsXml)" - Outputs="@(OOBLibraryTrimmed)"> + Outputs="$(OOBAssembliesMarkerFile)"> @@ -73,6 +74,11 @@ ToolExe="$(_DotNetHostFileName)" ToolPath="$(_DotNetHostDirectory)" /> + + + + diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets index 0cc83fb1c74677..8641657b9f58d0 100644 --- a/src/libraries/illink-sharedframework.targets +++ b/src/libraries/illink-sharedframework.targets @@ -4,7 +4,8 @@ DependsOnTargets="PrepareForAssembliesTrim"> - $([MSBuild]::NormalizePath('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack')) + $([MSBuild]::NormalizeDirectory('$(ILLinkTrimAssemblyArtifactsRootDir)', 'trimmed-runtimepack')) + $(IntermediateOutputPath)sfx-linker-$(TargetOS)-$(TargetArchitecture)-marker.txt @@ -28,7 +29,7 @@ AfterTargets="Build" DependsOnTargets="GetSharedFrameworkAssembliesToTrim;PrepareForAssembliesTrim" Inputs="$(ILLinkTasksAssembly);@(SharedFrameworkAssemblyToTrim);@(SharedFrameworkSuppressionsXml)" - Outputs="@(SharedFrameworkAssemblyTrimmed)"> + Outputs="$(SharedFrameworkAssembliesMarkerFile)"> @@ -55,6 +56,11 @@ ToolExe="$(_DotNetHostFileName)" ToolPath="$(_DotNetHostDirectory)" /> + + + +