diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets
index 2f96be51bb60..d5c82388431b 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets
@@ -74,11 +74,6 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     <_InnerToolsPublishAot Condition="$(_HasRIDSpecificTools) and '$(PublishAot)' == 'true'">true</_InnerToolsPublishAot>
     <PublishAot Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</PublishAot>
 
-    <!-- we want to ensure that we don't publish any AppHosts for the 'outer', RID-agnostic builds -->
-    <UseAppHost Condition="!$(_IsRidSpecific)">false</UseAppHost>
-    <!-- we want to ensure that we _do_ publish any AppHosts for the 'inner', RID-specific builds -->
-    <UseAppHost Condition="$(_IsRidSpecific)">true</UseAppHost>
-
     <!-- Tool implementation files are not included in the primary package when the tool has RID-specific packages.  So only pack the tool implementation
        (and only depend on publish) if there are no RID-specific packages, or if the RuntimeIdentifier is set. -->
     <_ToolPackageShouldIncludeImplementation Condition=" '$(PackAsTool)' == 'true' And
@@ -132,14 +127,27 @@ NOTE: This file is imported from the following contexts, so be aware when writin
   <Target Name="SetPackToolProperties"
           BeforeTargets="_GenerateRestoreProjectSpec;_GenerateToolsSettingsFileInputCache;_GenerateShimInputCache;_GetOutputItemsFromPack">
 
+    <PropertyGroup>
+      <!-- Fun fact - UseAppHost is false for NativeAot because _RuntimeIdentifierUsesAppHost gets set to false.
+           So we need to check if PublishAot is set as part of this too. As far as I can tell there is no 'common'
+           property for 'you should expect a native binary here' -->
+      <_ToolUsesPlatformSpecificExecutable Condition="$(_IsRidSpecific) and ('$(UseAppHost)' == 'true' or '$(PublishAot)' == 'true')">true</_ToolUsesPlatformSpecificExecutable>
+      <_ToolUsesPlatformSpecificExecutable Condition="'$(_ToolUsesPlatformSpecificExecutable)' == ''">false</_ToolUsesPlatformSpecificExecutable>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(ToolCommandRunner)' == ''">
+      <ToolCommandRunner Condition="!$(_ToolUsesPlatformSpecificExecutable)">dotnet</ToolCommandRunner>
+      <ToolCommandRunner Condition="$(_ToolUsesPlatformSpecificExecutable)">executable</ToolCommandRunner>
+    </PropertyGroup>
+
     <!-- Needs to be in a target so we don't need to worry about evaluation order with NativeBinary property -->
     <PropertyGroup Condition="'$(ToolEntryPoint)' == ''">
-      <ToolEntryPoint>$(TargetFileName)</ToolEntryPoint>
-      <ToolEntryPoint Condition="$(_IsRidSpecific) and '$(UseAppHost)' == 'true' ">$(AssemblyName)$(_NativeExecutableExtension)</ToolEntryPoint>
+      <ToolEntryPoint Condition="!$(_ToolUsesPlatformSpecificExecutable)">$(TargetFileName)</ToolEntryPoint>
+      <ToolEntryPoint Condition="$(_ToolUsesPlatformSpecificExecutable)">$(AssemblyName)$(_NativeExecutableExtension)</ToolEntryPoint>
     </PropertyGroup>
 
     <!-- inner-build tool packages get a RID suffix -->
-    <PropertyGroup Condition="'$(_HasRIDSpecificTools)' != '' And $(RuntimeIdentifier) != ''">
+    <PropertyGroup Condition="'$(_HasRIDSpecificTools)' != '' And '$(RuntimeIdentifier)' != ''">
       <PackageId>$(PackageId).$(RuntimeIdentifier)</PackageId>
     </PropertyGroup>
   </Target>
@@ -157,7 +165,7 @@ NOTE: This file is imported from the following contexts, so be aware when writin
   <Target Name="PackToPublishDependencyIndirection"
           DependsOnTargets="$(_PackToolPublishDependency)"/>
 
