Preview - 1.83.9 (Codename: Luna)

.github/workflows/build.yml

@@ -25,9 +25,6 @@ on:
         - '**/packages.lock.json'
 
 env:
-  DOTNET_INSTALL_DIR: '.\.dotnet' 
-  DOTNET_VERSION: '9.0.3xx'
-  DOTNET_QUALITY: 'ga'
   NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 
 jobs:
@@ -49,6 +46,14 @@ jobs:
       with:
         submodules: recursive
 
+    - name: 'Preparing Environment Variables'
+      if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
+      run: |
+        $env = Get-Content env.json | ConvertFrom-Json
+        foreach ($prop in $env.PSObject.Properties) {
+          echo "$($prop.Name)=$($prop.Value)" >> $env:GITHUB_ENV
+        }
+
     - name: Install .NET
       uses: actions/setup-dotnet@v4
       with:
@@ -62,14 +67,22 @@ jobs:
 
     - name: Build
       run: |
-        dotnet publish CollapseLauncher -c ${{matrix.Configuration}} -p:PublishProfile=Publish-DebugCIRelease -p:PublishDir=".\debug-build\"
+        dotnet publish CollapseLauncher -c ${{matrix.Configuration}} -p:PublishProfile=Publish-DebugCIRelease -p:PublishDir=".\debug-build\" -p:PublishAot=false
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
           name: collapse_${{ matrix.platform }}-${{ matrix.configuration }}_${{ matrix.framework }}_${{ github.sha }}
           path: ./CollapseLauncher/debug-build/
           compression-level: 9
+
+    - name: Validate build for Preview
+      run: |
+        dotnet build CollapseLauncher -c Release --verbosity quiet --no-restore
+
+    - name: Validate build for Stable
+      run: |
+        dotnet build CollapseLauncher -c Publish --verbosity quiet --no-restore
 
   build-nativeaot:
     runs-on: windows-latest
@@ -89,6 +102,14 @@ jobs:
       with:
         submodules: recursive
 
+    - name: 'Preparing Environment Variables'
+      if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
+      run: |
+        $env = Get-Content env.json | ConvertFrom-Json
+        foreach ($prop in $env.PSObject.Properties) {
+          echo "$($prop.Name)=$($prop.Value)" >> $env:GITHUB_ENV
+        }
+
     - name: Install .NET
       uses: actions/setup-dotnet@v4
       with:

.github/workflows/dd-sca.yml

@@ -0,0 +1,21 @@
+on: [push]
+
+name: Datadog Software Composition Analysis
+
+jobs:
+  software-composition-analysis:
+    runs-on: ubuntu-latest
+    name: Datadog SBOM Generation and Upload
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Check imported libraries are secure and compliant
+        id: datadog-software-composition-analysis
+        uses: DataDog/datadog-sca-github-action@main
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+          dd_app_key: ${{ secrets.DD_APP_KEY }}
+          dd_site: ap1.datadoghq.com

.github/workflows/dd-static-analysis.yml

@@ -0,0 +1,24 @@
+on: [push]
+
+name: Datadog Static Code Analysis
+
+jobs:
+  static-analysis:
+    runs-on: ubuntu-latest
+    name: Datadog Static Analyzer
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Check code meets quality and security standards
+        id: datadog-static-analysis
+        uses: DataDog/datadog-static-analyzer-github-action@v1
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+          dd_app_key: ${{ secrets.DD_APP_KEY }}
+          dd_site: ap1.datadoghq.com
+          secrets_enabled: false
+          static_analysis_enabled: true
+          cpu_count: 2

.github/workflows/qodana-scan-pr.yml

@@ -28,9 +28,6 @@ jobs:
     env:
       Configuration: ${{ matrix.configuration }}
       Platform: ${{ matrix.platform }}
-      DOTNET_INSTALL_DIR: '.\.dotnet' 
-      DOTNET_VERSION: '9.0.3xx'
-      DOTNET_QUALITY: 'ga'
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 
     steps:
@@ -42,6 +39,15 @@ jobs:
             ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
             fetch-depth: 0  # a full history is required for pull request analysis
             submodules: recursive # many many submodules  
