From 73e7783d064c16a83db86066b03b2c1f72acb2be Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Tue, 22 Apr 2025 17:29:09 +0200
Subject: [PATCH 1/3] samples scripts

---
 Directory.Build.targets                       | 11 ++-
 scripts/samples-setup-apple-id.ps1            | 69 +++++++++++++++++++
 ...ions.ps1 => samples-setup-cli-options.ps1} |  0
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 scripts/samples-setup-apple-id.ps1
 rename scripts/{create-sentry-cli-options.ps1 => samples-setup-cli-options.ps1} (100%)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2e8431a21..f8cc75779 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -574,7 +574,16 @@ void PrintFailedTests(XElement element)
        dotnet msbuild /t:SetupSampleSentryCliOptions src/Sentry.Unity -->
   <Target Name="SetupSampleSentryCliOptions" AfterTargets="DownloadNativeSDKs" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' AND '$(SENTRY_AUTH_TOKEN)' != ''">
     <Message Importance="High" Text="Found environment variable 'SENTRY_AUTH_TOKEN'. Creating Sentry CLI options for sample project. " />
-    <Exec Command="pwsh &quot;$(RepoRoot)scripts/create-sentry-cli-options.ps1&quot;"/>
+    <Exec Command="pwsh &quot;$(RepoRoot)scripts/samples-setup-cli-options.ps1&quot;"/>
+  </Target>
+
+    <!-- Checks if the environment variable 'SENTRY_AUTH_TOKEN' has been set and creates the SentryCliOptions.asset for the sample project
+       This is meant for developers - so they don't have to configure the CLI options after each clean checkout (or git clean).
+       Gets automatically run after 'DownloadNativeSDKs'
+       dotnet msbuild /t:SetupSampleSentryCliOptions src/Sentry.Unity -->
+  <Target Name="SetupSampleAppleId" AfterTargets="SetupSampleSentryCliOptions" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' AND '$(APPLE_ID)' != ''">
+    <Message Importance="High" Text="Found environment variable 'APPLE_ID'. Setting Apple ID for sample project. " />
+    <Exec Command="pwsh &quot;$(RepoRoot)scripts/samples-setup-apple-id.ps1&quot;"/>
   </Target>
 
   <!--  Downloads native SDKs from the latest successful GitHub Actions workflow run.
diff --git a/scripts/samples-setup-apple-id.ps1 b/scripts/samples-setup-apple-id.ps1
new file mode 100644
index 000000000..67032d63e
--- /dev/null
+++ b/scripts/samples-setup-apple-id.ps1
@@ -0,0 +1,69 @@
+Set-StrictMode -Version latest
+$ErrorActionPreference = "Stop"
+
+Write-Output "Setting up Apple Developer Team ID from environment variable"
+
+$appleId = $Env:APPLE_ID
+
+if (-not $appleId)
+{
+    # Check if running on macOS
+    if ($IsOSX -or $IsMacOS -or $PSVersionTable.OS -like "*Darwin*")
+    {
+        Write-Output "APPLE_ID not set, attempting to detect from macOS system..."
+        
+        try {
+            # Try to get Team ID from code signing identities
+            $codesigningOutput = & xcrun security find-identity -v -p codesigning 2>$null
+            if ($codesigningOutput) {
+                # Extract Team ID from output using regex pattern matching
+                $match = [regex]::Match($codesigningOutput, '\(([A-Z0-9]{10})\)')
+                if ($match.Success) {
+                    $appleId = $match.Groups[1].Value
+                    Write-Output "Found Apple Developer Team ID: $appleId from code signing identity"
+                }
+            }
+            
+            # If first method failed, try another approach with certificates
+            if (-not $appleId) {
+                $certOutput = & security find-certificate -a -c "Apple Development" -p 2>$null | grep "OU=" 
+                if ($certOutput) {
+                    $match = [regex]::Match($certOutput, 'OU=([A-Z0-9]{10})')
+                    if ($match.Success) {
+                        $appleId = $match.Groups[1].Value
+                        Write-Output "Found Apple Developer Team ID: $appleId from certificate"
+                    }
+                }
+            }
+        }
+        catch {
+            Write-Output "Error attempting to detect Apple Developer Team ID: $_"
+        }
+    }
+    
+    if (-not $appleId)
+    {
+        Write-Error "APPLE_ID environment variable is not set and couldn't be detected automatically. Skipping..."
+        exit
+    }
+}
+
+$projectSettingsPath = "$PSScriptRoot/../samples/unity-of-bugs/ProjectSettings/ProjectSettings.asset"
+if (-not (Test-Path -Path $projectSettingsPath)) 
+{
+    Write-Error "ProjectSettings.asset not found at path: $projectSettingsPath"
+    exit
+}
+
+$content = Get-Content -Path $projectSettingsPath -Raw
+if ($content -match '(\s*)appleDeveloperTeamID:.*') 
+{
+    $updatedContent = $content -replace '(\s*)appleDeveloperTeamID:.*', "`${1}appleDeveloperTeamID: $appleId"
+    Set-Content -Path $projectSettingsPath -Value $updatedContent
+    Write-Output "Successfully updated appleDeveloperTeamID in ProjectSettings.asset"
+} 
+else 
+{
+    Write-Error "Could not find appleDeveloperTeamID property in ProjectSettings.asset"
+    exit
+}
diff --git a/scripts/create-sentry-cli-options.ps1 b/scripts/samples-setup-cli-options.ps1
similarity index 100%
rename from scripts/create-sentry-cli-options.ps1
rename to scripts/samples-setup-cli-options.ps1

