From 8ed72b39ea2daca439e8bbc9dca036d3967e5d6a Mon Sep 17 00:00:00 2001
From: Ivan Dlugos <dlugos.ivan@gmail.com>
Date: Mon, 21 Oct 2024 20:51:24 +0200
Subject: [PATCH 1/2] fix: windows powershell needs both unsafe 4.5.3 and 6.0.0

---
 ...ystem.Runtime.CompilerServices.Unsafe.4.properties} |  1 +
 ...System.Runtime.CompilerServices.Unsafe.6.properties |  4 ++++
 dependencies/download.ps1                              | 10 ++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)
 rename dependencies/{System.Runtime.CompilerServices.Unsafe.properties => System.Runtime.CompilerServices.Unsafe.4.properties} (56%)
 create mode 100644 dependencies/System.Runtime.CompilerServices.Unsafe.6.properties

diff --git a/dependencies/System.Runtime.CompilerServices.Unsafe.properties b/dependencies/System.Runtime.CompilerServices.Unsafe.4.properties
similarity index 56%
rename from dependencies/System.Runtime.CompilerServices.Unsafe.properties
rename to dependencies/System.Runtime.CompilerServices.Unsafe.4.properties
index c55567d..70e207a 100644
--- a/dependencies/System.Runtime.CompilerServices.Unsafe.properties
+++ b/dependencies/System.Runtime.CompilerServices.Unsafe.4.properties
@@ -1,3 +1,4 @@
+package = System.Runtime.CompilerServices.Unsafe
 version = 4.5.3
 assemblyVersion = 4.0.4.1
 licenseFile = LICENSE.TXT
diff --git a/dependencies/System.Runtime.CompilerServices.Unsafe.6.properties b/dependencies/System.Runtime.CompilerServices.Unsafe.6.properties
new file mode 100644
index 0000000..1e1224c
--- /dev/null
+++ b/dependencies/System.Runtime.CompilerServices.Unsafe.6.properties
@@ -0,0 +1,4 @@
+package = System.Runtime.CompilerServices.Unsafe
+version = 6.0.0
+assemblyVersion = 6.0.0.0
+licenseFile = LICENSE.TXT
diff --git a/dependencies/download.ps1 b/dependencies/download.ps1
index 4d0e8cb..39b685b 100644
--- a/dependencies/download.ps1
+++ b/dependencies/download.ps1
@@ -27,6 +27,7 @@ function Download([string] $dependency, [string] $TFM, [string] $targetTFM = $nu
         $assemblyVersion = $props.ContainsKey('assemblyVersion') ? $props.assemblyVersion : "$($props.version).0"
     }
 
+    $package = $props.ContainsKey('package') ? $props.package : $dependency
     $targetLibFile = "$libDir/$targetTFM/$dependency.dll"
     $targetVersionFile = "$libDir/$targetTFM/$dependency.version"
     $targetLicenseFile = "$libDir/$targetTFM/$dependency.license"
@@ -58,7 +59,7 @@ function Download([string] $dependency, [string] $TFM, [string] $targetTFM = $nu
         Remove-Item $targetLicenseFile -Force
     }
 
-    $archiveName = "$($dependency.ToLower()).$($props.version).nupkg"
+    $archiveName = "$($package.ToLower()).$($props.version).nupkg"
     $archiveFile = "$downloadDir/$archiveName"
 
     if (Test-Path $archiveFile)
@@ -67,8 +68,8 @@ function Download([string] $dependency, [string] $TFM, [string] $targetTFM = $nu
     }
     else
     {
-        Write-Output "Downloading $archiveName"
         $sourceUrl = "https://globalcdn.nuget.org/packages/$archiveName"
+        Write-Output "Downloading $sourceUrl"
         Invoke-WebRequest $sourceUrl -OutFile $archiveFile
     }
 
@@ -89,7 +90,7 @@ function Download([string] $dependency, [string] $TFM, [string] $targetTFM = $nu
 
     try
     {
-        extract "lib/$TFM/$dependency.dll" $targetLibFile
+        extract "lib/$TFM/$package.dll" $targetLibFile
         if ($props.ContainsKey('licenseFile'))
         {
             extract $props.licenseFile $targetLicenseFile
@@ -120,7 +121,8 @@ Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Collections.Immut
 Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Memory'
 Download -TFM 'net46' -TargetTFM 'net462' -Dependency 'System.Numerics.Vectors'
 Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Reflection.Metadata'
-Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Runtime.CompilerServices.Unsafe'
+Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Runtime.CompilerServices.Unsafe.4'
+Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Runtime.CompilerServices.Unsafe.6'
 Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Text.Encodings.Web'
 Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Text.Json'
 Download -TFM 'net461' -TargetTFM 'net462' -Dependency 'System.Threading.Tasks.Extensions'

From 595d4a3bc58ff9efec186d53104fbb20f61c987c Mon Sep 17 00:00:00 2001
From: Ivan Dlugos <dlugos.ivan@gmail.com>
Date: Mon, 21 Oct 2024 20:54:06 +0200
Subject: [PATCH 2/2] chore: update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6077c74..34d514a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,9 @@
 
 ### Fixes
 
-- StackTrace parsing on Windows Powershell 5.1 ([#50](https://github.com/getsentry/sentry-powershell/pull/50))
+- StackTrace parsing on Windows PowerShell 5.1 ([#50](https://github.com/getsentry/sentry-powershell/pull/50))
 - Fix out of bounds context for short scripts ([#58](https://github.com/getsentry/sentry-powershell/pull/58))
+- Windows PowerShell needs both unsafe 4.5.3 and 6.0.0 dll ([#61](https://github.com/getsentry/sentry-powershell/pull/61))
 
 ### Dependencies