-  <Target Name="PackTool" DependsOnTargets="SetPackToolProperties;GenerateToolsSettingsFileFromBuildProperty;PackToPublishDependencyIndirection;_PackToolValidation;PackToolImplementation" 
+  <Target Name="PackTool" DependsOnTargets="SetPackToolProperties;GenerateToolsSettingsFileFromBuildProperty;PackToPublishDependencyIndirection;_PackToolValidation;PackToolImplementation"
     Condition=" '$(PackAsTool)' == 'true' "
     Returns="@(TfmSpecificPackageFile)">
     <ItemGroup>
@@ -166,8 +174,15 @@ NOTE: This file is imported from the following contexts, so be aware when writin
           recreate the publish layout, but under a TFM- or RID-specific root path. Because we're globbing from the PublishDir,
           the MSBuild Items will have the RecursiveDir metadata - this is used by the PackLogic to combine with the PackagePath
           we set below to ensure we have the correct layout in the end. If the PackLogic didn't try to use RecursiveDir, then
-          we could just explicitly set everything ourselves.   -->
+          we could just explicitly set everything ourselves.
+
+          We _also_ have to filter out apphosts here from platform-agnostic builds, because we don't want to include them in the tool package.
+          This is because we try not to influence the selection of UseAppHost (so that we do not impact 'normal' publishing and end up
+          influencing the contents of the 'normal' publish directory), so it's possible that the 'publish' of an otherwise RID-agnostic
+          tool may include an apphost.
+      -->
       <_PublishFiles Condition="'$(_ToolPackageShouldIncludeImplementation)' == 'true'" Include="$(PublishDir)/**/*" />
+      <_PublishFiles Condition="'$(UseAppHost)' == 'true' and '$(RuntimeIdentifier)' == ''" Remove="$(PublishDir)$(AssemblyName)$(_NativeExecutableExtension)"/>
     </ItemGroup>
 
     <PropertyGroup>
@@ -195,11 +210,6 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     <_GenerateToolsSettingsFileCacheFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_GenerateToolsSettingsFileCacheFile)))</_GenerateToolsSettingsFileCacheFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(ToolCommandRunner)' == ''">
-    <ToolCommandRunner Condition="!$(UseAppHost)">dotnet</ToolCommandRunner>
-    <ToolCommandRunner Condition="$(UseAppHost)">executable</ToolCommandRunner>
-  </PropertyGroup>
-
   <Target Name="_GenerateToolsSettingsFileInputCache">
     <ItemGroup>
       <_ToolPackageRuntimeIdentifier Include="$(_UserSpecifiedToolPackageRids)" />
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
index 0e991e2df7f9..7bb069dbc417 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
@@ -184,7 +184,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                               $([MSBuild]::VersionLessThan($(_TargetFrameworkVersionWithoutV), '8.0'))">true</SelfContained>
 
     <SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
-    <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser')) or $(RuntimeIdentifier.StartsWith('wasi'))">false</_RuntimeIdentifierUsesAppHost>
+    <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser')) or $(RuntimeIdentifier.StartsWith('wasi')) or $(RuntimeIdentifier) == 'any'">false</_RuntimeIdentifierUsesAppHost>
     <_RuntimeIdentifierUsesAppHost Condition="'$(_IsPublishing)' == 'true' and '$(PublishAot)' == 'true'">false</_RuntimeIdentifierUsesAppHost>
     <_RuntimeIdentifierUsesAppHost Condition="'$(_RuntimeIdentifierUsesAppHost)' == ''">true</_RuntimeIdentifierUsesAppHost>
     <UseAppHost Condition="'$(UseAppHost)' == '' and