From 0a9c83054a0d532a317cd55511a787cadca367de Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Tue, 22 Apr 2025 17:34:16 +0200
Subject: [PATCH 2/3] revert

---
 scripts/samples-setup-apple-id.ps1 | 46 +++---------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/scripts/samples-setup-apple-id.ps1 b/scripts/samples-setup-apple-id.ps1
index 67032d63e..a886049c3 100644
--- a/scripts/samples-setup-apple-id.ps1
+++ b/scripts/samples-setup-apple-id.ps1
@@ -3,51 +3,13 @@ $ErrorActionPreference = "Stop"
 
 Write-Output "Setting up Apple Developer Team ID from environment variable"
 
-$appleId = $Env:APPLE_ID
-
-if (-not $appleId)
+if (-not $Env:APPLE_ID)
 {
-    # Check if running on macOS
-    if ($IsOSX -or $IsMacOS -or $PSVersionTable.OS -like "*Darwin*")
-    {
-        Write-Output "APPLE_ID not set, attempting to detect from macOS system..."
-        
-        try {
-            # Try to get Team ID from code signing identities
-            $codesigningOutput = & xcrun security find-identity -v -p codesigning 2>$null
-            if ($codesigningOutput) {
-                # Extract Team ID from output using regex pattern matching
-                $match = [regex]::Match($codesigningOutput, '\(([A-Z0-9]{10})\)')
-                if ($match.Success) {
-                    $appleId = $match.Groups[1].Value
-                    Write-Output "Found Apple Developer Team ID: $appleId from code signing identity"
-                }
-            }
-            
-            # If first method failed, try another approach with certificates
-            if (-not $appleId) {
-                $certOutput = & security find-certificate -a -c "Apple Development" -p 2>$null | grep "OU=" 
-                if ($certOutput) {
-                    $match = [regex]::Match($certOutput, 'OU=([A-Z0-9]{10})')
-                    if ($match.Success) {
-                        $appleId = $match.Groups[1].Value
-                        Write-Output "Found Apple Developer Team ID: $appleId from certificate"
-                    }
-                }
-            }
-        }
-        catch {
-            Write-Output "Error attempting to detect Apple Developer Team ID: $_"
-        }
-    }
-    
-    if (-not $appleId)
-    {
-        Write-Error "APPLE_ID environment variable is not set and couldn't be detected automatically. Skipping..."
-        exit
-    }
+    Write-Error "APPLE_ID environment variable is not set. Skipping..."
+    exit
 }
 
+$appleId = $Env:APPLE_ID
 $projectSettingsPath = "$PSScriptRoot/../samples/unity-of-bugs/ProjectSettings/ProjectSettings.asset"
 if (-not (Test-Path -Path $projectSettingsPath)) 
 {

From e3d7effc9421d7c26c75533835c9e432e2ef1249 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Tue, 22 Apr 2025 17:39:34 +0200
Subject: [PATCH 3/3] comment

---
 Directory.Build.targets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index f8cc75779..34a643f63 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -571,17 +571,17 @@ void PrintFailedTests(XElement element)
   <!-- Checks if the environment variable 'SENTRY_AUTH_TOKEN' has been set and creates the SentryCliOptions.asset for the sample project
        This is meant for developers - so they don't have to configure the CLI options after each clean checkout (or git clean).
        Gets automatically run after 'DownloadNativeSDKs'
-       dotnet msbuild /t:SetupSampleSentryCliOptions src/Sentry.Unity -->
-  <Target Name="SetupSampleSentryCliOptions" AfterTargets="DownloadNativeSDKs" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' AND '$(SENTRY_AUTH_TOKEN)' != ''">
+       dotnet msbuild /t:SamplesSetupCliOptions src/Sentry.Unity -->
+  <Target Name="SamplesSetupCliOptions" AfterTargets="DownloadNativeSDKs" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' AND '$(SENTRY_AUTH_TOKEN)' != ''">
     <Message Importance="High" Text="Found environment variable 'SENTRY_AUTH_TOKEN'. Creating Sentry CLI options for sample project. " />
     <Exec Command="pwsh &quot;$(RepoRoot)scripts/samples-setup-cli-options.ps1&quot;"/>
   </Target>
 
-    <!-- Checks if the environment variable 'SENTRY_AUTH_TOKEN' has been set and creates the SentryCliOptions.asset for the sample project
-       This is meant for developers - so they don't have to configure the CLI options after each clean checkout (or git clean).
-       Gets automatically run after 'DownloadNativeSDKs'
-       dotnet msbuild /t:SetupSampleSentryCliOptions src/Sentry.Unity -->
-  <Target Name="SetupSampleAppleId" AfterTargets="SetupSampleSentryCliOptions" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' AND '$(APPLE_ID)' != ''">
+    <!-- Checks if the environment variable 'APPLE_ID' has been set and modifies the ProjectSettings.asset for the sample project
+       This is meant for developers - so they don't have to configure the playersettings after each clean checkout (or git clean).
+       Gets automatically run after 'SamplesSetupCliOptions'
+       dotnet msbuild /t:SamplesSetupAppleId src/Sentry.Unity -->
+  <Target Name="SamplesSetupAppleId" AfterTargets="SetupSampleSentryCliOptions" Condition="'$(MSBuildProjectName)' == 'Sentry.Unity' AND '$(APPLE_ID)' != ''">
     <Message Importance="High" Text="Found environment variable 'APPLE_ID'. Setting Apple ID for sample project. " />
     <Exec Command="pwsh &quot;$(RepoRoot)scripts/samples-setup-apple-id.ps1&quot;"/>
   </Target>