From e76d656b7ee8c9fe4649e738bbebc699a0a46323 Mon Sep 17 00:00:00 2001
From: Jackson Schuster <36744439+jtschuster@users.noreply.github.com>
Date: Mon, 30 Jan 2023 16:33:59 -0800
Subject: [PATCH] Use SetupProperties to set properties related to NativeAOT
 and remove the top-level defaults (#79233)

---
 eng/testing/tests.singlefile.targets          |  1 +
 .../BuildFrameworkNativeObjects.proj          |  2 +-
 .../Microsoft.NETCore.Native.targets          | 24 ++-----------------
 src/tests/build.proj                          |  2 ++
 4 files changed, 6 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets
index 582932087ac..e66a84d0fa2 100644
--- a/eng/testing/tests.singlefile.targets
+++ b/eng/testing/tests.singlefile.targets
@@ -25,6 +25,7 @@
     <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
     <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
     <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
+    <IlcFrameworkNativePath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkNativePath>
     <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
     <TrimMode>partial</TrimMode>
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
diff --git a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
index d3ef3ec15cd..ea0602ce09e 100644
--- a/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
+++ b/src/coreclr/nativeaot/BuildIntegration/BuildFrameworkNativeObjects.proj
@@ -14,6 +14,7 @@
   <Import Project="Microsoft.NETCore.Native.targets" Condition="'$(IlcCalledViaPackage)' == ''" />
 
   <Target Name="BuildAllFrameworkLibraries"
+    DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)"
     Inputs="@(DefaultFrameworkAssemblies)"
     Outputs="@(DefaultFrameworkAssemblies->'$(NativeIntermediateOutputPath)\%(Filename)$(NativeObjectExt)')">
     <ItemGroup>
@@ -28,7 +29,6 @@
 
   <Target Name="BuildAllFrameworkLibrariesAsSingleLib"
     DependsOnTargets="BuildAllFrameworkLibraries">
-
     <ItemGroup>
       <LibInputs Include="$(NativeIntermediateOutputPath)\*$(NativeObjectExt)" />
     </ItemGroup>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
old mode 100755
new mode 100644
index 71dba105ff9..5caefcd10b2
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -21,12 +21,6 @@ The .NET Foundation licenses this file to you under the MIT license.
     <NativeOutputPath Condition="'$(NativeOutputPath)' == ''">$(OutputPath)native\</NativeOutputPath>
     <NativeCompilationDuringPublish Condition="'$(NativeCompilationDuringPublish)' == ''">true</NativeCompilationDuringPublish>
     <IlcBuildTasksPath Condition="'$(IlcBuildTasksPath)' == ''">$(MSBuildThisFileDirectory)..\tools\netstandard\ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
-    <IlcToolsPath Condition="'$(IlcPath)' != '' and '$(IlcToolsPath)' == ''">$(IlcPath)\tools\</IlcToolsPath>
-    <IlcSdkPath Condition="'$(IlcPath)' != '' and '$(IlcSdkPath)' == ''">$(IlcPath)\sdk\</IlcSdkPath>
-    <IlcFrameworkPath Condition="'$(IlcPath)' != '' and '$(IlcFrameworkPath)' == ''">$(IlcPath)\framework\</IlcFrameworkPath>
-    <IlcFrameworkNativePath Condition="'$(IlcPath)' != '' and '$(IlcFrameworkNativePath)' == ''">$(IlcPath)\framework\</IlcFrameworkNativePath>
-    <IlcFrameworkNativePath Condition="'$(IlcFrameworkNativePath)' == '' and '$(IlcFrameworkPath)' != ''">$(IlcFrameworkPath)</IlcFrameworkNativePath>
-    <IlcMibcPath Condition="'$(IlcPath)' != '' and '$(IlcMibcPath)' == ''">$(IlcPath)\mibc\</IlcMibcPath>
     <TargetOS Condition="$(RuntimeIdentifier.StartsWith('win'))">windows</TargetOS>
     <TargetOS Condition="$(RuntimeIdentifier.StartsWith('osx'))">osx</TargetOS>
     <TargetOS Condition="$(RuntimeIdentifier.StartsWith('freebsd'))">freebsd</TargetOS>
@@ -113,18 +107,6 @@ The .NET Foundation licenses this file to you under the MIT license.
     <AutoInitializedAssemblies Include="System.Private.DisabledReflection" Condition="$(IlcDisableReflection) == 'true'" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll" />
-
-    <!-- Exclude unmanaged dlls -->
-    <FrameworkAssemblies Include="$(IlcFrameworkPath)*.dll" Exclude="$(IlcFrameworkPath)*.Native.dll;$(IlcFrameworkPath)msquic.dll" />
-
-    <MibcFile Include="$(IlcMibcPath)*.mibc" Condition="'$(IlcPgoOptimize)' == 'true'" />
-
-    <DefaultFrameworkAssemblies Include="@(FrameworkAssemblies)" />
-    <DefaultFrameworkAssemblies Include="@(PrivateSdkAssemblies)" />
-  </ItemGroup>
-
   <ItemDefinitionGroup>
     <ManagedBinary>
       <IlcRspFile>$(NativeIntermediateOutputPath)\%(Filename).ilc.rsp</IlcRspFile>
@@ -152,7 +134,6 @@ The .NET Foundation licenses this file to you under the MIT license.
       <IlcMibcPath Condition="'$(IlcMibcPath)' == ''">$(RuntimePackagePath)\mibc\</IlcMibcPath>
     </PropertyGroup>
 
-    <!-- If running from a package these values need to be set again with the resolved IlcXYZPath -->
     <ItemGroup>
       <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll" />
 
@@ -372,10 +353,9 @@ The .NET Foundation licenses this file to you under the MIT license.
   </Target>
 
   <Target Name="CreateLib"
-    Inputs="@(LibInputs)"
-    Outputs="$(SharedLibrary)"
     DependsOnTargets="$(CreateLibDependsOn);$(IlcDynamicBuildPropertyDependencies);SetupOSSpecificProps"
-    >
+    Inputs="@(LibInputs)"
+    Outputs="$(SharedLibrary)" >
 
     <ItemGroup>
       <CustomLibArg Include="/out:$(SharedLibrary)" Condition="'$(TargetOS)' == 'windows'" />
diff --git a/src/tests/build.proj b/src/tests/build.proj
index 4a6892056d4..094b00ca079 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -581,6 +581,8 @@
       <CreateLibProperty Include="IlcBuildTasksPath=$(IlcBuildTasksPath)" />
       <CreateLibProperty Include="IlcSdkPath=$(IlcSdkPath)" />
       <CreateLibProperty Include="IlcFrameworkPath=$(IlcFrameworkPath)" />
+      <CreateLibProperty Include="IlcFrameworkNativePath=$(IlcFrameworkNativePath)" />
+      <CreateLibProperty Include="IlcDynamicBuildPropertyDependencies=$(IlcDynamicBuildPropertyDependencies)" />
       <CreateLibProperty Include="FrameworkLibPath=$(IlcSdkPath)" />
       <CreateLibProperty Include="FrameworkObjPath=$(IntermediateOutputPath)/NativeAOTFX" />
       <CreateLibProperty Condition="'$(Configuration)' == 'Checked' or '$(Configuration)' == 'Release'" Include="Optimize=true" />
-- 
2.34.1