diff --git a/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs b/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs
index bfa45aaae7e0..d9da99103c5c 100644
--- a/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs
+++ b/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs
@@ -22,7 +22,7 @@ public EndToEndToolTests(ITestOutputHelper log, TestToolBuilder toolBuilder) : b
         public void InstallAndRunToolGlobal()
         {
             var toolSettings = new TestToolBuilder.TestToolSettings();
-            string toolPackagesPath = ToolBuilder.CreateTestTool(Log, toolSettings);
+            string toolPackagesPath = ToolBuilder.CreateTestTool(Log, toolSettings, collectBinlogs: true);
 
             var testDirectory = _testAssetsManager.CreateTestDirectory();
             var homeFolder = Path.Combine(testDirectory.Path, "home");
diff --git a/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs b/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs
index 1ec73acf8e1b..45aba2344727 100644
--- a/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs
+++ b/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs
@@ -82,7 +82,7 @@ public string GetIdentifier() {
         }
 
 
-        public string CreateTestTool(ITestOutputHelper log, TestToolSettings toolSettings, bool collectBinlogs = false)
+        public string CreateTestTool(ITestOutputHelper log, TestToolSettings toolSettings, bool collectBinlogs = true)
         {
             var targetDirectory = Path.Combine(TestContext.Current.TestExecutionDirectory, "TestTools", toolSettings.GetIdentifier());
 
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAToolProject.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAToolProject.cs
new file mode 100644
index 000000000000..18d4f9d2390a
--- /dev/null
+++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAToolProject.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#nullable disable
+
+using System.Runtime.CompilerServices;
+using Microsoft.DotNet.Cli.Utils;
+
+namespace Microsoft.NET.Publish.Tests
+{
+    public class GivenThatWeWantToPublishAToolProject : SdkTest
+    {
+        public GivenThatWeWantToPublishAToolProject(ITestOutputHelper log) : base(log)
+        {
+        }
+
+        private TestAsset SetupTestAsset([CallerMemberName] string callingMethod = "")
+        {
+            TestAsset helloWorldAsset = _testAssetsManager
+                .CopyTestAsset("PortableTool", callingMethod)
+                .WithSource();
+
+
+            return helloWorldAsset;
+        }
+
+        [Fact]
+        // this test verifies that we don't regress the 'normal' publish experience accidentally in the
+        // PackTool.targets
+        public void It_can_publish_and_has_apphost()
+        {
+            var testAsset = SetupTestAsset();
+            var publishCommand = new PublishCommand(testAsset);
+
+            publishCommand.Execute();
+
+            publishCommand.GetOutputDirectory(targetFramework: ToolsetInfo.CurrentTargetFramework)
+                .Should().HaveFile("consoledemo" + Constants.ExeSuffix);
+        }
+    }
+}
diff --git a/test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs b/test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs
index 24ab4903bb5c..c9e05aa6a0d5 100644
--- a/test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs
+++ b/test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProject.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using System.Runtime.CompilerServices;
+using Microsoft.DotNet.Cli.Utils;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
 
@@ -20,9 +21,9 @@ public GivenThatWeWantToPackAToolProject(ITestOutputHelper log) : base(log)
 
         private string SetupNuGetPackage(bool multiTarget, string packageType = null, [CallerMemberName] string callingMethod = "")
         {
-
+            string id = $"{callingMethod}-{_targetFrameworkOrFrameworks}";
             TestAsset helloWorldAsset = _testAssetsManager
-                .CopyTestAsset("PortableTool", callingMethod + multiTarget + (packageType ?? ""))
+                .CopyTestAsset("PortableTool", id)
                 .WithSource()
                 .WithProjectChanges(project =>
                 {
@@ -39,7 +40,7 @@ private string SetupNuGetPackage(bool multiTarget, string packageType = null, [C
 
             var packCommand = new PackCommand(helloWorldAsset);
 
-            var result = packCommand.Execute();
+            var result = packCommand.Execute($"/bl:{id}-{{}}.binlog");
             result.Should().Pass();
 
             return packCommand.GetNuGetPackage();
@@ -192,9 +193,9 @@ public void It_does_not_contain_apphost_exe(bool multiTarget)
                 string[] args = multiTarget ? new[] { $"/p:TargetFramework={_targetFrameworkOrFrameworks}" } : Array.Empty<string>();
                 getValuesCommand.Execute(args)
                     .Should().Pass();
-                string runCommandPath = getValuesCommand.GetValues().Single();
-                runCommandPath
-                    .Should().Be("dotnet", because: "The RunCommand should recognize that this is a non-AppHost tool and should use the muxer to launch it");
+                var runCommand = new FileInfo(getValuesCommand.GetValues().Single());
+                runCommand.Name
+                    .Should().Be("consoledemo" + Constants.ExeSuffix, because: "The RunCommand should recognize that this is an AppHost-using project and should use the AppHost for non-tool use cases.");
             }
         }