chore: Remove separate marketplace package version (#1030)

tustanivsky · web-flow · commit e65acd5b69f6 · 2025-07-29T06:51:09.000+03:00
* Remove separate marketplace package

* Update comment

* Fix function call

* Fix function call

* Remove explicit gradle plugin versions from Android UPL

* Remove breakpad

* Update WindowsSentrySubsystem.cpp
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,20 +42,14 @@ jobs:
       runsOn: ubuntu-22.04-arm
       container: arm64v8/ubuntu:20.04
 
-  windows-crashpad-sdk:
+  windows-sdk:
     uses: ./.github/workflows/sdk-build.yml
     with:
-      target: Win64-Crashpad
-      runsOn: windows-2022
-
-  windows-breakpad-sdk:
-    uses: ./.github/workflows/sdk-build.yml
-    with:
-      target: Win64-Breakpad
+      target: Win64
       runsOn: windows-2022
 
   package-preparation:
-    needs: [android-sdk, ios-sdk, macos-sdk, linux-sdk, linux-arm64-sdk, windows-crashpad-sdk, windows-breakpad-sdk]
+    needs: [android-sdk, ios-sdk, macos-sdk, linux-sdk, linux-arm64-sdk, windows-sdk]
     name: Package
     runs-on: ubuntu-latest
     steps:
@@ -95,13 +89,8 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: Win64-Crashpad-sdk
-          path: plugin-dev/Source/ThirdParty/Win64/Crashpad
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: Win64-Breakpad-sdk
-          path: plugin-dev/Source/ThirdParty/Win64/Breakpad
+          name: Win64-sdk
+          path: plugin-dev/Source/ThirdParty/Win64
 
       # Workaround for https://github.com/actions/download-artifact/issues/14
       # Adding execute permission for crashpad before preparing final packages
diff --git a/.github/workflows/sdk-build.yml b/.github/workflows/sdk-build.yml
@@ -73,7 +73,7 @@ jobs:
           sudo apt-get -y install libc++-16-dev libc++abi-16-dev libstdc++-11-dev zlib1g-dev libcurl4-openssl-dev
 
       - name: Install Windows Dependencies
-        if: ${{ (inputs.target == 'Win64-Crashpad' || inputs.target == 'Win64-Breakpad') && steps.cache.outputs.cache-hit != 'true' }}
+        if: ${{ inputs.target == 'Win64' && steps.cache.outputs.cache-hit != 'true' }}
         shell: pwsh
         run: |
           $ProgressPreference = 'SilentlyContinue'
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -101,7 +101,7 @@ jobs:
       - name: Extract package to sample/Plugins
         env:
           UNREAL_VERSION: ${{ inputs.unreal-version }}
-        run: unzip sentry-unreal-*-engine"$UNREAL_VERSION"-github.zip -d checkout/sample/Plugins/sentry
+        run: unzip sentry-unreal-*-engine"$UNREAL_VERSION".zip -d checkout/sample/Plugins/sentry
 
       - name: Set permissions for sample
         # sentry-native requires write access to sample project directory in order to initialize itself properly
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -48,7 +48,7 @@ jobs:
           UNREAL_VERSION: ${{ inputs.unreal-version }}
         run: |
           New-Item -ItemType Directory -Path "$env:WORKSPACE_PATH\checkout\sample\Plugins\sentry" -Force
-          Expand-Archive -Path "sentry-unreal-*-engine$env:UNREAL_VERSION-github.zip" -DestinationPath "$env:WORKSPACE_PATH\checkout\sample\Plugins\sentry" -Force
+          Expand-Archive -Path "sentry-unreal-*-engine$env:UNREAL_VERSION.zip" -DestinationPath "$env:WORKSPACE_PATH\checkout\sample\Plugins\sentry" -Force
 
       - name: Run tests
         id: run-tests
diff --git a/plugin-dev/Source/Sentry/Private/Windows/WindowsSentrySubsystem.cpp b/plugin-dev/Source/Sentry/Private/Windows/WindowsSentrySubsystem.cpp
@@ -64,7 +64,7 @@ void FWindowsSentrySubsystem::ConfigureHandlerPath(sentry_options_t* Options)
 
 	if (!FPaths::FileExists(HandlerPath))
 	{
-		UE_LOG(LogSentrySdk, Log, TEXT("Crashpad executable couldn't be found so Breakpad will be used instead. Please make sure that the plugin was rebuilt to avoid initialization failure."));
+		UE_LOG(LogSentrySdk, Error, TEXT("Crashpad executable couldn't be found."));
 		return;
 	}
 
diff --git a/plugin-dev/Source/Sentry/Sentry.Build.cs b/plugin-dev/Source/Sentry/Sentry.Build.cs
@@ -94,33 +94,23 @@ public Sentry(ReadOnlyTargetRules Target) : base(Target)
 		{
 			PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private", "Microsoft"));
 
-			bool CrashpadExists = File.Exists(Path.Combine(PlatformThirdPartyPath, "Crashpad", "bin", "crashpad_handler.exe"));
+			PublicIncludePaths.Add(Path.Combine(PlatformThirdPartyPath, "include"));
 
-			string WindowsThirdPartyPath = Path.Combine(PlatformThirdPartyPath, CrashpadExists ? "Crashpad" : "Breakpad");
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "sentry.lib"));
 
