UseLocalAppHostPack property

Nisden · Dec 4, 2022 · adcc6c8 · adcc6c8
1 parent 83279ca
commit adcc6c8
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 21 deletions.
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
@@ -51,7 +51,7 @@
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>
     <CoreCLRCrossTargetComponentDirName Condition="'$(TargetArchitecture)' == 'armel' and '$(BuildArchitecture)' != 'armel' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentDirName>
 
-    <AppHostSourcePath Condition="'$(UseLiveAppHost)' == 'true'">$([MSBuild]::NormalizePath('$(DotNetHostBinDir)', 'apphost$(ExeSuffix)'))</AppHostSourcePath>
+    <AppHostSourcePath Condition="'$(UseLocalAppHostPack)' == 'true'">$([MSBuild]::NormalizePath('$(DotNetHostBinDir)', 'apphost$(ExeSuffix)'))</AppHostSourcePath>
     <SingleFileHostSourcePath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', 'corehost', 'singlefilehost$(ExeSuffix)'))</SingleFileHostSourcePath>
   </PropertyGroup>
 

diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
@@ -19,6 +19,7 @@
                             '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
                             '$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)'">
     <UseLocalTargetingRuntimePack Condition="'$(UseLocalTargetingRuntimePack)' == ''">true</UseLocalTargetingRuntimePack>
+    <UseLocalAppHostPack Condition="'$(UseLocalAppHostPack)' == ''">true</UseLocalAppHostPack>
     <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
     <!-- TODO: Enable when a 8.0.100 SDK is consumed
     <EnableRuntimePackDownload>false</EnableRuntimePackDownload>
@@ -47,13 +48,6 @@
                       RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86;browser-wasm;ios-arm64;ios-arm;iossimulator-arm64;iossimulator-x64;iossimulator-x86;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;android-arm64;android-arm;android-x64;android-x86"
                       RuntimePackLabels="Mono"
                       Condition="'@(KnownRuntimePack)' == '' or !@(KnownRuntimePack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))"/>
-    <KnownAppHostPack Include="$(LocalFrameworkOverrideName)"
-                      ExcludedRuntimeIdentifiers="android"
-                      AppHostPackNamePattern="$(LocalFrameworkOverrideName).Host.**RID**"
-                      AppHostPackVersion="$(ProductVersion)"
-                      AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86"
-                      TargetFramework="$(NetCoreAppCurrent)"
-                      Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
     <KnownCrossgen2Pack Include="$(LocalFrameworkOverrideName).Crossgen2"
                         TargetFramework="$(NetCoreAppCurrent)"
                         Crossgen2PackNamePattern="$(LocalFrameworkOverrideName).Crossgen2.**RID**"
@@ -68,6 +62,16 @@
                          Condition="'@(KnownILCompilerPack)' == '' or !@(KnownILCompilerPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(UseLocalAppHostPack)' == 'true'">
+    <KnownAppHostPack Include="$(LocalFrameworkOverrideName)"
+                      ExcludedRuntimeIdentifiers="android"
+                      AppHostPackNamePattern="$(LocalFrameworkOverrideName).Host.**RID**"
+                      AppHostPackVersion="$(ProductVersion)"
+                      AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;linux-s390x;linux-bionic-arm;linux-bionic-arm64;linux-bionic-x64;linux-bionic-x86"
+                      TargetFramework="$(NetCoreAppCurrent)"
+                      Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" />
+  </ItemGroup>
+
   <!-- Simple name references will be resolved from the targeting pack folders and should never be copied to the output. -->
   <ItemGroup>
     <Reference Update="@(Reference)">
@@ -90,7 +94,7 @@
 
   <!-- 
     SDK tries to download runtime packs when RuntimeIdentifier is set, remove them from PackageDownload item.
-    TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
+    TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableRuntimePackDownload.
    -->
   <Target Name="RemoveRuntimePackFromDownloadItem"
           Condition="'$(UseLocalTargetingRuntimePack)' == 'true'"
@@ -100,19 +104,29 @@
                        Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Runtime'))" />
       <PackageReference Remove="@(PackageReference)"
                         Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Runtime'))" />
-      <PackageDownload Remove="@(PackageDownload)"
-                       Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Host'))" />
-      <PackageReference Remove="@(PackageReference)"
-                        Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Host'))" />
       <PackageDownload Remove="@(PackageDownload)"
                        Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').EndsWith('Microsoft.DotNet.ILCompiler'))" />
       <PackageReference Remove="@(PackageReference)"
                         Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').EndsWith('Microsoft.DotNet.ILCompiler'))" />
     </ItemGroup>
   </Target>
 
