diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
index 981fa72f5c4..6bf55e95753 100644
--- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj
+++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj
@@ -5,11 +5,18 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Microsoft.EntityFrameworkCore.Analyzers</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+
+    <!-- Causes the dll/pdb to be placed in the analyzers/dotnet/cs folder in the nupkg instead of lib -->
+    <BuildOutputTargetFolder>analyzers/dotnet/cs</BuildOutputTargetFolder>
+
+    <!-- A slightly hacky way to place the dll/pdbs directly under analyzers/dotnet/cs, and not under a netstandard2.0 subfolder -->
+    <IsTool>true</IsTool>
+
+    <IncludeSymbols>true</IncludeSymbols>
     <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>
@@ -34,19 +41,6 @@
     <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
   </ItemGroup>
 
-  <Target Name="SetPackageProperties" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="Build">
-    <PropertyGroup>
-      <!-- Make sure we create a symbols.nupkg. -->
-      <IncludeSymbols>true</IncludeSymbols>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <NuspecProperty Include="targetFramework=$(TargetFramework)" />
-      <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
-      <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
     <AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec b/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
deleted file mode 100644
index 0a1bd7e678d..00000000000
--- a/src/EFCore.Analyzers/EFCore.Analyzers.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    $CommonMetadataElements$
-    <dependencies>
-      <group targetFramework=".NETStandard2.0" />
-    </dependencies>
-    <readme>docs\PACKAGE.md</readme>
-  </metadata>
-
-  <files>
-    $CommonFileElements$
-    <file src="PACKAGE.md" target="docs\" />
-    <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
-    <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/EFCore.Analyzers/PACKAGE.md b/src/EFCore.Analyzers/README.md
similarity index 100%
rename from src/EFCore.Analyzers/PACKAGE.md
rename to src/EFCore.Analyzers/README.md