diff --git a/Directory.Build.targets b/Directory.Build.targets
index 71391d2e99..d85abd78da 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -6,6 +6,7 @@
   
   <PropertyGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">
     <DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);TestResults\**</DefaultExcludesInProjectFolder>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">
diff --git a/core.slnf b/core.slnf
deleted file mode 100644
index 7657ecb700..0000000000
--- a/core.slnf
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "solution": {
-    "path": "System.CommandLine.sln",
-    "projects": [
-      "src\\System.CommandLine.ApiCompatibility.Tests\\System.CommandLine.ApiCompatibility.Tests.csproj",
-      "src\\System.CommandLine.Tests\\System.CommandLine.Tests.csproj",
-      "src\\System.CommandLine\\System.CommandLine.csproj"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/eng/Build.props b/eng/Build.props
deleted file mode 100644
index 47671dc18a..0000000000
--- a/eng/Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-    <ProjectToBuild Include="$(RepoRoot)sourcebuild.slnf" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/sourcebuild.slnf b/sourcebuild.slnf
deleted file mode 100644
index ba1ca0a8c3..0000000000
--- a/sourcebuild.slnf
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "solution": {
-    "path": "System.CommandLine.sln",
-    "projects": [
-      "src\\System.CommandLine\\System.CommandLine.csproj",
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
index ed32b27e85..186c83d619 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
-    <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);IDE1006</NoWarn>
   </PropertyGroup>
 
diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
index b41dabb7c2..58294950a3 100644
--- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
+++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\System.CommandLine\System.CommandLine.csproj" />
-  </ItemGroup>
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\System.CommandLine\System.CommandLine.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/System.CommandLine.Suggest/Directory.Build.props b/src/System.CommandLine.Suggest/Directory.Build.props
deleted file mode 100644
index 45f1896df4..0000000000
--- a/src/System.CommandLine.Suggest/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseGlobalToolVersion>true</UseGlobalToolVersion>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-</Project>
diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
index 371b0becd0..3b48db33f3 100644
--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj
+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
@@ -7,19 +7,14 @@
     <PackAsTool>true</PackAsTool>
     <PackageId>dotnet-suggest</PackageId>
     <ToolCommandName>dotnet-suggest</ToolCommandName>
-    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;osx-arm64;linux-x64</PackAsToolShimRuntimeIdentifiers>
+    <PackAsToolShimRuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">win-x64;win-x86;osx-x64;osx-arm64;linux-x64</PackAsToolShimRuntimeIdentifiers>
     <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
 
     <DotnetSuggestBuildNumber>.1</DotnetSuggestBuildNumber>
     <DotnetSuggestBuildNumber Condition="'$(VersionSuffixDateStamp)' != ''">.$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</DotnetSuggestBuildNumber>
     <VersionPrefix>1.1$(DotnetSuggestBuildNumber)</VersionPrefix>
     <PreReleaseVersionLabel />
-    <!-- Don't stabilize the version when building from the VMR as the package doesn't ship from there. -->
-    <VersionSuffix Condition="'$(DotNetBuild)' != 'true'" />
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!--No warning for the scripts, it is part of the content, not to execuate-->
+    <!-- No warning for the scripts, it is part of the content, not to execute -->
     <NoWarn>$(NoWarn);NU5110;NU5111</NoWarn>
   </PropertyGroup>
 
diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
index bedfb7dcbf..f9be440211 100644
--- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
+++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj
@@ -1,22 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
-        <!-- producing more detailed log output -->
-        <TrimmerSingleWarn>false</TrimmerSingleWarn>
-        <PublishAot>true</PublishAot>
-        <ControlFlowGuard>Guard</ControlFlowGuard>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+    <!-- producing more detailed log output -->
+    <TrimmerSingleWarn>false</TrimmerSingleWarn>
+    <PublishAot>true</PublishAot>
+    <ControlFlowGuard>Guard</ControlFlowGuard>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
+  </PropertyGroup>
 
-    <PropertyGroup>
-        <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
-    </PropertyGroup>
+  <PropertyGroup>
+    <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <Reference Include="SystemCommandLineDll">
-            <HintPath>$(SystemCommandLineDllPath)</HintPath>
-        </Reference>
-    </ItemGroup>
+  <ItemGroup>
+    <Reference Include="SystemCommandLineDll">
+      <HintPath>$(SystemCommandLineDllPath)</HintPath>
+    </Reference>
+  </ItemGroup>
 
 </Project>
diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
index 615b0764cf..a94aa65be8 100644
--- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
+++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj
@@ -1,23 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	
-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-		<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<PublishTrimmed>true</PublishTrimmed>
-  		<TrimmerSingleWarn>false</TrimmerSingleWarn>
-	</PropertyGroup>
 
-	<PropertyGroup>
-		<SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
-	</PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimmerSingleWarn>false</TrimmerSingleWarn>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<Reference Include="SystemCommandLineDll">
-			<HintPath>$(SystemCommandLineDllPath)</HintPath>
-		</Reference>
-		 <TrimmerRootAssembly Include="System.CommandLine" />
-	</ItemGroup>
+  <PropertyGroup>
+    <SystemCommandLineDllPath Condition="'$(SystemCommandLineDllPath)'==''">..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll</SystemCommandLineDllPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="SystemCommandLineDll">
+      <HintPath>$(SystemCommandLineDllPath)</HintPath>
+    </Reference>
+    <TrimmerRootAssembly Include="System.CommandLine" />
+  </ItemGroup>
 
 </Project>
\ No newline at end of file