diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 0e80416..56ffb9e 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -32,7 +32,15 @@
       "Bash(lsof:*)",
       "Bash(xargs kill -9)",
       "Bash(dotnet run:*)",
-      "Bash(find:*)"
+      "Bash(find:*)",
+      "Bash(dotnet pack:*)",
+      "Bash(unzip:*)",
+      "WebFetch(domain:andrewlock.net)",
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:stackoverflow.com)",
+      "WebFetch(domain:www.kenmuse.com)",
+      "WebFetch(domain:blog.rsuter.com)",
+      "WebFetch(domain:natemcmaster.com)"
     ],
     "deny": [],
     "ask": []
diff --git a/Svrnty.CQRS.Grpc.Generators/Svrnty.CQRS.Grpc.Generators.csproj b/Svrnty.CQRS.Grpc.Generators/Svrnty.CQRS.Grpc.Generators.csproj
index 6889fd4..c9785a7 100644
--- a/Svrnty.CQRS.Grpc.Generators/Svrnty.CQRS.Grpc.Generators.csproj
+++ b/Svrnty.CQRS.Grpc.Generators/Svrnty.CQRS.Grpc.Generators.csproj
@@ -7,7 +7,10 @@
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <IsPackable>true</IsPackable>
     <DevelopmentDependency>true</DevelopmentDependency>
+    <!-- Don't include build output in lib/ - this is an analyzer/generator package -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
 
     <Company>Svrnty</Company>
@@ -20,11 +23,8 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Description>Source Generator for Svrnty.CQRS.Grpc - generates .proto files and gRPC service implementations from commands and queries</Description>
 
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <IncludeSymbols>true</IncludeSymbols>
-    <IncludeSource>true</IncludeSource>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <!-- Disable symbol packages for analyzer/generator packages (prevents NU5017 error) -->
+    <IncludeSymbols>false</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,11 +39,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Package as analyzer -->
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-
-    <!-- Also package as build task -->
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="build" Visible="false" />
+    <!-- Include targets and props files in both build and buildTransitive for proper dependency flow -->
     <None Include="build\Svrnty.CQRS.Grpc.Generators.targets" Pack="true" PackagePath="build" />
+    <None Include="build\Svrnty.CQRS.Grpc.Generators.targets" Pack="true" PackagePath="buildTransitive" />
+    <None Include="build\Svrnty.CQRS.Grpc.Generators.props" Pack="true" PackagePath="build" />
+    <None Include="build\Svrnty.CQRS.Grpc.Generators.props" Pack="true" PackagePath="buildTransitive" />
   </ItemGroup>
+
+  <!-- Use the recommended pattern to include the generator DLL in the package -->
+  <PropertyGroup>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeGeneratorAssemblyInPackage</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+
+  <Target Name="IncludeGeneratorAssemblyInPackage">
+    <ItemGroup>
+      <!-- Include in analyzers folder for Roslyn source generator -->
+      <TfmSpecificPackageFile Include="$(OutputPath)$(AssemblyName).dll" PackagePath="analyzers/dotnet/cs" />
+      <!-- Include in build folder for MSBuild task (WriteProtoFileTask) -->
+      <TfmSpecificPackageFile Include="$(OutputPath)$(AssemblyName).dll" PackagePath="build" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/Svrnty.CQRS.Grpc.Generators/build/Svrnty.CQRS.Grpc.Generators.props b/Svrnty.CQRS.Grpc.Generators/build/Svrnty.CQRS.Grpc.Generators.props
new file mode 100644
index 0000000..aa8cc45
--- /dev/null
+++ b/Svrnty.CQRS.Grpc.Generators/build/Svrnty.CQRS.Grpc.Generators.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <!-- Marker to indicate Svrnty.CQRS.Grpc.Generators is referenced -->
+    <SvrntyCqrsGrpcGeneratorsVersion>$(SvrntyCqrsGrpcGeneratorsVersion)</SvrntyCqrsGrpcGeneratorsVersion>
+  </PropertyGroup>
+</Project>