-			PublicIncludePaths.Add(Path.Combine(WindowsThirdPartyPath, "include"));
 
-			PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "sentry.lib"));
+			RuntimeDependencies.Add(Path.Combine(PlatformBinariesPath, "crashpad_handler.exe"), Path.Combine(PlatformThirdPartyPath, "bin", "crashpad_handler.exe"));
+			RuntimeDependencies.Add(Path.Combine(PlatformBinariesPath, "crashpad_wer.dll"), Path.Combine(PlatformThirdPartyPath, "bin", "crashpad_wer.dll"));
 
-			if (CrashpadExists)
-			{
-				RuntimeDependencies.Add(Path.Combine(PlatformBinariesPath, "crashpad_handler.exe"), Path.Combine(WindowsThirdPartyPath, "bin", "crashpad_handler.exe"));
-				RuntimeDependencies.Add(Path.Combine(PlatformBinariesPath, "crashpad_wer.dll"), Path.Combine(WindowsThirdPartyPath, "bin", "crashpad_wer.dll"));
-
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_compat.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_snapshot.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_util.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "mini_chromium.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_client.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_zlib.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_getopt.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_tools.lib"));
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "crashpad_handler_lib.lib"));
-			}
-			else
-			{
-				PublicAdditionalLibraries.Add(Path.Combine(WindowsThirdPartyPath, "lib", "breakpad_client.lib"));
-			}
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_compat.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_snapshot.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_util.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "mini_chromium.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_client.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_zlib.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_getopt.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_tools.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(PlatformThirdPartyPath, "lib", "crashpad_handler_lib.lib"));
 
 			PublicDefinitions.Add("USE_SENTRY_NATIVE=1");
 			PublicDefinitions.Add("SENTRY_BUILD_STATIC=1");
diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -171,7 +171,7 @@
             <true>
                 <if condition="bUseLegacyGradlePlugin">
                     <true>