+
+      - name: 'Preparing Environment Variables'
+        if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
+        run: |
+          $env = Get-Content env.json | ConvertFrom-Json
+          foreach ($prop in $env.PSObject.Properties) {
+            echo "$($prop.Name)=$($prop.Value)" >> $env:GITHUB_ENV
+          }
+
       - name: Install .NET
         uses: actions/setup-dotnet@v4
         with:

.github/workflows/qodana-scan.yml

@@ -19,10 +19,8 @@ jobs:
     env:
       Configuration: ${{ matrix.configuration }}
       Platform: ${{ matrix.platform }}
-      DOTNET_INSTALL_DIR: '.\.dotnet' 
-      DOTNET_VERSION: '9.0.3xx'
-      DOTNET_QUALITY: 'ga'
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
+
     permissions:
       actions: read
       contents: write
@@ -34,18 +32,15 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
           submodules: recursive # many many submodules
-      # - name: Install winget
-      #   uses: Cyberboss/install-winget@v1
-      # - name: Install Qodana CLI
-      #   uses: crazy-max/ghaction-chocolatey@v3
-      #   with:
-      #     args: install qodana --pre --confirm
-
-      # - name: Verify Qodana
-      #   run: |
-      #     Import-Module "$env:ChocolateyInstall/helpers/chocolateyInstaller.psm1"
-      #     refreshenv
-      #     qodana --version
+
+      - name: 'Preparing Environment Variables'
+        if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
+        run: |
+          $env = Get-Content env.json | ConvertFrom-Json
+          foreach ($prop in $env.PSObject.Properties) {
+            echo "$($prop.Name)=$($prop.Value)" >> $env:GITHUB_ENV
+          }
+
       - name: Install .NET
         uses: actions/setup-dotnet@v4
         with:

.github/workflows/release-signed.yml

@@ -8,14 +8,11 @@ on:
 env:
  BRANCH_NAME: ${{ github.head_ref || github.ref_name }} 
  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
- DOTNET_INSTALL_DIR: '.\.dotnet' 
- DOTNET_VERSION: '9.0.3xx'
- DOTNET_QUALITY: 'ga'
  NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
- SIGNPATH_ARTIFACT_SLUG: 'initial' # change this to 'aot-release' when releasing with AOT or 'initial' for normal release
- BUILD_PROFILE_PREVIEW: 'Publish-PreviewRelease'
- BUILD_PROFILE_STABLE: 'Publish-StableRelease'
- BUILD_PROFILE_DEBUG: 'Publish-DebugCIRelease'
+ SIGNPATH_ARTIFACT_SLUG: 'aot-release' # change this to 'aot-release' when releasing with AOT or 'initial' for normal release
+ BUILD_PROFILE_PREVIEW: 'Publish-PreviewReleaseAOT'
+ BUILD_PROFILE_STABLE: 'Publish-StableReleaseAOT'
+ BUILD_PROFILE_DEBUG: 'Publish-DebugCIReleaseAOT'
 
 #  schedule:
 #    - cron: '0 0 * * 0' # At 00:00 on Sunday
@@ -33,6 +30,7 @@ jobs:
       PUBLISH_PROFILE: ""
       SIGNING_POLICY_SLUG: ""
       VERSION: ""
+      PRODUCT_VERSION: ""
       Platform: ${{ matrix.platform }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
@@ -51,8 +49,8 @@ jobs:
           echo "PUBLISH_PROFILE=${{ env.BUILD_PROFILE_STABLE }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "SIGNING_POLICY_SLUG=release-signing" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         } elseif ($branch -eq "github-signpath-test") {
-          echo "CONFIGURATION_STRATEGY=Debug" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "PUBLISH_PROFILE=${{ env.BUILD_PROFILE_DEBUG }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "CONFIGURATION_STRATEGY=Release" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PUBLISH_PROFILE=${{ env.BUILD_PROFILE_PREVIEW }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           echo "SIGNING_POLICY_SLUG=test-signing-ci" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         } else {
           Write-Error "Unknown branch or input: $branch"
@@ -69,6 +67,14 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: recursive
+
+    - name: 'Preparing Environment Variables'
+      if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
+      run: |
+        $env = Get-Content env.json | ConvertFrom-Json
+        foreach ($prop in $env.PSObject.Properties) {
+          echo "$($prop.Name)=$($prop.Value)" >> $env:GITHUB_ENV
+        }
 
     - name: Install .NET
       uses: actions/setup-dotnet@v4
@@ -156,7 +162,9 @@ jobs:
           if ($signature.Status -ne "Valid") {
             echo "::error::Invalid signature on $($file.Name): $($signature.Status)"
           }
-          echo "✓ $($file.Name): $($signature.SignerCertificate.Subject)"
+          else {
+            echo "::notice::✓ $($file.Name): $($signature.SignerCertificate.Subject)"
+          }
         }
 
     - name: Re-upload Signed Artifact to GitHub
