fix(packaging): only exclude *some* folders in win>=2h1h

prism won't be able to make %appdata%\PrismLauncher on first launch,
which would be ok...but this in turn breaks opening and folders :(

Signed-off-by: seth <getchoo@tuta.io>

.envrc

@@ -1 +1,2 @@
 use flake
+

.github/workflows/build.yml

@@ -32,33 +32,33 @@ jobs:
       matrix:
         include:
 
-          - os: ubuntu-20.04
+          #- os: ubuntu-20.04
-            qt_ver: 5
+          #  qt_ver: 5
 
-          - os: ubuntu-20.04
+          #- os: ubuntu-20.04
-            qt_ver: 6
+          #  qt_ver: 6
-            qt_host: linux
+          #  qt_host: linux
-            qt_arch: ''
+          #  qt_arch: ''
-            qt_version: '6.2.4'
+          #  qt_version: '6.2.4'
-            qt_modules: 'qt5compat qtimageformats'
+          #  qt_modules: 'qt5compat qtimageformats'
-            qt_tools: ''
+          #  qt_tools: ''
 
-          - os: windows-2022
+          #- os: windows-2022
-            name: "Windows-MinGW-w64"
+          #  name: "Windows-MinGW-w64"
-            msystem: clang64
+          #  msystem: clang64
-            vcvars_arch: 'amd64_x86'
+          #  vcvars_arch: 'amd64_x86'
 
-          - os: windows-2022
+          #- os: windows-2022
-            name: "Windows-MSVC-Legacy"
+          #  name: "Windows-MSVC-Legacy"
-            msystem: ''
+          #  msystem: ''
-            architecture: 'win32'
+          #  architecture: 'win32'
-            vcvars_arch: 'amd64_x86'
+          #  vcvars_arch: 'amd64_x86'
-            qt_ver: 5
+          #  qt_ver: 5
-            qt_host: windows
+          #  qt_host: windows
-            qt_arch: 'win32_msvc2019'
+          #  qt_arch: 'win32_msvc2019'
-            qt_version: '5.15.2'
+          #  qt_version: '5.15.2'
-            qt_modules: ''
+          #  qt_modules: ''
-            qt_tools: 'tools_openssl_x86'
+          #  qt_tools: 'tools_openssl_x86'
 
           - os: windows-2022
             name: "Windows-MSVC"
@@ -71,6 +71,7 @@ jobs:
             qt_version: '6.5.1'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
+            prism_version: '8.0'
 
           - os: windows-2022
             name: "Windows-MSVC-arm64"
@@ -83,25 +84,26 @@ jobs:
             qt_version: '6.5.1'
             qt_modules: 'qt5compat qtimageformats'
             qt_tools: ''
+            prism_version: '8.0'
 
-          - os: macos-12
+              #- os: macos-12
-            name: macOS
+              #  name: macOS
-            macosx_deployment_target: 11.0
+              #  macosx_deployment_target: 11.0
-            qt_ver: 6
+              #  qt_ver: 6
-            qt_host: mac
+              #  qt_host: mac
-            qt_arch: ''
+              #  qt_arch: ''
-            qt_version: '6.5.0'
+              #  qt_version: '6.5.0'
-            qt_modules: 'qt5compat qtimageformats'
+              #  qt_modules: 'qt5compat qtimageformats'
-            qt_tools: ''
+              #  qt_tools: ''
 
-          - os: macos-12
+              #- os: macos-12
-            name: macOS-Legacy
+              #  name: macOS-Legacy
-            macosx_deployment_target: 10.13
+              #  macosx_deployment_target: 10.13
-            qt_ver: 5
+              #  qt_ver: 5
-            qt_host: mac
+              #  qt_host: mac
-            qt_version: '5.15.2'
+              #  qt_version: '5.15.2'
-            qt_modules: ''
+              #  qt_modules: ''
-            qt_tools: ''
+              #  qt_tools: ''
 
     runs-on: ${{ matrix.os }}
 
@@ -428,13 +430,36 @@ jobs:
           
           Get-ChildItem ${{ env.INSTALL_PORTABLE_DIR }} -Recurse | ForEach FullName | Resolve-Path -Relative | %{ $_.TrimStart('.\') } | %{ $_.TrimStart('${{ env.INSTALL_PORTABLE_DIR }}') } | %{ $_.TrimStart('\') } | Out-File -FilePath ${{ env.INSTALL_DIR }}/manifest.txt
 
-      - name: Package (Windows, installer)
+      - name: Package (Windows, setup.exe)
         if: runner.os == 'Windows'
         run: |
           cd ${{ env.INSTALL_DIR }}
           makensis -NOCD "${{ github.workspace }}/${{ env.BUILD_DIR }}/program_info/win_install.nsi"
 
-      - name: Sign installer (Windows)
+      - name: Package (Windows MSVC, MSIX)
+        if: runner.os == 'Windows' && matrix.msystem == '' && matrix.architecture != 'win32'
+        shell: pwsh
+        run: |
+          Set-Location ${{ env.INSTALL_DIR }}
+
+          # MSIX only allows numbers in their versions,
+          # so we need to use another clear identifier
+          $runNumber = "${{ github.run_number }}"
+          if ($runNumber.Length -gt 3) {
+            $version = $runNumber.Substring(($runNumber.Length - 3))
+          } else {
+            $version = $runNumber
+          }
+
+          Copy-Item ${{ github.workspace }}\program_info\prismlauncher_*x*.png .
+          (Get-Content ${{ github.workspace }}\program_info\AppxManifest.xml) `
+            -replace "PRISM_VERSION_REPLACEME","${{ matrix.prism_version }}.0.$version" `
+            -replace "PRISM_ARCH_REPLACEME","${{ matrix.architecture }}" `
+            > .\AppxManifest.xml
+
+          makeappx.exe pack /v /h SHA256 /d . /p prismlauncher-${{ matrix.architecture }}.msix
+
+      - name: Sign installer (Windows, setup.exe)
         if: runner.os == 'Windows'
         run: |
           if (Get-Content ./codesign.pfx){
@@ -443,6 +468,15 @@ jobs:
             ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
           }
 
+      - name: Sign installer (Windows MSVC, MSIX)
+        if: runner.os == 'Windows' && matrix.msystem == '' && matrix.architecture != 'win32'
+        run: |
+          if (Get-Content ./codesign.pfx){
+            SignTool sign /fd sha256 /td sha256 /f codesign.pfx /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' /tr http://timestamp.digicert.com ${{ env.INSTALL_DIR }}/prismlauncher-${{ matrix.architecture }}.msix
+          } else {
+            ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
+          }
+
       - name: Package (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -521,13 +555,20 @@ jobs:
           name: PrismLauncher-${{ matrix.name }}-Portable-${{ env.VERSION }}-${{ inputs.build_type }}
           path: ${{ env.INSTALL_PORTABLE_DIR }}/**
 
-      - name: Upload installer (Windows)
+      - name: Upload setup.exe (Windows)
         if: runner.os == 'Windows'
         uses: actions/upload-artifact@v3
         with:
           name: PrismLauncher-${{ matrix.name }}-Setup-${{ env.VERSION }}-${{ inputs.build_type }}
           path: PrismLauncher-Setup.exe
 
+      - name: Upload MSIX Package (Windows MSVC)
+        if: runner.os == 'Windows' && matrix.msystem == '' && matrix.architecture != 'win32'
+        uses: actions/upload-artifact@v3
+        with:
+          name: PrismLauncher-${{ matrix.name }}-MSIX-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: ${{ env.INSTALL_DIR }}/prismlauncher-${{ matrix.architecture }}.msix
+
       - name: Upload binary tarball (Linux, Qt 5)
         if: runner.os == 'Linux' && matrix.qt_ver != 6
         uses: actions/upload-artifact@v3
@@ -569,50 +610,144 @@ jobs:
         run: |
           ccache -s
 
-  flatpak:
+  appinstaller:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
-    container:
+    needs: build
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
+    env:
-      options: --privileged
+      BUNDLE_STAGING: "bundle_staging"
+      APPINSTALLER_STAGING: "appinstaller_staging"
+      PRISM_VERSION: '8.0'
+
     steps:
+      - name: Install MSVC
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          vsversion: 2022
+
       - name: Checkout
         uses: actions/checkout@v3
-        if: inputs.build_type == 'Debug'
-        with:
-          submodules: 'true'
-      - name: Build Flatpak (Linux)
-        if: inputs.build_type == 'Debug'
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        with:
-          bundle: "Prism Launcher.flatpak"
-          manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml 
 
-  nix:
+      - name: Set short version
-    runs-on: ubuntu-latest
+        shell: bash
-    strategy:
+        run: |
-      matrix:
+          ver_short=`git rev-parse --short HEAD`
-        package:
+          echo "VERSION=$ver_short" >> $GITHUB_ENV
-          - prismlauncher
+
-          - prismlauncher-qt5
+      - name: Set Appx version
-    steps:
+        shell: pwsh
-      - name: Clone repository
+        run: |
-        if: inputs.build_type == 'Debug'
+          $runNumber = "${{ github.run_number }}"
-        uses: actions/checkout@v3
+          if ($runNumber.Length -gt 3) {
+            $version = $runNumber.Substring(($runNumber.Length - 3))
+          } else {
+            $version = $runNumber
+          }
+
+          "APPX_VERSION=${{ env.PRISM_VERSION }}.0.$version" >> $env:GITHUB_ENV
+
+      - name: Create Bundle Staging Directory
+        shell: pwsh
+        run: |
+          New-Item -Type Directory -Path ${{ env.BUNDLE_STAGING }}
+          New-Item -Type Directory -Path ${{ env.APPINSTALLER_STAGING }}
+
+      - name: Download MSIX (x64)
+        uses: actions/download-artifact@v2
         with:
-          submodules: 'true'
+          name: PrismLauncher-Windows-MSVC-MSIX-${{ env.VERSION }}-${{ inputs.build_type }}
-      - name: Install nix
+          path: ${{ env.BUNDLE_STAGING }}/
-        if: inputs.build_type == 'Debug'
+
-        uses: cachix/install-nix-action@v22
+      - name: Download MSIX (arm64)
+        uses: actions/download-artifact@v2
         with:
-          install_url: https://nixos.org/nix/install
+          name: PrismLauncher-Windows-MSVC-arm64-MSIX-${{ env.VERSION }}-${{ inputs.build_type }}
-          extra_nix_config: |
+          path: ${{ env.BUNDLE_STAGING }}/
-            auto-optimise-store = true
+
-            experimental-features = nix-command flakes
+      - name: Create MSIXBundle
-      - uses: cachix/cachix-action@v12
+        shell: pwsh
-        if: inputs.build_type == 'Debug'
+        run: |
+          makeappx.exe bundle /bv ${{ env.APPX_VERSION }} /d ${{ env.BUNDLE_STAGING }} /p ${{ env.BUNDLE_STAGING }}\prismlauncher-${{ env.APPX_VERSION }}.msixbundle
+
+      - name: Update AppInstaller File
+        shell: pwsh
+        run: |
+           (Get-Content ${{ github.workspace }}\program_info\prismlauncher.AppInstaller) `
+             -replace "PRISM_VERSION_REPLACEME","${{ env.APPX_VERSION }}" `
+             > ${{ env.APPINSTALLER_STAGING }}\prismlauncher-${{ env.APPX_VERSION }}.appInstaller
+
+      - name: Fetch codesign certificate
+        shell: bash
+        run: |
+          echo '${{ secrets.WINDOWS_CODESIGN_CERT }}' | base64 --decode > codesign.pfx
+
+      - name: Sign MSIXBundle
+        shell: pwsh
+        run: |
+          if (Get-Content ./codesign.pfx) {
+            SignTool sign /fd sha256 /td sha256 /f codesign.pfx `
+              /p '${{ secrets.WINDOWS_CODESIGN_PASSWORD }}' `
+              /tr http://timestamp.digicert.com `
+              ${{ env.BUNDLE_STAGING }}\prismlauncher-${{ env.APPX_VERSION }}.msixbundle
+          } else {
+            ":warning: Skipped code signing for Windows, as certificate was not present." >> $env:GITHUB_STEP_SUMMARY
+          }
+
+      - name: Upload MSIXBundle
+        uses: actions/upload-artifact@v2
         with:
-          name: prismlauncher
+          name: PrismLauncher-Windows-MSVC-Universal-MSIXBundle-${{ env.VERSION }}-${{ inputs.build_type }}
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+          path: ${{ env.BUNDLE_STAGING }}/prismlauncher-${{ env.APPX_VERSION }}.msixbundle
-      - name: Build
+
-        if: inputs.build_type == 'Debug'
+      - name: Upload AppInstaller
-        run: nix build .#${{ matrix.package }} --print-build-logs
+        uses: actions/upload-artifact@v2
+        with:
+          name: PrismLauncher-Windows-MSVC-Universal-AppInstaller-${{ env.VERSION }}-${{ inputs.build_type }}
+          path: ${{ env.APPINSTALLER_STAGING }}/prismlauncher-${{ env.APPX_VERSION }}.AppInstaller
+
+            #flatpak:
+            #  runs-on: ubuntu-latest
+            #  container:
+            #    image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
+            #    options: --privileged
+            #  steps:
+            #    - name: Checkout
+            #      uses: actions/checkout@v3
+            #      if: inputs.build_type == 'Debug'
+            #      with:
+            #        submodules: 'true'
+            #    - name: Build Flatpak (Linux)
+            #      if: inputs.build_type == 'Debug'
+            #      uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+            #      with:
+            #        bundle: "Prism Launcher.flatpak"
+            #        manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml 
+
+            #nix:
+            #  runs-on: ubuntu-latest
+            #  strategy:
+            #    matrix:
+            #      package:
+            #        - prismlauncher
+            #        - prismlauncher-qt5
+            #  steps:
+            #    - name: Clone repository
+            #      if: inputs.build_type == 'Debug'
+            #      uses: actions/checkout@v3
+            #      with:
+            #        submodules: 'true'
+            #    - name: Install nix
+            #      if: inputs.build_type == 'Debug'
+            #      uses: cachix/install-nix-action@v22
+            #      with:
+            #        install_url: https://nixos.org/nix/install
+            #        extra_nix_config: |
+            #          auto-optimise-store = true
+            #          experimental-features = nix-command flakes
+            #    - uses: cachix/cachix-action@v12
+            #      if: inputs.build_type == 'Debug'
+            #      with:
+            #        name: prismlauncher
+            #        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+            #    - name: Build
+            #      if: inputs.build_type == 'Debug'
+            #      run: nix build .#${{ matrix.package }} --print-build-logs

.github/workflows/trigger_release.yml

@@ -55,11 +55,17 @@ jobs:
             ARM64="$(echo -n ${d} | grep -o arm64 || true)"
             INST="$(echo -n ${d} | grep -o Setup || true)"
             PORT="$(echo -n ${d} | grep -o Portable || true)"
+            MSIX="$(echo -n ${d} | grep -o 'msix$' || true)"
+            MSIXBUNDLE="$(echo -n ${d} | grep -o 'msixbundle$' || true)"
+            APPINSTALLER="$(echo -n ${d} | grep -o AppInstaller || true)"
             NAME="PrismLauncher-Windows-MSVC"
             test -z "${LEGACY}" || NAME="${NAME}-Legacy"
             test -z "${ARM64}" || NAME="${NAME}-arm64"
             test -z "${PORT}" || NAME="${NAME}-Portable"
             test -z "${INST}" || mv PrismLauncher-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe
+            test -z "${MSIX}" || mv prismlauncher-*.msix ../${NAME}-${{ env.VERSION }}.msix
+            test -z "${MSIXBUNDLE}" || mv prismlauncher-*.msixbundle ../${NAME}-${{ env.VERSION }}.msixbundle
+            test -z "${APPINSTALLER}" || mv prismlauncher-*.AppInstaller ../${NAME}-${{ env.VERSION }}.AppInstaller
             test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" *
             cd ..
           done
@@ -99,10 +105,13 @@ jobs:
             PrismLauncher-Windows-MSVC-Legacy-Setup-${{ env.VERSION }}.exe
             PrismLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip
-            PrismLauncher-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe
+            PrismLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.msix
+            PrismLauncher-Windows-MSVC-arm64-${{ env.VERSION }}.msixbundle
             PrismLauncher-Windows-MSVC-${{ env.VERSION }}.zip
             PrismLauncher-Windows-MSVC-Portable-${{ env.VERSION }}.zip
-            PrismLauncher-Windows-MSVC-Setup-${{ env.VERSION }}.exe
+            PrismLauncher-Windows-MSVC-${{ env.VERSION }}.msix
+            PrismLauncher-Windows-MSVC-${{ env.VERSION }}.msixbundle
+            PrismLauncher-Windows-MSVC-${{ env.VERSION }}.AppInstaller
             PrismLauncher-macOS-${{ env.VERSION }}.tar.gz
             PrismLauncher-macOS-Legacy-${{ env.VERSION }}.tar.gz
             PrismLauncher-${{ env.VERSION }}.tar.gz

.github/workflows/winget.yml

@@ -11,5 +11,5 @@ jobs:
         with:
           identifier: PrismLauncher.PrismLauncher
           version: ${{ github.event.release.tag_name }}
-          installers-regex: 'PrismLauncher-Windows-MSVC(:?-arm64|-Legacy)?-Setup-.+\.exe$'
+          installers-regex: 'PrismLauncher-Windows-MSVC(-arm64|-Legacy-Setup)?-\d.+\.(exe|msix)?$'
           token: ${{ secrets.WINGET_TOKEN }}

.gitignore

@@ -56,3 +56,7 @@ flatbuild
 
 # Snap
 *.snap
+
+# msix
+bundle_staging
+microsoft.system.package.metadata

README.md

@@ -1,3 +1,5 @@
+test test
+
 <p align="center">
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="/program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg">

program_info/AppxManifest.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
+  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
+  xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
+  xmlns:virtualization="http://schemas.microsoft.com/appx/manifest/virtualization/windows10"
+  IgnorableNamespaces="rescap desktop6 virtualization">
+
+<Identity
+  Name="org.prismlauncher.PrismLauncher"
+  Version="PRISM_VERSION_REPLACEME"
+  Publisher="CN=Sefa Eyeoglu, O=Sefa Eyeoglu, S=Nordrhein-Westfalen, C=DE"
+  ProcessorArchitecture="PRISM_ARCH_REPLACEME" />
+
+  <Properties>
+    <DisplayName>Prism Launcher</DisplayName>
+    <PublisherDisplayName>Prism Launcher</PublisherDisplayName>
+    <Description>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</Description>
+    <Logo>prismlauncher_150x150.png</Logo>
+
+    <desktop6:FileSystemWriteVirtualization>disabled</desktop6:FileSystemWriteVirtualization>
+
+    <virtualization:FileSystemWriteVirtualization>
+      <virtualization:ExcludedDirectories>
+        <virtualization:ExcludedDirectory>$(KnownFolder:RoamingAppData)\PrismLauncher</virtualization:ExcludedDirectory>
+      </virtualization:ExcludedDirectories>
+    </virtualization:FileSystemWriteVirtualization>
+
+  </Properties>
+
+  <Resources>
+    <Resource Language="en-us" />
+  </Resources>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0" />
+    <PackageDependency
+      Name="Microsoft.VCLibs.140.00.UWPDesktop"
+      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+      MinVersion="14.0.30035.0" />
+  </Dependencies>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+    <rescap:Capability Name="unvirtualizedResources"/>
+  </Capabilities>
+
+  <Applications>
+    <Application
+      Id="PrismLauncher"
+      Executable="prismlauncher.exe"
+      EntryPoint="windows.fullTrustApplication"
+    >
+
+      <Extensions>
+        <uap:Extension Category="windows.fileTypeAssociation">
+          <uap:FileTypeAssociation
+            Name="prismlauncher_fileassociations"
+            desktop2:AllowSilentDefaultTakeOver="true"
+            desktop5:ThumbnailTypeOverlay="prismlauncher_44x44.png">
+              <uap:DisplayName>Prism Launcher</uap:DisplayName>
+              <uap:InfoTip>Import into Prism Launcher</uap:InfoTip>
+              <uap:SupportedFileTypes>
+                <uap:FileType>.zip</uap:FileType>
+                <uap:FileType>.mrpack</uap:FileType>
+              </uap:SupportedFileTypes>
+          </uap:FileTypeAssociation>
+        </uap:Extension>
+      </Extensions>
+
+      <uap:VisualElements
+        DisplayName="Prism Launcher"
+        Description="A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once"
+        Square150x150Logo="prismlauncher_150x150.png"
+        Square44x44Logo="prismlauncher_44x44.png"
+        BackgroundColor="transparent"
+      />
+    </Application>
+  </Applications>
+</Package>

program_info/prismlauncher.AppInstaller

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AppInstaller
+  xmlns="http://schemas.microsoft.com/appx/appinstaller/2018"
+  Version="1.0.0.0"
+  Uri="https://msix.mydadleft.me/prismlauncher.AppInstaller" >
+
+  <MainBundle
+    Name="org.prismlauncher.PrismLauncher"
+    Publisher="CN=Sefa Eyeoglu, O=Sefa Eyeoglu, S=Nordrhein-Westfalen, C=DE"
+    Version="PRISM_VERSION_REPLACEME"
+    Uri="https://msix.mydadleft.me/prismlauncher-PRISM_VERSION_REPLACEME.msixbundle" />
+
+  <UpdateSettings>
+    <OnLaunch
+      HoursBetweenUpdateChecks="0"
+      ShowPrompt="true" />
+    <ForceUpdateFromAnyVersion>true</ForceUpdateFromAnyVersion>
+  </UpdateSettings>
+
+</AppInstaller>