-                        <log text="Using legacy Sentry Gradle plugin 2.1.5 for Android debug symbol upload."/>
+                        <log text="Using legacy Sentry Gradle plugin for Android debug symbol upload."/>
                         <insert>
                             dependencies {
                                 classpath 'com.android.tools.build:gradle:3.5.4'
@@ -180,7 +180,7 @@
                         </insert>
                     </true>
                     <false>
-                        <log text="Using Sentry Gradle plugin 4.11.0 for Android debug symbol upload."/>
+                        <log text="Using Sentry Gradle plugin for Android debug symbol upload."/>
                         <log text="Enable legacy Sentry Gradle plugin in project settings in case current version conflicts with other plugins (for UE 5.4 and older)."/>
                         <insert>
                             dependencies {
diff --git a/scripts/build-win64-breakpad.sh b/scripts/build-win64-breakpad.sh
diff --git a/scripts/build-win64.sh b/scripts/build-win64.sh
diff --git a/scripts/download-sdks.ps1 b/scripts/download-sdks.ps1
@@ -34,17 +34,11 @@ if (-not (Test-Path $outDir))
     New-Item $outDir -ItemType Directory > $null
 }
 
-$sdks = @("Android", "IOS", "Linux", "LinuxArm64", "Mac", "Win64-Crashpad", "Win64-Breakpad")
+$sdks = @("Android", "IOS", "Linux", "LinuxArm64", "Mac", "Win64")
 foreach ($sdk in $sdks)
 {
     $sdkDir = "$outDir/$sdk"
 
-    if ($sdk.StartsWith('Win64'))
-    {
-        $winSdk, $crashBackend = $sdk.Split("-")
-        $sdkDir = "$outDir/$winSdk/$crashBackend"
-    }
-
     Write-Host "Downloading $sdk SDK to $sdkDir ..."
     if (Test-Path $sdkDir)
     {
diff --git a/scripts/download-sdks.sh b/scripts/download-sdks.sh
@@ -23,17 +23,10 @@ if [[ "$runId" == "" ]]; then
     exit 1
 fi
 
-declare -a sdks=("Android" "IOS" "Linux" "LinuxArm64" "Mac")
+declare -a sdks=("Android" "IOS" "Linux" "LinuxArm64" "Mac" "Win64")
 for sdk in "${sdks[@]}"; do
     echo "Downloading $sdk SDK to $PWD/$sdk ..."
     rm -rf "./$sdk"
     gh run download $runId -n "$sdk-sdk" -D $sdk
     find $sdk -name "crashpad_handler" -exec chmod +x {} \;
 done
-
-rm -rf "./Win64"
-declare -a winSdks=("Crashpad" "Breakpad")
-for winSdk in "${winSdks[@]}"; do
-    echo "Downloading Win64-$winSdk SDK to $PWD/Win64/$winSdk ..."
-    gh run download $runId -n "Win64-$winSdk-sdk" -D Win64/$winSdk
-done
diff --git a/scripts/packaging/pack.ps1 b/scripts/packaging/pack.ps1
@@ -1,13 +1,9 @@
-# Packages plugin files for two publishing platforms - GitHub and UE Marketplace.
+# Packages plugin files for publishing to GitHub Releases
 
-# The UE Marketplace version doesn't include `.exe`, `.bat` and `.sh` files due to certain
-# platform restrictions: https://www.unrealengine.com/en-US/marketplace-guidelines#262e
-# Plugin provides tools allowing to download these files manually.
-
-function packFiles([string] $publishingPlatform)
+function packFiles()
 {
-    Remove-Item "package-release-$publishingPlatform" -Force -Recurse -ErrorAction SilentlyContinue
-    New-Item "package-release-$publishingPlatform" -ItemType Directory
+    Remove-Item "package-release" -Force -Recurse -ErrorAction SilentlyContinue
+    New-Item "package-release" -ItemType Directory
 
     $exclude = @(
         'Sentry.uplugin',
@@ -17,45 +13,31 @@ function packFiles([string] $publishingPlatform)
         'Intermediate'
     )
 
-    if ($publishingPlatform -eq "marketplace")
-    {
-        $exclude += @(
-            'sentry-cli-Windows-x86_64.exe',
-            'upload-debug-symbols-win.bat',
-            'upload-debug-symbols.sh',
-            'crashpad_handler.exe'
-            'crashpad_wer.dll'
-        )
-    }
-
-    Copy-Item "plugin-dev/*" "package-release-$publishingPlatform/" -Exclude $exclude -Recurse
-    Copy-Item "CHANGELOG.md" -Destination "package-release-$publishingPlatform/CHANGELOG.md"
-    Copy-Item "LICENSE" -Destination "package-release-$publishingPlatform/LICENSE"
+    Copy-Item "plugin-dev/*" "package-release/" -Exclude $exclude -Recurse
+    Copy-Item "CHANGELOG.md" -Destination "package-release/CHANGELOG.md"
+    Copy-Item "LICENSE" -Destination "package-release/LICENSE"
 
     $pluginSpec = Get-Content "plugin-dev/Sentry.uplugin"
     $version = [regex]::Match("$pluginSpec", '"VersionName": "([^"]+)"').Groups[1].Value
     $engineVersions = Get-Content $PSScriptRoot/engine-versions.txt
     foreach ($engineVersion in $engineVersions)
     {
-        $packageName = "sentry-unreal-$version-engine$engineVersion-$publishingPlatform.zip"
+        $packageName = "sentry-unreal-$version-engine$engineVersion.zip"
         Write-Host "Creating a release package for Unreal $engineVersion as $packageName"
 
         $newPluginSpec = $pluginSpec
 
-        # Add EngineVersion key only for marketplace package to avoid warnings in licensee versions of Unreal
-        # where github package is used (https://github.com/getsentry/sentry-unreal/issues/811)
-        if ($publishingPlatform -eq "marketplace")
-        {
-            $newPluginSpec = @($pluginSpec[0..0]) + @('	"EngineVersion" : "' + $engineVersion + '.0",') + @($pluginSpec[1..($pluginSpec.count)])
-        }
+        # Adding EngineVersion key may cause warnings when using package in licensee engine builds (https://github.com/getsentry/sentry-unreal/issues/811)
+
+        $newPluginSpec = @($pluginSpec[0..0]) + @('	"EngineVersion" : "' + $engineVersion + '.0",') + @($pluginSpec[1..($pluginSpec.count)])
 
         # Handle platform name difference for UE 4.27
         if ($engineVersion -eq "4.27")
         {
             $newPluginSpec = $newPluginSpec -replace '"LinuxArm64"', '"LinuxAArch64"'
         }
 
-        $newPluginSpec | Out-File "package-release-$publishingPlatform/Sentry.uplugin"
+        $newPluginSpec | Out-File "package-release/Sentry.uplugin"
 
         Remove-Item -ErrorAction SilentlyContinue $packageName
 
@@ -65,7 +47,7 @@ function packFiles([string] $publishingPlatform)
         # so that we retain file permissions
         # For more information, see https://github.com/PowerShell/Microsoft.PowerShell.Archive/issues/36
         # NOTE: This requires .NET 6+: https://github.com/dotnet/runtime/issues/1548
-        Push-Location package-release-$publishingPlatform
+        Push-Location package-release
         try
         {
             $location = Get-Location
@@ -83,5 +65,4 @@ function packFiles([string] $publishingPlatform)
     }
 }
 
-packFiles("github")
-packFiles("marketplace")
+packFiles
diff --git a/scripts/packaging/package-github.snapshot b/scripts/packaging/package-github.snapshot
diff --git a/scripts/packaging/package.snapshot b/scripts/packaging/package.snapshot
diff --git a/scripts/packaging/test-contents.ps1 b/scripts/packaging/test-contents.ps1

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ void FWindowsSentrySubsystem::ConfigureHandlerPath(sentry_options_t* Options)`
`64`	`64`
`65`	`65`	`if (!FPaths::FileExists(HandlerPath))`
`66`	`66`	`{`
`67`		`- UE_LOG(LogSentrySdk, Log, TEXT("Crashpad executable couldn't be found so Breakpad will be used instead. Please make sure that the plugin was rebuilt to avoid initialization failure."));`
	`67`	`+ UE_LOG(LogSentrySdk, Error, TEXT("Crashpad executable couldn't be found."));`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,11 @@ if (-not (Test-Path $outDir))`
`34`	`34`	`New-Item $outDir -ItemType Directory > $null`
`35`	`35`	`}`
`36`	`36`
`37`		`-$sdks = @("Android", "IOS", "Linux", "LinuxArm64", "Mac", "Win64-Crashpad", "Win64-Breakpad")`
	`37`	`+$sdks = @("Android", "IOS", "Linux", "LinuxArm64", "Mac", "Win64")`
`38`	`38`	`foreach ($sdk in $sdks)`
`39`	`39`	`{`
`40`	`40`	`$sdkDir = "$outDir/$sdk"`
`41`	`41`
`42`		`- if ($sdk.StartsWith('Win64'))`
`43`		`- {`
`44`		`- $winSdk, $crashBackend = $sdk.Split("-")`
`45`		`- $sdkDir = "$outDir/$winSdk/$crashBackend"`
`46`		`- }`
`47`		`-`
`48`	`42`	`Write-Host "Downloading $sdk SDK to $sdkDir ..."`
`49`	`43`	`if (Test-Path $sdkDir)`
`50`	`44`	`{`