@@ -187,6 +195,27 @@ jobs:
         apps: sentry-cli
 
     - name: Upload Debug artifact to Sentry
+      continue-on-error: true
+      shell: pwsh
       run: |
-        sentry-cli debug-files upload --org collapse --project collapse-launcher --include-sources '.\SignedArtifact\BuildArtifact-${{ env.VERSION }}'
-
+        sentry-cli debug-files upload --org collapse --project collapse-launcher --include-sources '${{ runner.temp }}\SignedArtifact\BuildArtifact-${{ env.VERSION }}'
+
+    - name: Set release version in Sentry
+      shell: pwsh
+      continue-on-error: true
+      run: |
+            $exePath = "${{ runner.temp }}\SignedArtifact\BuildArtifact-${{ env.VERSION }}\CollapseLauncher.exe"
+            if (Test-Path $exePath) {
+                $version = "CollapseLauncher@" + ([System.Diagnostics.FileVersionInfo]::GetVersionInfo("./CollapseLauncher.exe").ProductVersion)
+                if ($version) {
+                    sentry-cli releases new --org collapse --project collapse-launcher $version
+                    sentry-cli releases set-commits --auto $version
+                    sentry-cli releases finalize $version
+                }
+                else {
+                    Write-Warning "No product version found in $exePath"
+                }
+            }
+            else {
+                Write-Error "File not found: $exePath"
+            }

.gitignore

@@ -8,6 +8,8 @@ packages/*
 CollapseLauncher/Deps/*
 CollapseLauncher/StaticLib/*.lib
 CollapseLauncher/StaticLib/**/*.lib