+  <!-- 
+    TODO: Remove this target when an 8.0.100 SDK is consumed that respects EnableAppHostPackDownload.
+   -->
+  <Target Name="RemoveAppHostPackFromDownloadItem"
+          Condition="'$(UseLocalAppHostPack)' == 'true'"
+          AfterTargets="ProcessFrameworkReferences">
+    <ItemGroup>
+      <PackageDownload Remove="@(PackageDownload)"
+                       Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Host'))" />
+      <PackageReference Remove="@(PackageReference)"
+                        Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('$(LocalFrameworkOverrideName).Host'))" />
+    </ItemGroup>
+  </Target>
+
   <!-- Use local targeting/runtime pack for NetCoreAppCurrent. -->
-  <Target Name="UpdateTargetingAndRuntimePack"
+  <Target Name="UpdateLocalTargetingAndRuntimePack"
           Condition="'$(UseLocalTargetingRuntimePack)' == 'true'"
           AfterTargets="ResolveFrameworkReferences">
     <ItemGroup>
@@ -129,6 +143,14 @@
                                   Condition="'%(Identity)' == '$(LocalFrameworkOverrideName)'">
         <RuntimePackPath Condition="'$(MicrosoftNetCoreAppRuntimePackDir)' != ''">$(MicrosoftNetCoreAppRuntimePackDir)</RuntimePackPath>
       </ResolvedFrameworkReference>
+    </ItemGroup>
+  </Target>
+
+  <!-- Use local app host pack for NetCoreAppCurrent. -->
+  <Target Name="UpdateLocalAppHostPack"
+          Condition="'$(UseLocalAppHostPack)' == 'true'"
+          AfterTargets="ResolveFrameworkReferences">
+    <ItemGroup>
       <ResolvedAppHostPack Path="$(AppHostSourcePath)"
                            PackageDirectory="$([System.IO.Path]::GetDirectoryName('$(AppHostSourcePath)'))"
                            PathInPackage="$([System.IO.Path]::GetFileName('$(AppHostSourcePath)'))"

diff --git a/eng/testing/linker/trimmingTests.props b/eng/testing/linker/trimmingTests.props
@@ -3,6 +3,6 @@
     <TrimmingTestDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'trimmingTests'))</TrimmingTestDir>
     <TrimmingTestProjectsDir>$([MSBuild]::NormalizeDirectory('$(TrimmingTestDir)', 'projects'))</TrimmingTestProjectsDir>
     <ProjectTemplate>$(MSBuildThisFileDirectory)project.csproj.template</ProjectTemplate>
-    <UseLiveAppHost>true</UseLiveAppHost>
+    <UseLocalAppHostPack>true</UseLocalAppHostPack>
   </PropertyGroup>
 </Project>
diff --git a/...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/...raries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
@@ -7,6 +7,9 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <DnneAddGeneratedBinaryToProject>true</DnneAddGeneratedBinaryToProject>
     <DnneGenRollForward>Major</DnneGenRollForward>
+    <!-- NativeExports should use the live built apphost. We need to define a dependency
+         to the apphost to make sure that it is built before this project invokes DNNE. -->
+    <UseLocalAppHostPack>false</UseLocalAppHostPack>
     <!-- To integrate with DNNE's architecture calculation, we need to set the RID for this project. -->
     <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier>
     <AppHostRuntimeIdentifier>$(PackageRID)</AppHostRuntimeIdentifier>
@@ -15,12 +18,9 @@
       '$(TargetOS)' == 'tvOSSimulator'">true</_TargetsAppleOS>
   </PropertyGroup>
 
-  <!-- NativeExports should use the live built apphost. We need to define a dependency
-       to the apphost to make sure that it is built before this project invokes DNNE.
-       Meanwhile, use a prebuilt apphost from the 7.0 SDK.
-       Remove this hack when the SDK understands the net8.0 tfm.
+  <!-- Until we use the live app host, use a prebuilt from the 7.0 SDK.
        Issue: https://github.com/dotnet/runtime/issues/58109. -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(UseLocalAppHostPack)' != 'true'">
     <KnownAppHostPack Include="Microsoft.NETCore.App"
                       ExcludedRuntimeIdentifiers="android"
                       AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
@@ -123,7 +123,7 @@
                             GetUnixCrossBuildArgumentsForDNNE"
           BeforeTargets="DnneBuildNativeExports">
     <PropertyGroup>
-      <DnneNetHostDir>$([System.IO.Path]::GetDirectoryName('$(AppHostSourcePath)'))</DnneNetHostDir>
+      <DnneNetHostDir>$([System.IO.Path]::GetDirectoryName('$(  )'))</DnneNetHostDir>
     </PropertyGroup>
   </Target>
 </Project>