diff --git a/src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj b/src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj
index 162515e..99cd2d2 100644
--- a/src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj
+++ b/src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj
@@ -21,7 +21,7 @@
     <None Include="**\*.config" Pack="true" PackagePath="contentFiles\any\any\" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.0' AND '$(TargetFramework)' != 'netstandard1.3' ">
     <PackageReference Include="ThunderDesign.Net-PCL.ToolBox" Version="1.1.1" />
   </ItemGroup>
 
diff --git a/src/ThunderDesign.Net-PCL.Threading.nuspec.in b/src/ThunderDesign.Net-PCL.Threading.nuspec.in
index ea98328..ce4fc7a 100644
--- a/src/ThunderDesign.Net-PCL.Threading.nuspec.in
+++ b/src/ThunderDesign.Net-PCL.Threading.nuspec.in
@@ -15,16 +15,29 @@
 		<repository type="git" url="${{ env.REPOSITORY_URL }}" />
 		<readme>README.md</readme>
 		<dependencies>
-			<group targetFramework="netstandard1.0" />
+			<!-- Explicitly declare empty groups for netstandard1.x so they don't inherit the Toolkit -->			<group targetFramework="netstandard1.0" />
 			<group targetFramework="netstandard1.3" />
-			<group targetFramework="netstandard2.0" />
-			<group targetFramework="net6.0" />
-			<group targetFramework="net8.0" />
-			<group targetFramework="net9.0" />
-			<group targetFramework="net10.0" />
+
+			<!-- Require the Toolkit for everything else -->
+			<group targetFramework="netstandard2.0" >
+				<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
+			</group>
+			<group targetFramework="net6.0" >
+				<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
+			</group>
+			<group targetFramework="net8.0" >
+				<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
+			</group>
+			<group targetFramework="net9.0" >
+				<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
+			</group>
+			<group targetFramework="net10.0" >
+				<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
+			</group>
 		</dependencies>
 	</metadata>
 	<files>
+		<!-- Include main library output -->
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/netstandard1.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/netstandard1.0/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/netstandard1.3/ThunderDesign.Net-PCL.Threading.dll" target="lib/netstandard1.3/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/netstandard2.0/" />
@@ -32,6 +45,8 @@
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net8.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net8.0/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net9.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net9.0/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net10.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net10.0/" />
+
+		<!-- Include shared library output -->
 		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard1.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard1.0/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard1.3/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard1.3/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard2.0/" />
@@ -39,7 +54,11 @@
 		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net8.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net8.0/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net9.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net9.0/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net10.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net10.0/" />
+
+		<!-- The global Analyzer folder (safely guarded by csproj targeting limits) -->
 		<file src="src/ThunderDesign.Net-PCL.SourceGenerators/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.SourceGenerators.dll" target="analyzers/dotnet/cs/" />
+
+		<!-- Include the README -->
 		<file src="README.md" target="" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/src/ThunderDesign.Net-PCL.Threading/ThunderDesign.Net-PCL.Threading.csproj b/src/ThunderDesign.Net-PCL.Threading/ThunderDesign.Net-PCL.Threading.csproj
index 07bf8d8..43c7f17 100644
--- a/src/ThunderDesign.Net-PCL.Threading/ThunderDesign.Net-PCL.Threading.csproj
+++ b/src/ThunderDesign.Net-PCL.Threading/ThunderDesign.Net-PCL.Threading.csproj
@@ -16,8 +16,10 @@
 			<PackagePath>\</PackagePath>
 		</None>
 	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.0' AND '$(TargetFramework)' != 'netstandard1.3' ">
+		<ProjectReference Include="..\ThunderDesign.Net-PCL.SourceGenerators\ThunderDesign.Net-PCL.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\ThunderDesign.Net-PCL.SourceGenerators\ThunderDesign.Net-PCL.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'" />
 		<ProjectReference Include="..\ThunderDesign.Net-PCL.Threading.Shared\ThunderDesign.Net-PCL.Threading.Shared.csproj" />
 	</ItemGroup>