+CollapseLauncher/StaticLib/*.pdb
+CollapseLauncher/StaticLib/**/*.pdb
 CollapseLauncher/Invoker/*
 **/Generated Files/**
 *.psd

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "Hi3Helper.Http"]
 	path = Hi3Helper.Http
-	url = https://github.com/neon-nyan/Hi3Helper.Http
+	url = https://github.com/CollapseLauncher/Hi3Helper.Http
 [submodule "ColorThief"]
 	path = ColorThief
-	url = https://github.com/neon-nyan/ColorThief
+	url = https://github.com/CollapseLauncher/ColorThief
 [submodule "Hi3Helper.EncTool"]
 	path = Hi3Helper.EncTool
 	url = https://github.com/CollapseLauncher/Hi3Helper.EncTool
@@ -28,3 +28,6 @@
 [submodule "Hi3Helper.Win32"]
 	path = Hi3Helper.Win32
 	url = https://github.com/CollapseLauncher/Hi3Helper.Win32
+[submodule "Hi3Helper.Plugin.Core"]
+	path = Hi3Helper.Plugin.Core
+	url = https://github.com/CollapseLauncher/Hi3Helper.Plugin.Core

CONTRIBUTING.md

@@ -2,10 +2,10 @@
 ## Before you Start
 - Unless otherwise stated in this project's README, please make sure to clone the source code from the `main` branch using `--recurse` parameter to pull all the submodules Collapse needs to compile.
 
-    ```git clone https://github.com/neon-nyan/Collapse --recurse```
+    ```git clone https://github.com/CollapseLauncher/Collapse --recurse```
 
 - Make sure you use the supported IDE & SDKs listed below.
-- Make sure to read the "Restriction for New Feature(s)" section below.
+- Make sure to read the "Restriction for New Feature(s)", "Plugin System" & "Plugin Restrictions" sections below.
 - When submitting a Pull Request (PR), make sure that it is done to the same branch from which you first pulled, unless otherwise stated in the project's README, or if specifically instructed by maintainers of this project.
 - We don't require a fully descriptive PR, but please be clear on what is added/removed and what the code does.
 
@@ -15,13 +15,23 @@ If you wish to add new language that isn't yet listed in the Transifex project,
 
 ## Tools Needed
 Below is a list of tools needed to contribute to this project:
-1. **Visual Studio 2022 (Any Edition - latest version)**
+1. **Visual Studio 2022 (Any Edition - latest version)** or **JetBrains Rider (Any Edition - latest version)**
    - Select .NET desktop development component
 2. **Windows SDK (10.0.26100.0 ONLY)** via Visual Studio Installer
 3. .NET 9 SDK: [**(9.0.4 or later)**](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
 
 > **Note**:
-> Make sure to always use the latest version of Visual Studio in order to be able to open the project.
+> Make sure to always use the latest version of Visual Studio or Rider in order to be able to open the project.
+
+## Plugin System
+> The plugin system was introduced in a recent version of Collapse, allowing for external games, not officially supported by the launcher, to be managed through the it. Any user can create & load their own plugins into Collapse, provided they follow a set of guidelines and standards.
+
+The plugin system requires its own set of dependencies and packages, though the tools required to develop it are identical. For more information about developing your own plugin, take a look at the core plugin module's [documentation](https://github.com/CollapseLauncher/Hi3Helper.Plugin.Core). 
+
+## Plugin Restrictions
+Plugins are designed to interface with Collapse through COM Interops and marshalling. As such, you must follow the API contracts defined in the core library. That being said, there's nothing stopping you from writing your own interfaces and ways to interact with Collapse, provided that the current launcher code supports that functionality. Ultimately, **we, the Collapse core developer team, cannot stop users from distributing their own plugin libraries and implementing features that we never will** (see below), but it is our hope that our users and community will adhere to the rules we set.
+
+All official plugins (plugins that are accessible through Collapse's download interface) must be validated by a member of the development team before being approved for publishing, to ensure the safety of our users and preserve launcher stability and integrity. The Collapse project and its members are not responsible for damage caused to the user should they install unofficial and unsupported plugins. Furthermore, no support will be provided for any unofficial plugin.
 
 ## Restrictions for New Feature(s)
 While this software is fully open source and not affiliated with HoYoverse, Cognosphere, or any of its related entities in any way, we are nonetheless bound to their Terms of Service and Code of Conduct when developing Collapse. This means that there are some features that we will **not** implement. We will close any issue or PRs that are made to add such functionality to Collapse. Such features include, but are not limited to:
@@ -32,6 +42,7 @@ While this software is fully open source and not affiliated with HoYoverse, Cogn
 ### Examples for features that we encourage others to submit PRs for:
 - Community resources
 - Officially-endorsed HoYoverse Tools
+- Code that enhances plugin-related functionality
 - Etc.
 
 ### Examples of features that we will probably never implement:
@@ -40,14 +51,15 @@ While this software is fully open source and not affiliated with HoYoverse, Cogn
 - Any type of cheats or exploits.
 - Etc.
 
-
 ## Further reads:
 - [Genshin Impact Terms of Service](https://genshin.hoyoverse.com/en/company/terms)
 - [Honkai Impact 3rd Terms of Service](https://honkaiimpact3.hoyoverse.com/global/en-us/terms)
 - [Honkai: Star Rail Terms of Service](https://hsr.hoyoverse.com/en-us/company/terms)
 - [Zenless Zone Zero Terms of Service](https://zenless.hoyoverse.com/en-us/company/terms)
 - [HoYoLAB Forum Terms of Service](https://www.hoyolab.com/agreement)
+- Any other Terms of Service & Privacy Policy links for games implemented through the plugin system
 
 # A Humble Thank You
 As contributors, we always feel grateful for all your contributions to the project, whether it be through helping with localizing the app, coming up with new features, reporting bugs, and even using this launcher. Through everyone's effort, we can keep this project alive by bringing even more features and quality-of-life (QoL) upgrades over the existing launchers (including official) that are out there.
 Thank you ❤️
+