diff --git a/Directory.Build.targets b/Directory.Build.targets
index b2b7913a657..3020ae882fe 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Disable IsAotCompatible on non-DefaultNetCoreTargetFrameworks even if explicitly enabled or else we'll get NETSDK1210 errors -->
     <IsAotCompatible Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"></IsAotCompatible>
-    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and Exists('PACKAGE.md')">PACKAGE.md</PackageReadmeFile>
+    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and Exists('README.md')">README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageReadmeFile)' != ''">
diff --git a/global.json b/global.json
index 236c4a4357e..c9231219596 100644
--- a/global.json
+++ b/global.json
@@ -19,6 +19,7 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26151.104",
-    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26151.104"
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26151.104",
+    "Microsoft.Build.NoTargets": "3.7.0"
   }
 }
diff --git a/src/EFCore.Abstractions/PACKAGE.md b/src/EFCore.Abstractions/README.md
similarity index 100%
rename from src/EFCore.Abstractions/PACKAGE.md
rename to src/EFCore.Abstractions/README.md
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
index 6bf55e95753..8022f3ad6ff 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
@@ -16,7 +16,6 @@
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset</CodeAnalysisRuleSet>
     <ImplicitUsings>true</ImplicitUsings>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
     <NoWarn>$(NoWarn);NU5128</NoWarn>
     <NoWarn>$(NoWarn);RS1038</NoWarn> <!-- Compiler extensions should be implemented in assemblies with compiler-provided references, #35752 -->
   </PropertyGroup>
diff --git a/src/EFCore.Cosmos/PACKAGE.md b/src/EFCore.Cosmos/README.md
similarity index 100%
rename from src/EFCore.Cosmos/PACKAGE.md
rename to src/EFCore.Cosmos/README.md
diff --git a/src/EFCore.Design/PACKAGE.md b/src/EFCore.Design/README.md
similarity index 100%
rename from src/EFCore.Design/PACKAGE.md
rename to src/EFCore.Design/README.md
diff --git a/src/EFCore.InMemory/PACKAGE.md b/src/EFCore.InMemory/README.md
similarity index 100%
rename from src/EFCore.InMemory/PACKAGE.md
rename to src/EFCore.InMemory/README.md
diff --git a/src/EFCore.Proxies/PACKAGE.md b/src/EFCore.Proxies/README.md
similarity index 100%
rename from src/EFCore.Proxies/PACKAGE.md
rename to src/EFCore.Proxies/README.md
diff --git a/src/EFCore.Relational/PACKAGE.md b/src/EFCore.Relational/README.md
similarity index 100%
rename from src/EFCore.Relational/PACKAGE.md
rename to src/EFCore.Relational/README.md
diff --git a/src/EFCore.SqlServer.Abstractions/PACKAGE.md b/src/EFCore.SqlServer.Abstractions/README.md
similarity index 100%
rename from src/EFCore.SqlServer.Abstractions/PACKAGE.md
rename to src/EFCore.SqlServer.Abstractions/README.md
diff --git a/src/EFCore.SqlServer.HierarchyId/PACKAGE.md b/src/EFCore.SqlServer.HierarchyId/README.md
similarity index 100%
rename from src/EFCore.SqlServer.HierarchyId/PACKAGE.md
rename to src/EFCore.SqlServer.HierarchyId/README.md
diff --git a/src/EFCore.SqlServer.NTS/PACKAGE.md b/src/EFCore.SqlServer.NTS/README.md
similarity index 100%
rename from src/EFCore.SqlServer.NTS/PACKAGE.md
rename to src/EFCore.SqlServer.NTS/README.md
diff --git a/src/EFCore.SqlServer/PACKAGE.md b/src/EFCore.SqlServer/README.md
similarity index 100%
rename from src/EFCore.SqlServer/PACKAGE.md
rename to src/EFCore.SqlServer/README.md
diff --git a/src/EFCore.Sqlite.Core/PACKAGE.md b/src/EFCore.Sqlite.Core/README.md
similarity index 100%
rename from src/EFCore.Sqlite.Core/PACKAGE.md
rename to src/EFCore.Sqlite.Core/README.md
diff --git a/src/EFCore.Sqlite.NTS/PACKAGE.md b/src/EFCore.Sqlite.NTS/README.md
similarity index 100%
rename from src/EFCore.Sqlite.NTS/PACKAGE.md
rename to src/EFCore.Sqlite.NTS/README.md
diff --git a/src/EFCore.Sqlite/PACKAGE.md b/src/EFCore.Sqlite/README.md
similarity index 100%
rename from src/EFCore.Sqlite/PACKAGE.md
rename to src/EFCore.Sqlite/README.md
diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj
index b6792f58403..2f8ab7f674d 100644
--- a/src/EFCore.Tasks/EFCore.Tasks.csproj
+++ b/src/EFCore.Tasks/EFCore.Tasks.csproj
@@ -5,14 +5,17 @@
     <Description>MSBuild tasks for Entity Framework Core projects.</Description>
     <AssemblyName>Microsoft.EntityFrameworkCore.Tasks</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
