From 04b8fa08908e5ed5ffc9ae61ce4272371ccfec09 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 09:53:36 -0800
Subject: [PATCH 1/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 833637693..0c08e411f 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -53,16 +53,17 @@ jobs:
 
       - name: Stage Sentry
         run: |
-          New-Item -ItemType Directory -Path sentry-native\bin\win64 -Force | Out-Null
-          New-Item -ItemType Directory -Path sentry-native\include -Force | Out-Null
-          New-Item -ItemType Directory -Path sentry-native\lib\win64 -Force | Out-Null
-          Copy-Item include\sentry.h sentry-native\include\
-          Copy-Item out\RelWithDebInfo\sentry.dll sentry-native\bin\win64\
-          Copy-Item out\RelWithDebInfo\sentry.pdb sentry-native\bin\win64\
-          Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_wer.dll sentry-native\bin\win64\
-          Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_wer.pdb sentry-native\bin\win64\
-          Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_handler.exe sentry-native\bin\win64\
-          Copy-Item out\RelWithDebInfo\sentry.lib sentry-native\lib\win64\
+          cmake --install out --config RelWithDebInfo --prefix sentry-native
+          # New-Item -ItemType Directory -Path sentry-native\bin\win64 -Force | Out-Null
+          # New-Item -ItemType Directory -Path sentry-native\include -Force | Out-Null
+          # New-Item -ItemType Directory -Path sentry-native\lib\win64 -Force | Out-Null
+          # Copy-Item include\sentry.h sentry-native\include\
+          # Copy-Item out\RelWithDebInfo\sentry.dll sentry-native\bin\win64\
+          # Copy-Item out\RelWithDebInfo\sentry.pdb sentry-native\bin\win64\
+          # Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_wer.dll sentry-native\bin\win64\
+          # Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_wer.pdb sentry-native\bin\win64\
+          # Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_handler.exe sentry-native\bin\win64\
+          # Copy-Item out\RelWithDebInfo\sentry.lib sentry-native\lib\win64\
 
       - uses: actions/upload-artifact@v3
         with:

From 4ed2f026bd44e0159e170b1a6cae0d8ec8f47683 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 10:57:33 -0800
Subject: [PATCH 2/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 0c08e411f..3b9242d78 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -52,18 +52,7 @@ jobs:
         run: cmake --build out --config RelWithDebInfo
 
       - name: Stage Sentry
-        run: |
-          cmake --install out --config RelWithDebInfo --prefix sentry-native
-          # New-Item -ItemType Directory -Path sentry-native\bin\win64 -Force | Out-Null
-          # New-Item -ItemType Directory -Path sentry-native\include -Force | Out-Null
-          # New-Item -ItemType Directory -Path sentry-native\lib\win64 -Force | Out-Null
-          # Copy-Item include\sentry.h sentry-native\include\
-          # Copy-Item out\RelWithDebInfo\sentry.dll sentry-native\bin\win64\
-          # Copy-Item out\RelWithDebInfo\sentry.pdb sentry-native\bin\win64\
-          # Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_wer.dll sentry-native\bin\win64\
-          # Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_wer.pdb sentry-native\bin\win64\
-          # Copy-Item out\crashpad_build\handler\RelWithDebInfo\crashpad_handler.exe sentry-native\bin\win64\
-          # Copy-Item out\RelWithDebInfo\sentry.lib sentry-native\lib\win64\
+        run: cmake --install out --config RelWithDebInfo --prefix sentry-native
 
       - uses: actions/upload-artifact@v3
         with:

From ef51d6a3713c23b100f6d93644e8b42b2f2570a9 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 10:58:29 -0800
Subject: [PATCH 3/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 3b9242d78..2d99b37b0 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -52,7 +52,7 @@ jobs:
         run: cmake --build out --config RelWithDebInfo
 
       - name: Stage Sentry
-        run: cmake --install out --config RelWithDebInfo --prefix sentry-native
+        run: cmake --install out --config RelWithDebInfo --prefix sentry-native-development/usr
 
       - uses: actions/upload-artifact@v3
         with:

From cd740dec81b36ce2d6003f2dd3cb970f82aab9ac Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 11:51:11 -0800
Subject: [PATCH 4/9] GHA: add packaging step

Add initial packaging step for the nupkg
---
 .github/workflows/bcny-ci.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 2d99b37b0..055464c50 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -58,3 +58,37 @@ jobs:
         with:
           name: sentry-native-windows-${{ matrix.arch }}
           path: sentry-native
+
+      - run: |
+          $suffix = "${{ matrix.arch }}".ToLower()
+          @"
+          <?xml version="1.0" encoding="utf-8"?>
+          <package xmlns="http://schemas.microsoft.com/packaging/20210/07/nuspec.xsd">
+            <metadata>
+              <id>io.sentry.sentry-native.$suffix</id>
+              <version>0.0.0.0</version>
+              <title>Sentry Native SDK</title>
+              <description>C++ Sentry Native SDK</description>
+              <authors>Functional Software, Inc.</authors>
+              <projectUrl>https://github.com/getsentry/sentry-native</projectUrl>
+              <repository type="git" url="https://github.com/getsentry/sentry-native" branch="main" />
+            </metadata>
+            <files>
+              <file src="$DESTDIR$\bin\crashpad_handler.exe" target="bin" />
+              <file src="$DESTDIR$\bin\crashpad_handler.pdb" target="bin" />
+              <file src="$DESTDIR$\bin\crashpad_wer.dll" target="bin" />
+              <file src="$DESTDIR$\bin\crashpad_wer.pdb" target="bin" />
+              <file src="$DESTDIR$\bin\sentry.dll" target="bin" />
+              <file src="$DESTDIR$\bin\sentry.pdb" target="bin" />
+              <file src="$DESTDIR$\lib\sentry.lib" target="lib" />
+              <file src="$DESTDIR$\include\sentry.h" target="include" />
+            </files>
+          </package>
+          "@ | Out-File -Encoding UTF8 sentry.nuspec
+          nuget pack -Properties DESTDIR=sentry-native-development\usr -Suffix (git log -1 --format=%h) sentry.nuspec
+        shell: pwsh
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: windows-${{ matrix.arch }}.nupkg
+          path: sentry.nupkg

From fb003c41018c99cbe91989c339d782bc648cd0cb Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 12:37:47 -0800
Subject: [PATCH 5/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 6a5fff0bb..656c20e7e 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -63,7 +63,7 @@ jobs:
           $suffix = "${{ matrix.arch }}".ToLower()
           @"
           <?xml version="1.0" encoding="utf-8"?>
-          <package xmlns="http://schemas.microsoft.com/packaging/20210/07/nuspec.xsd">
+          <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
             <metadata>
               <id>io.sentry.sentry-native.$suffix</id>
               <version>0.0.0.0</version>

From 4d5e145f756b6345aa8f1e0870708a9eccef4432 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 12:49:18 -0800
Subject: [PATCH 6/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 656c20e7e..dd2c9b4ae 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -74,14 +74,14 @@ jobs:
               <repository type="git" url="https://github.com/getsentry/sentry-native" branch="main" />
             </metadata>
             <files>
-              <file src="$DESTDIR$\bin\crashpad_handler.exe" target="bin" />
-              <file src="$DESTDIR$\bin\crashpad_handler.pdb" target="bin" />
-              <file src="$DESTDIR$\bin\crashpad_wer.dll" target="bin" />
-              <file src="$DESTDIR$\bin\crashpad_wer.pdb" target="bin" />
-              <file src="$DESTDIR$\bin\sentry.dll" target="bin" />
-              <file src="$DESTDIR$\bin\sentry.pdb" target="bin" />
-              <file src="$DESTDIR$\lib\sentry.lib" target="lib" />
-              <file src="$DESTDIR$\include\sentry.h" target="include" />
+              <file src="`$DESTDIR`$\bin\crashpad_handler.exe" target="bin" />
+              <file src="`$DESTDIR`$\bin\crashpad_handler.pdb" target="bin" />
+              <file src="`$DESTDIR`$\bin\crashpad_wer.dll" target="bin" />
+              <file src="`$DESTDIR`$\bin\crashpad_wer.pdb" target="bin" />
+              <file src="`$DESTDIR`$\bin\sentry.dll" target="bin" />
+              <file src="`$DESTDIR`$\bin\sentry.pdb" target="bin" />
+              <file src="`$DESTDIR`$\lib\sentry.lib" target="lib" />
+              <file src="`$DESTDIR`$\include\sentry.h" target="include" />
             </files>
           </package>
           "@ | Out-File -Encoding UTF8 sentry.nuspec

From f61287b5f160bd4a1effe513a85e7c6836196ac5 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 13:18:04 -0800
Subject: [PATCH 7/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index dd2c9b4ae..0e42fa898 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -59,13 +59,14 @@ jobs:
           name: sentry-native-windows-${{ matrix.arch }}
           path: sentry-native-development
 
-      - run: |
+      - name: Package Sentry
+        run: |
           $suffix = "${{ matrix.arch }}".ToLower()
           @"
           <?xml version="1.0" encoding="utf-8"?>
           <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
             <metadata>
-              <id>io.sentry.sentry-native.$suffix</id>
+              <id>io.sentry.sentry-native.win.$suffix</id>
               <version>0.0.0.0</version>
               <title>Sentry Native SDK</title>
               <description>C++ Sentry Native SDK</description>
@@ -91,4 +92,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: windows-${{ matrix.arch }}.nupkg
-          path: sentry.nupkg
+          path: io.sentry.sentry-native.win.arm64.0.0.0-*.nupkg

From 39aba28df66ab36b066f3a7bb16ed36df41fd517 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 30 Nov 2023 13:46:05 -0800
Subject: [PATCH 8/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 0e42fa898..623dcd506 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -92,4 +92,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: windows-${{ matrix.arch }}.nupkg
-          path: io.sentry.sentry-native.win.arm64.0.0.0-*.nupkg
+          path: io.sentry.sentry-native.win.*.0.0.0-*.nupkg

From 8815f7c6c935bde75d47c2cfa89d616b98957946 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Mon, 4 Dec 2023 16:15:56 -0800
Subject: [PATCH 9/9] Update bcny-ci.yml

---
 .github/workflows/bcny-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-ci.yml b/.github/workflows/bcny-ci.yml
index 623dcd506..36706408e 100644
--- a/.github/workflows/bcny-ci.yml
+++ b/.github/workflows/bcny-ci.yml
@@ -66,7 +66,7 @@ jobs:
           <?xml version="1.0" encoding="utf-8"?>
           <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
             <metadata>
-              <id>io.sentry.sentry-native.win.$suffix</id>
+              <id>io.sentry.sentry-native.win.crashpad.$suffix</id>
               <version>0.0.0.0</version>
               <title>Sentry Native SDK</title>
               <description>C++ Sentry Native SDK</description>