From 941cf5143e9de3362a58f59718b4b8f73a6b8a5c Mon Sep 17 00:00:00 2001
From: Shawn LaMountain <slamountain@gmail.com>
Date: Fri, 20 Jun 2025 22:23:24 -0400
Subject: [PATCH 1/4] Including Shared libraries in NuGet package

---
 .../ThunderDesign.Net-PCL.Threading.Shared.csproj | 15 +++++++++++++--
 src/ThunderDesign.Net-PCL.Threading.nuspec.in     |  6 ++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

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 5e7f346..0fa9fec 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
@@ -1,8 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net6.0;net8.0</TargetFrameworks>
-	  <RootNamespace>ThunderDesign.Net_PCL.Threading.Shared</RootNamespace>
+    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net6.0;net8.0</TargetFrameworks>
+    <RootNamespace>ThunderDesign.Net_PCL.Threading.Shared</RootNamespace>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <PackageId>ThunderDesign.Net-PCL.Threading.Shared</PackageId>
+    <Authors>Thunder Design</Authors>
+    <Description>Threading interfaces and utilities for ThunderDesign cross-platform libraries.</Description>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <None Include="**\*.config" Pack="true" PackagePath="contentFiles\any\any\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ThunderDesign.Net-PCL.Threading.nuspec.in b/src/ThunderDesign.Net-PCL.Threading.nuspec.in
index a02208e..bf97b1c 100644
--- a/src/ThunderDesign.Net-PCL.Threading.nuspec.in
+++ b/src/ThunderDesign.Net-PCL.Threading.nuspec.in
@@ -30,6 +30,12 @@
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net461/ThunderDesign.Net-PCL.Threading.dll" target="lib/net461/" />
 		<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net6.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net6.0/" />
 		<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.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/" />
+		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net461/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net461/" />
+		<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net6.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net6.0/" />
+		<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.SourceGenerators/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.SourceGenerators.dll" target="analyzers/dotnet/cs/" />
 		<file src="README.md" target="" />
 	</files>

From b32aceb713ab8c9e797f7c950670c7736b43a954 Mon Sep 17 00:00:00 2001
From: Shawn LaMountain <98920689+ShawnLaMountain@users.noreply.github.com>
Date: Fri, 20 Jun 2025 22:31:19 -0400
Subject: [PATCH 2/4] Update CD.yml for Testing

---
 .github/workflows/CD.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 7cd14ce..fc36866 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -1,7 +1,7 @@
 name: CD
 
 on:
-  # workflow_dispatch:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -61,16 +61,16 @@ jobs:
       shell: pwsh
 
     - name: Create NuGet Package
-      # run: nuget pack ThunderDesign.Net-PCL.nuspec -Version 1.1.4 -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
-      run: nuget pack ThunderDesign.Net-PCL.nuspec -Version ${{ github.event.release.tag_name }} -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
+      run: nuget pack ThunderDesign.Net-PCL.nuspec -Version 2.0.0.1 -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
+      # run: nuget pack ThunderDesign.Net-PCL.nuspec -Version ${{ github.event.release.tag_name }} -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
       
     - name: Archive NuGet Package
       uses: actions/upload-artifact@v4
       with:
-        # name: Package_${{ env.FILE_NAME}}.1.1.4
-        # path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.1.1.4.nupkg
-        name: Package_${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}
-        path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg
+        name: Package_${{ env.FILE_NAME}}.2.0.0.1
+        path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.2.0.0.1.nupkg
+        # name: Package_${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}
+        # path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg
 
-    - name: Publish NuGet Package
-      run: nuget push ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_API_KEY }}
+    # - name: Publish NuGet Package
+      # run: nuget push ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_API_KEY }}

From 37bd30cd9ab447c69cf66509a9e03da527c2d2f6 Mon Sep 17 00:00:00 2001
From: Shawn LaMountain <slamountain@gmail.com>
Date: Fri, 20 Jun 2025 23:47:11 -0400
Subject: [PATCH 3/4] Updating Shared project to remove all .cs files. Was
 causing duplicate errors

---
 .../ThunderDesign.Net-PCL.Threading.Shared.csproj                | 1 -
 1 file changed, 1 deletion(-)

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 0fa9fec..c63318e 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
@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="**\*.cs" />
     <None Include="**\*.config" Pack="true" PackagePath="contentFiles\any\any\" />
   </ItemGroup>
 

From 1733bc32a6a3846cac9049e18c5f854a97b8e005 Mon Sep 17 00:00:00 2001
From: Shawn LaMountain <98920689+ShawnLaMountain@users.noreply.github.com>
Date: Fri, 20 Jun 2025 23:59:51 -0400
Subject: [PATCH 4/4] Update CD.yml for production

---
 .github/workflows/CD.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index fc36866..7cd14ce 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -1,7 +1,7 @@
 name: CD
 
 on:
-  workflow_dispatch:
+  # workflow_dispatch:
   release:
     types: [published]
 
@@ -61,16 +61,16 @@ jobs:
       shell: pwsh
 
     - name: Create NuGet Package
-      run: nuget pack ThunderDesign.Net-PCL.nuspec -Version 2.0.0.1 -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
-      # run: nuget pack ThunderDesign.Net-PCL.nuspec -Version ${{ github.event.release.tag_name }} -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
+      # run: nuget pack ThunderDesign.Net-PCL.nuspec -Version 1.1.4 -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
+      run: nuget pack ThunderDesign.Net-PCL.nuspec -Version ${{ github.event.release.tag_name }} -OutputDirectory ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
       
     - name: Archive NuGet Package
       uses: actions/upload-artifact@v4
       with:
-        name: Package_${{ env.FILE_NAME}}.2.0.0.1
-        path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.2.0.0.1.nupkg
-        # name: Package_${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}
-        # path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg
+        # name: Package_${{ env.FILE_NAME}}.1.1.4
+        # path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.1.1.4.nupkg
+        name: Package_${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}
+        path: ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg
 
-    # - name: Publish NuGet Package
-      # run: nuget push ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_API_KEY }}
+    - name: Publish NuGet Package
+      run: nuget push ${{ env.PACKAGE_OUTPUT_DIRECTORY}}\${{ env.FILE_NAME}}.${{ github.event.release.tag_name }}.nupkg -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_API_KEY }}