-    <IncludeSymbols>false</IncludeSymbols>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <GenerateDependencyFile>true</GenerateDependencyFile>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <DevelopmentDependency>true</DevelopmentDependency>
     <NoWarn>$(NoWarn);NU5100;NU5128</NoWarn>
     <ImplicitUsings>true</ImplicitUsings>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset</CodeAnalysisRuleSet>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddPackContent</TargetsForTfmSpecificContentInPackage>
+    <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == '$(NetFrameworkToolCurrent)'">
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,6 +35,13 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="**/*.props;**/*.targets"
+      Pack="true"
+      PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="lib/**/*" Pack="true" PackagePath="lib/" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -45,7 +55,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" PrivateAssets="all" />
+    <ProjectReference Include="..\EFCore.Design\EFCore.Design.csproj" ReferenceOutputAssembly="true" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
@@ -54,29 +65,30 @@
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.Text.Json" PrivateAssets="All" />
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Configuration" />
+    <Reference Include="Microsoft.Build" Pack="false" />
+    <Reference Include="Microsoft.Build.Framework" Pack="false" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" Pack="false" />
+    <Reference Include="Microsoft.CSharp" Pack="false" />
+    <Reference Include="System.Configuration" Pack="false" />
   </ItemGroup>
 
-  <!--
-    Workaround for insufficient support for task packages by NuGet Pack: https://github.com/NuGet/Home/issues/6321
-    and bugs with ProjectReference: https://github.com/NuGet/Home/issues/10907, https://github.com/NuGet/Home/issues/10312
-  -->
-  <PropertyGroup>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
-  </PropertyGroup>
+  <Target Name="AddPackContent">
+    <ItemGroup Condition="'$(TargetFramework)' == '$(NetCurrent)'">
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(NetMinimum)/*" PackagePath="tools/$(NetCurrent)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)$(AssemblyName).deps.json" PackagePath="tasks/$(TargetFramework)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkToolCurrent)'">
+      <TfmSpecificPackageFile Include="$(OutputPath)*" Exclude="$(TargetPath);$(TargetDir)$(TargetName).pdb" PackagePath="tasks/$(TargetFramework)" />
+    </ItemGroup>
 
-  <Target Name="SetPackageProperties" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="Build">
     <ItemGroup>
-      <NuspecProperty Include="AssemblyName=$(AssemblyName)" />
-      <NuspecProperty Include="OutputPath=$(OutputPath)" />
-      <NuspecProperty Include="NetCurrent=$(NetCurrent)" />
-      <NuspecProperty Include="NetFrameworkToolCurrent=$(NetFrameworkToolCurrent)" />
-      <NuspecProperty Include="EFOutputPath=$(ArtifactsBinDir)ef\$(Configuration)\$(NetMinimum)" />
+      <TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))"
+                                   TargetPath="/%(TfmSpecificPackageFile.PackagePath)/%(Filename)%(Extension)"
+                                   TargetFramework="$(TargetFramework)"
+                                   Condition="'$(IncludeSymbols)' == 'true'" />
+      <!-- Remove symbols from the non symbol package. -->
+      <TfmSpecificPackageFile Remove="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" />
     </ItemGroup>
   </Target>
 
diff --git a/src/EFCore.Tasks/EFCore.Tasks.nuspec b/src/EFCore.Tasks/EFCore.Tasks.nuspec
deleted file mode 100644
index 1bdc73455cf..00000000000
--- a/src/EFCore.Tasks/EFCore.Tasks.nuspec
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    $CommonMetadataElements$
-    <dependencies>
-      <group targetFramework="$NetCurrent$">
-        <dependency id="Microsoft.EntityFrameworkCore.Design" version="$Version$" />
-      </group>
-    </dependencies>
-    <readme>docs\PACKAGE.md</readme>
-  </metadata>
-  <files>
-    $CommonFileElements$
-    <file src="PACKAGE.md" target="docs\" />
-    <file src="$OutputPath$$NetCurrent$\$AssemblyName$.dll" target="tasks\$NetCurrent$\" />
-    <file src="$OutputPath$$NetCurrent$\$AssemblyName$.pdb" target="tasks\$NetCurrent$\" />
-    <file src="$OutputPath$$NetCurrent$\$AssemblyName$.deps.json" target="tasks\$NetCurrent$\" />
-    <file src="$OutputPath$$NetFrameworkToolCurrent$\*" target="tasks\$NetFrameworkToolCurrent$\" />
-    <file src="$EFOutputPath$\*" target="tools\$NetCurrent$\" />
-    <file src="buildTransitive\*" target="buildTransitive\" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/EFCore.Tasks/PACKAGE.md b/src/EFCore.Tasks/README.md
similarity index 100%
rename from src/EFCore.Tasks/PACKAGE.md
rename to src/EFCore.Tasks/README.md
diff --git a/src/EFCore.Tasks/lib/net10.0/_._ b/src/EFCore.Tasks/lib/net10.0/_._
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/EFCore.Templates/PACKAGE.md b/src/EFCore.Templates/README.md
similarity index 100%
rename from src/EFCore.Templates/PACKAGE.md
rename to src/EFCore.Templates/README.md
diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj
index 19427b0c1c2..9d4949fc81f 100644
--- a/src/EFCore.Tools/EFCore.Tools.csproj
+++ b/src/EFCore.Tools/EFCore.Tools.csproj
@@ -1,18 +1,10 @@
-<Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+<Project Sdk="Microsoft.Build.NoTargets">
 
   <PropertyGroup>
     <TargetFramework>$(NetMinimum)</TargetFramework>
     <PackageId>Microsoft.EntityFrameworkCore.Tools</PackageId>
-    <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
     <DevelopmentDependency>true</DevelopmentDependency>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeSource>false</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
     <Description>Entity Framework Core Tools for the NuGet Package Manager Console in Visual Studio.
 
 Enables these commonly used commands:
@@ -26,43 +18,58 @@ Remove-Migration
 Scaffold-DbContext
 Script-Migration
 Update-Database
-  </Description>
-    <CheckEolTargetFramework>False</CheckEolTargetFramework>
+    </Description>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddPackContent</TargetsForTfmSpecificContentInPackage>
+    <!-- Necessary to include pdbs -->
+    <IncludeBuildOutput>true</IncludeBuildOutput>
+    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ef\ef.csproj" />
+    <!-- Referencing a stub project so that this project can continue targeting NetMinimum but expose a
+         package dependency to the Design package that targets the current TFM only. -->
+    <ProjectReference Include="..\stubs\EFCore.Design.csproj" ReferenceOutputAssembly="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <GeneratedContent Include="*.psd1.in" />
   </ItemGroup>
 
-  <!--
-    Workaround for insufficient support for tools packages by NuGet Pack: https://github.com/NuGet/Home/issues/6321.
-  -->
-  <Target Name="SetPackageProperties" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="Build">
-    <ItemGroup>
-      <NuspecProperty Include="configuration=$(Configuration)" />
-      <NuspecProperty Include="intermediateOutputPath=$(IntermediateOutputPath)" />
-      <NuspecProperty Include="targetFramework=$(TargetFramework)" />
-    </ItemGroup>
-  </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
   <Target Name="GenerateContent"
-    BeforeTargets="GenerateNuspec"
     Inputs="$(MSBuildAllProjects);@(GeneratedContent)"
-    Outputs="@(GeneratedContent->'$(IntermediateOutputPath)%(FileName)'">
-    <GenerateFileFromTemplate TemplateFile="%(GeneratedContent.Identity)" Properties="VersionPrefix=$(VersionPrefix)" OutputPath="$(IntermediateOutputPath)%(FileName)" />
+    Outputs="@(GeneratedContent->'$(IntermediateOutputPath)%(FileName)')">
+    <GenerateFileFromTemplate
+      TemplateFile="%(GeneratedContent.Identity)"
+      Properties="VersionPrefix=$(VersionPrefix)"
+      OutputPath="$(IntermediateOutputPath)%(FileName)" />
   </Target>
 
-  <Target Name="Compile" />
-  <Target Name="CopyFilesToOutputDirectory" />
+  <Target Name="AddPackContent" DependsOnTargets="GenerateContent">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="lib/**/*" PackagePath="lib/" />
+      <TfmSpecificPackageFile Include="tools/**/*" PackagePath="tools/" />
+      <TfmSpecificPackageFile Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools/" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/*" PackagePath="tools/net472/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/*" PackagePath="tools/net472/win-x86" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/*" PackagePath="tools/net472/win-arm64" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))"
+                                   TargetPath="/%(TfmSpecificPackageFile.PackagePath)/%(Filename)%(Extension)"
+                                   TargetFramework="$(TargetFramework)"
+                                   Condition="'$(IncludeSymbols)' == 'true'" />
+      <!-- Remove symbols from the non symbol package. -->
+      <TfmSpecificPackageFile Remove="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" />
+    </ItemGroup>
+  </Target>
 
 </Project>
diff --git a/src/EFCore.Tools/EFCore.Tools.nuspec b/src/EFCore.Tools/EFCore.Tools.nuspec
deleted file mode 100644
index 7201a3eff73..00000000000
--- a/src/EFCore.Tools/EFCore.Tools.nuspec
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    $CommonMetadataElements$
-    <dependencies>
-      <group targetFramework="$targetFramework$">
-        <dependency id="Microsoft.EntityFrameworkCore.Design" version="8.0.0" />
-      </group>
-    </dependencies>
-    <readme>docs\PACKAGE.md</readme>
-  </metadata>
-  <files>
-    $CommonFileElements$
-    <file src="lib\**\*" target="lib/" />
-    <file src="PACKAGE.md" target="docs\" />
-    <file src="tools\**\*" target="tools/" />
-    <file src="$intermediateOutputPath$*.psd1" target="tools/" />
-    <file src="../../artifacts/bin/ef/$configuration$/net472/ef.exe" target="tools/net472/any/" />
-    <file src="../../artifacts/bin/ef/$configuration$/net472/ef.pdb" target="tools/net472/any/" />
-    <file src="../../artifacts/bin/ef/x86/$configuration$/net472/ef.exe" target="tools/net472/win-x86/" />
-    <file src="../../artifacts/bin/ef/x86/$configuration$/net472/ef.pdb" target="tools/net472/win-x86/" />
-    <file src="../../artifacts/bin/ef/ARM64/$configuration$/net472/ef.exe" target="tools/net472/win-arm64/" />
-    <file src="../../artifacts/bin/ef/ARM64/$configuration$/net472/ef.pdb" target="tools/net472/win-arm64/" />
-    <file src="../../artifacts/bin/ef/$configuration$/$targetFramework$/ef.dll" target="tools/$targetFramework$/any/" />
-    <file src="../../artifacts/bin/ef/$configuration$/$targetFramework$/ef.pdb" target="tools/$targetFramework$/any/" />
-    <file src="../../artifacts/bin/ef/$configuration$/$targetFramework$/ef.runtimeconfig.json" target="tools/$targetFramework$/any/" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/EFCore.Tools/PACKAGE.md b/src/EFCore.Tools/README.md
similarity index 100%
rename from src/EFCore.Tools/PACKAGE.md
rename to src/EFCore.Tools/README.md
diff --git a/src/EFCore/PACKAGE.md b/src/EFCore/README.md
similarity index 100%
rename from src/EFCore/PACKAGE.md
rename to src/EFCore/README.md
diff --git a/src/Microsoft.Data.Sqlite/PACKAGE.md b/src/Microsoft.Data.Sqlite/README.md
similarity index 100%
rename from src/Microsoft.Data.Sqlite/PACKAGE.md
rename to src/Microsoft.Data.Sqlite/README.md
diff --git a/src/dotnet-ef/PACKAGE.md b/src/dotnet-ef/README.md
similarity index 100%
rename from src/dotnet-ef/PACKAGE.md
rename to src/dotnet-ef/README.md
diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj
index 598f35dde1b..9e103d02378 100644
--- a/src/dotnet-ef/dotnet-ef.csproj
+++ b/src/dotnet-ef/dotnet-ef.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <Description>
       Entity Framework Core Tools for the .NET Command-Line Interface.
 
@@ -13,18 +14,14 @@
       dotnet ef database drop
       dotnet ef database update
     </Description>
-    <TargetFramework>$(NetMinimum)</TargetFramework>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
     <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm64</PackAsToolShimRuntimeIdentifiers>
-    <!-- Because this project uses a custom nuspec, this is necessary to ensure the generated shims are in the publish directory. -->
-    <PackagedShimOutputRootDirectory>$(OutDir)</PackagedShimOutputRootDirectory>
     <RootNamespace>Microsoft.EntityFrameworkCore.Tools</RootNamespace>
-    <IncludeSource>false</IncludeSource>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <RollForward>Major</RollForward>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset</CodeAnalysisRuleSet>
     <ImplicitUsings>true</ImplicitUsings>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddEfProjectOutput</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
   <ItemGroup>
@@ -48,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -70,26 +67,17 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="SetPackageProperties" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup">
-    <PropertyGroup>
-      <!-- Make sure we create a symbols.nupkg. -->
-      <IncludeSymbols>true</IncludeSymbols>
-    </PropertyGroup>
-
+  <!-- PDBs are currently always included as PackAsTool packages don't support excluding them.
+       https://github.com/dotnet/sdk/issues/53226 -->
+  <Target Name="AddEfProjectOutput">
     <ItemGroup>
-      <NuspecProperty Include="targetFramework=$(TargetFramework)" />
-      <NuspecProperty Include="SettingsFile=$(_ToolsSettingsFilePath)" />
-      <!-- https://github.com/dotnet/msbuild/issues/10715. %2A replaces * working around an issue building Linux. -->
-      <NuspecProperty Include="Output=$(PublishDir)%2A%2A/%2A" />
-      <NuspecProperty Include="OutputBinary=..\..\artifacts\bin\ef\$(Configuration)\$(TargetFramework)\ef.dll" />
-      <NuspecProperty Include="OutputRuntimeConfig=..\..\artifacts\bin\ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" />
-      <NuspecProperty Include="OutputSymbol=..\..\artifacts\bin\ef\$(Configuration)\$(TargetFramework)\ef.pdb" />
-      <NuspecProperty Include="OutputExe=..\..\artifacts\bin\ef\$(Configuration)\net472\ef.exe" />
-      <NuspecProperty Include="OutputExeSymbol=..\..\artifacts\bin\ef\$(Configuration)\net472\ef.pdb" />
-      <NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net472\ef.exe" />
-      <NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net472\ef.pdb" />
-      <NuspecProperty Include="OutputARM64Exe=..\..\artifacts\bin\ef\ARM64\$(Configuration)\net472\ef.exe" />
-      <NuspecProperty Include="OutputARM64ExeSymbol=..\..\artifacts\bin\ef\ARM64\$(Configuration)\net472\ef.pdb" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/*" PackagePath="tools/$(TargetFramework)/any/tools/net472/any" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/*" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-x86" />
+      <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/*" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-arm64" />
     </ItemGroup>
   </Target>
+
 </Project>
\ No newline at end of file
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
deleted file mode 100644
index 40cfb6c7f26..00000000000
--- a/src/dotnet-ef/dotnet-ef.nuspec
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    $CommonMetadataElements$
-    <packageTypes>
-      <packageType name="DotnetTool" />
-    </packageTypes>
-    <readme>docs\PACKAGE.md</readme>
-  </metadata>
-
-  <files>
-    $CommonFileElements$
-    <file src="PACKAGE.md" target="docs\" />
-    <file src="$SettingsFile$" target="tools\$targetFramework$\any" />
-    <file src="$Output$" target="tools\$targetFramework$\any" />
-    <file src="$OutputBinary$" target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
-    <file src="$OutputRuntimeConfig$" target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
-    <file src="$OutputSymbol$" target="tools\$targetFramework$\any\tools\$targetFramework$\any" />
-    <file src="$OutputExe$" target="tools\$targetFramework$\any\tools\net472\any" />
-    <file src="$OutputExeSymbol$" target="tools\$targetFramework$\any\tools\net472\any" />
-    <file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net472\win-x86" />
-    <file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net472\win-x86" />
-    <file src="$OutputARM64Exe$" target="tools\$targetFramework$\any\tools\net472\win-arm64" />
-    <file src="$OutputARM64ExeSymbol$" target="tools\$targetFramework$\any\tools\net472\win-arm64" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/stubs/EFCore.Design.csproj b/src/stubs/EFCore.Design.csproj
new file mode 100644
index 00000000000..0d45e0f0ee8
--- /dev/null
+++ b/src/stubs/EFCore.Design.csproj
@@ -0,0 +1,22 @@
+<Project>
+
+  <!-- This is hack that allows EFCore.Tools to expose a package dependency
+       to the Design package that targets the current TFM only. -->
+
+  <PropertyGroup>
+    <OutDirName>$(MSBuildProjectName)$([System.IO.Path]::DirectorySeparatorChar)stub</OutDirName>
+  </PropertyGroup>
+
+  <Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <AssemblyName>Microsoft.EntityFrameworkCore.Design</AssemblyName>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.targets" />
+
+</Project>
\ No newline at end of file
diff --git a/test/EFCore.AspNet.Specification.Tests/PACKAGE.md b/test/EFCore.AspNet.Specification.Tests/README.md
similarity index 100%
rename from test/EFCore.AspNet.Specification.Tests/PACKAGE.md
rename to test/EFCore.AspNet.Specification.Tests/README.md
diff --git a/test/EFCore.Relational.Specification.Tests/PACKAGE.md b/test/EFCore.Relational.Specification.Tests/README.md
similarity index 100%
rename from test/EFCore.Relational.Specification.Tests/PACKAGE.md
rename to test/EFCore.Relational.Specification.Tests/README.md
diff --git a/test/EFCore.Specification.Tests/PACKAGE.md b/test/EFCore.Specification.Tests/README.md
similarity index 100%
rename from test/EFCore.Specification.Tests/PACKAGE.md
rename to test/EFCore.Specification.Tests/README.md