From 27ac5db978b0db48de5fec459f8b345d7216c742 Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Mon, 8 Apr 2024 10:51:33 -0700
Subject: [PATCH 1/2] Make InstallRuntimeComponentToFinalDestination depend on
 published nativeaot symbols

---
 src/native/managed/native-library.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/native/managed/native-library.targets b/src/native/managed/native-library.targets
index e0f23322bba481..2e65fde185e013 100644
--- a/src/native/managed/native-library.targets
+++ b/src/native/managed/native-library.targets
@@ -69,7 +69,7 @@
 
     <Target Name="InstallRuntimeComponentToFinalDestination"
             AfterTargets="CopyNativeBinary"
-            DependsOnTargets="CopyNativeBinary;StripLibraryLikeCoreCLRBuild" Condition="'$(IsRuntimeComponent)' == 'true'">
+            DependsOnTargets="CopyNativeBinary;_CopyAotSymbols;StripLibraryLikeCoreCLRBuild" Condition="'$(IsRuntimeComponent)' == 'true'">
         <Error Text="Set at least one @InstallRuntimeComponentDestination item" Condition="@(InstallRuntimeComponentDestination->Count()) == 0" />
 
         <PropertyGroup>
@@ -88,7 +88,7 @@
 
         <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
             <CopyFinalFiles Include="$(PublishDir)$(TargetName)$(NativeBinaryExt)" />
-            <CopyFinalFilesPDB Include="$(PublishDir)$(TargetName).pdb" />
+            <CopyFinalFilesPDB Include="$(PublishDir)$(TargetName).pdb" Condition="Exists('$(PublishDir)$(TargetName).pdb')" />
         </ItemGroup>
 
         <Message Importance="Normal" Text="Installing @(CopyFinalFiles) into %(_NormalizedInstallRuntimeComponentDest.Identity)"/>

From cf64b795a98b96b12ed9dbd9656eb97f2b692add Mon Sep 17 00:00:00 2001
From: Elinor Fung <elfung@microsoft.com>
Date: Mon, 8 Apr 2024 15:03:30 -0700
Subject: [PATCH 2/2] Use NativeOutputPath

---
 src/native/managed/native-library.targets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/native/managed/native-library.targets b/src/native/managed/native-library.targets
index 2e65fde185e013..d1ad1ba0223639 100644
--- a/src/native/managed/native-library.targets
+++ b/src/native/managed/native-library.targets
@@ -39,16 +39,16 @@
     </Target>
 
     <Target Name="StripLibraryLikeCoreCLRBuild"
-            DependsOnTargets="SetupOSSpecificProps;CopyNativeBinary;StripLibraryLikeCoreCLRSetupPaths"
+            DependsOnTargets="SetupOSSpecificProps;LinkNative;StripLibraryLikeCoreCLRSetupPaths"
             Condition="'$(IsRuntimeComponent)' == 'true' and '$(TargetsWindows)' != 'true'"
-            Inputs="$(PublishDir)$(TargetName)$(NativeBinaryExt)"
+            Inputs="$(NativeOutputPath)$(TargetName)$(NativeBinaryExt)"
             Outputs="$(StripSourceFile);$(StripDestinationFile)">
         <Error Text="Do not set StripSymbols to true - runtime components stripping is controlled by native-library.targets" Condition="'$(StripSymbols)' == 'true'" />
 
-        <Message Importance="Normal" Text="Stripping $(PublishDir)$(TargetName)$(NativeBinaryExt) into $(StripSourceFile) and $(StripDestinationFile)" />
+        <Message Importance="Normal" Text="Stripping $(NativeOutputPath)$(TargetName)$(NativeBinaryExt) into $(StripSourceFile) and $(StripDestinationFile)" />
 
-        <!-- copy from the published/ subfolder to the stripped/ subfolder -->
-        <Copy SourceFiles="$(PublishDir)$(TargetName)$(NativeBinaryExt)"
+        <!-- copy from the native/ subfolder to the stripped/ subfolder -->
+        <Copy SourceFiles="$(NativeOutputPath)$(TargetName)$(NativeBinaryExt)"
               DestinationFolder="$(StrippedOutputPath)"
               SkipUnchangedFiles="true" />
 
@@ -68,8 +68,8 @@
     </Target>
 
     <Target Name="InstallRuntimeComponentToFinalDestination"
-            AfterTargets="CopyNativeBinary"
-            DependsOnTargets="CopyNativeBinary;_CopyAotSymbols;StripLibraryLikeCoreCLRBuild" Condition="'$(IsRuntimeComponent)' == 'true'">
+            AfterTargets="LinkNative"
+            DependsOnTargets="LinkNative;StripLibraryLikeCoreCLRBuild" Condition="'$(IsRuntimeComponent)' == 'true'">
         <Error Text="Set at least one @InstallRuntimeComponentDestination item" Condition="@(InstallRuntimeComponentDestination->Count()) == 0" />
 
         <PropertyGroup>
@@ -87,8 +87,8 @@
         </ItemGroup>
 
         <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
-            <CopyFinalFiles Include="$(PublishDir)$(TargetName)$(NativeBinaryExt)" />
-            <CopyFinalFilesPDB Include="$(PublishDir)$(TargetName).pdb" Condition="Exists('$(PublishDir)$(TargetName).pdb')" />
+            <CopyFinalFiles Include="$(NativeOutputPath)$(TargetName)$(NativeBinaryExt)" />
+            <CopyFinalFilesPDB Include="$(NativeOutputPath)$(TargetName).pdb" />
         </ItemGroup>
 
         <Message Importance="Normal" Text="Installing @(CopyFinalFiles) into %(_NormalizedInstallRuntimeComponentDest.Identity)"/>