[ci] Try to put the windows store build in GH actions and add a MinGW…

… action
ossia · Jul 31, 2022 · 919e08a · 919e08a
1 parent d2aab23
commit 919e08a
Show file tree

Hide file tree

Showing 62 changed files with 185 additions and 43 deletions.
diff --git a/.github/workflows/win-builds.yaml b/.github/workflows/win-builds.yaml
@@ -0,0 +1,84 @@
+name: Windows build
+on: push
+
+jobs:
+  winstore:
+    name: Windows (store)
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
+      - name: Dependencies
+        shell: bash
+        run: |
+          ./ci/win32.deps.sh
+
+      - name: Build
+        shell: cmd
+        run: |
+          call "%cd%\ci\win32store.build.cmd"
+
+      - name: Create certificate
+        shell: pwsh
+        run: |
+          .\ci\win32store.cert.ps1
+
+      - name: Deploy
+        shell: cmd
+        run: |
+          call "%cd%\ci\win32store.deploy.cmd"
+
+      - name: Upload build
+        uses: actions/upload-artifact@v2
+        with:
+          name: windows-store
+          path: |
+            output/*.appxbundle
+
+  mingw:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: mingw32, env: i686 }
+          - { sys: ucrt64,  env: ucrt-x86_64 } 
+          - { sys: clang64, env: clang-x86_64 }
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Setup msys2 and mingw-w64
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{matrix.sys}}
+          update: true
+          pacboy: >-
+            cmake:p 
+            ninja:p 
+            toolchain:p 
+            qt6-base:p 
+            qt6-declarative:p 
+            qt6-websockets:p 
+            qt6-serialport:p
+            qt6-shadertools:p 
+            qt6-5compat:p 
+            qt6-scxml:p 
+            qt6-tools:p
+            boost:p 
+            portaudio:p 
+            fftw:p 
+            ffmpeg:p
+            SDL2:p
+            
+      - name: Dependencies
+        shell: msys2 {0}
+        run: |
+          ./ci/mingw.deps.sh
+
+      - name: Build
+        shell: msys2 {0}
+        run: |
+          ./ci/mingw.build.sh
diff --git a/3rdparty/Spout/SpoutUtils.h b/3rdparty/Spout/SpoutUtils.h
@@ -52,7 +52,7 @@
 // a Visual studio 2017 compiler. "#include <chrono>" will then fail.
 // If this is a problem, remove _MSC_VER_ and manually enable/disable the USE_CHRONO define.
 //
-#if _MSC_VER >= 1900 || defined (__clang__)
+#if _MSC_VER >= 1900 || defined (__clang__) || (__cplusplus >= 201703L)
 #define USE_CHRONO
 #endif
 

diff --git a/ci/mingw.build.sh b/ci/mingw.build.sh
@@ -2,15 +2,23 @@
 
 export SCORE_DIR=$PWD
 
-mkdir -p /build || true
-cd /build
+mkdir -p build || true
+cd build
+
+# FIXME vst3 error in sdk hosting...
+# FIXME windres error.. https://gitlab.kitware.com/cmake/cmake/-/merge_requests/24
+
 
 cmake $SCORE_DIR \
-  -GNinja \
+  -G"MinGW Makefiles" \
+  -DQT_VERSION="Qt6;6.2" \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=install \
+  -DSCORE_DISABLED_PLUGINS=score-plugin-vst3 \
   -DCMAKE_CXX_FLAGS="-Wa,-mbig-obj" \
-  -DSCORE_DYNAMIC_PLUGINS=1 \
+  -DCMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS=1 \
+  -DCMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 \
+  -DCMAKE_NINJA_FORCE_RESPONSE_FILE=1 \
   -DSCORE_PCH=1
 
 cmake --build .

diff --git a/ci/mingw.deps.sh b/ci/mingw.deps.sh
@@ -1,20 +1,15 @@
 #!/bin/bash -eux
 
-sudo pacman -S --needed --noconfirm \
-    mingw-w64-qt5-base mingw-w64-qt5-declarative mingw-w64-qt5-serialport mingw-w64-qt5-websockets \
-    mingw-w64-portaudio \
-    mingw-w64-fftw \
-    mingw-w64-ffmpeg \
-    ninja \
-    mingw-w64-gcc
+# Done in the GH action for caching:
+# pacboy -S --needed --noconfirm \
+#     cmake:p ninja:p toolchain:p \
+#     qt6-base:p qt6-declarative:p qt6-websockets:p qt6-serialport:p \
+#     qt6-shadertools:p qt6-5compat:p qt6-scxml:p qt6-tools:p \
+#     boost:p portaudio:p fftw:p ffmpeg:p \
+#     SDL2:p
 
-# sudo pacman -S --needed --noconfirm \
-#     mingw-w64-x86_64-qt5 \
-#     mingw-w64-x86_64-portaudio \
-#     mingw-w64-x86_64-fftw \
-#     mingw-w64-x86_64-ffmpeg \
-#     mingw-w64-x86_64-cmake \
-#     mingw-w64-x86_64-ninja \
-#     mingw-w64-x86_64-gcc
+# TODO:
+# jack2:p   not available on clang?
+# lv2 suil lilv
 
-source ci/common.deps.sh
+# source ci/common.deps.sh
diff --git a/ci/win32store.build.cmd b/ci/win32store.build.cmd
@@ -1,19 +1,30 @@
+set SCORE_DIR=%cd%
 mkdir build
 cd build
 
+mkdir install
+
 set PATH=%PATH%;c:\ossia-sdk\llvm\bin
-cmake -GNinja %BUILD_SOURCESDIRECTORY% ^
+cmake -GNinja %SCORE_DIR% ^
   -DCMAKE_C_COMPILER=c:/ossia-sdk/llvm/bin/clang.exe ^
   -DCMAKE_CXX_COMPILER=c:/ossia-sdk/llvm/bin/clang++.exe ^
+  -DCMAKE_C_FLAGS=" -flto -fno-stack-protector -Ofast -fno-finite-math-only -D_WIN32_WINNT_=0x0A00 -DWINVER=0x0A00 " ^
+  -DCMAKE_CXX_FLAGS=" -flto -fno-stack-protector -Ofast -fno-finite-math-only -D_WIN32_WINNT_=0x0A00 -DWINVER=0x0A00 " ^
   -DOSSIA_SDK=c:\ossia-sdk ^
   -DCMAKE_INSTALL_PREFIX=install ^
   -DCMAKE_BUILD_TYPE=Release ^
   -DCMAKE_UNITY_BUILD=1 ^
   -DOSSIA_STATIC_EXPORT=0 ^
   -DSCORE_INSTALL_HEADERS=0 ^
-  -DSCORE_DISABLED_PLUGINS="score-plugin-faust;score-plugin-jit;score-plugin-pd" ^
+  -DSCORE_DISABLED_PLUGINS="score-plugin-faust;score-plugin-jit" ^
   -DSCORE_DEPLOYMENT_BUILD=1 ^
-  -DSCORE_MSSTORE_DEPLOYMENT=1
+  -DSCORE_MSSTORE_DEPLOYMENT=1 ^
+  -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=1
 
 cmake --build .
-cmake --build . --target install
+cmake --build . --target install/strip
+REM 
+REM llvm-strip install/score.exe
+REM llvm-strip install/ossia-score-vstpuppet.exe
+REM llvm-strip install/ossia-score-vst3puppet.exe
+REM 
diff --git a/ci/win32store.cert.ps1 b/ci/win32store.cert.ps1
@@ -0,0 +1,14 @@
+$cert = New-SelfSignedCertificate `
+  -Type Custom `
+  -Subject $Env:OSSIA_WIN32_CERT_SUBJECT `
+  -KeyUsage DigitalSignature `
+  -FriendlyName "ossia.io" `
+  -CertStoreLocation "Cert:\CurrentUser\My" `
+  -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")
+
+$password = ConvertTo-SecureString -String $Env:OSSIA_WIN32_CERT_PASSWORD -Force -AsPlainText
+
+Export-PfxCertificate `
+  -cert "Cert:\CurrentUser\My\$($cert.Thumbprint)" `
+  -FilePath ossia-selfsigned.pfx `
+  -Password $password
diff --git a/ci/win32store.deploy.cmd b/ci/win32store.deploy.cmd
@@ -1,22 +1,47 @@
-set SCORE_PATH=%CD%
-cd build
-cd install
-
-REM makepri createconfig /cf priconfig.xml /dq en-US
-REM makepri.exe new /pr %cd% /cf %cd%\priconfig.xml
+@echo off
+set SCORE_PATH=%cd%
+set BUILD_PATH=%cd%\build
+set OSSIA_WIN32_CERTIFICATE=%SCORE_PATH%\ossia-selfsigned.pfx
 
+cd %BUILD_PATH%
+rmdir output /s
 
+cd install
 
+REM Cleanup unused things
+rmdir faust\docs /s
+
+del /s /q *.eot
+del /s /q *.ttf
+del /s /q *.woff
+del /s /q *.md
+del /s /q *.css
+del /s /q *.html
+del /s /q *.gz
+del /s /q *.jpg
+del /s /q *.jpeg
+del /s /q *.xml
+del /s /q *.pri
+
+REM Create resource files
+REM (Necessary for multi-scale images, etc.)
+makepri.exe createconfig /cf priconfig.xml /dq en-US
+makepri.exe new /pr %cd% /cf %cd%\priconfig.xml /mn %cd%\manifests\Package.appxmanifest
+
+REM Embed manifest inside score.exe
 mt.exe -nologo -manifest score.exe.manifest -outputresource:"score.exe;#1"
 
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug score.exe
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug libc++.dll
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug libunwind.dll
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug libwinpthread-1.dll
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug ossia-score-vstpuppet.exe
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug ossia-score-vst3puppet.exe
+REM Sign every binary file
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% score.exe
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% ossia-score-vstpuppet.exe
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% ossia-score-vst3puppet.exe
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% libc++.dll
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% libunwind.dll
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% libwinpthread-1.dll
 
-makeappx build /v /f %SCORE_PATH%\cmake\Deployment\Windows\store\PackagingLayout.xml /op ..\output /bv %GITTAGNOV%.0 /pv %GITTAGNOV%.0 /ca
+REM Create the appxbundle
+makeappx build /v /f %SCORE_PATH%\cmake\Deployment\Windows\store\PackagingLayout.xml /op %SCORE_PATH%\output /bv %GITTAGNOV%.0 /pv %GITTAGNOV%.0 /ca
 
-signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERTIFICATE_PASSWORD% /debug %SCORE_PATH%\build\output\ossia-score.appxbundle
+REM Sign the appxbundle
+signtool sign /fd sha256 /a /f %OSSIA_WIN32_CERTIFICATE% /p %OSSIA_WIN32_CERT_PASSWORD% %SCORE_PATH%\output\ossia-score.appxbundle
 
diff --git a/cmake/Deployment/Windows/store/PackagingLayout.xml b/cmake/Deployment/Windows/store/PackagingLayout.xml
@@ -3,12 +3,16 @@
     <Package ID="x64" ProcessorArchitecture="x64">
       <Files>
         <File DestinationPath="score.exe" SourcePath="score.exe"/>
+        <File DestinationPath="ossia-score-vstpuppet.exe" SourcePath="ossia-score-vstpuppet.exe"/>
+        <File DestinationPath="ossia-score-vst3puppet.exe" SourcePath="ossia-score-vst3puppet.exe"/>
         <File DestinationPath="*.manifest" SourcePath="*.manifest"/>
         <File DestinationPath="*.dll" SourcePath="*.dll"/>
         <File DestinationPath="*.conf" SourcePath="*.conf"/>
         <File DestinationPath="*.png" SourcePath="*.png"/>
         <File DestinationPath="images\*.png" SourcePath="images\*.png"/>
         <File DestinationPath="*.ico" SourcePath="*.ico"/>
+        <File DestinationPath="*.pri" SourcePath="*.pri"/>
+        <File DestinationPath="*.xml" SourcePath="*.xml"/>
         <!-- <File DestinationPath="faust\\**" SourcePath="faust\**"/> -->
       </Files>
     </Package>

diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-100.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-125.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-150.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-200.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/LargeTile.scale-400.png b/cmake/Deployment/Windows/store/images/LargeTile.scale-400.png
diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-100.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-125.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-150.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-200.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/SmallTile.scale-400.png b/cmake/Deployment/Windows/store/images/SmallTile.scale-400.png
diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-100.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-125.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-150.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-200.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/SplashScreen.scale-400.png b/cmake/Deployment/Windows/store/images/SplashScreen.scale-400.png
diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-100.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-125.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-150.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-200.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-400.png b/cmake/Deployment/Windows/store/images/Square150x150Logo.scale-400.png
diff --git a/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/...t/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/...t/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/...nt/Windows/store/images/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/...loyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-16.png b/...loyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/...oyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-256.png b/...oyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/...loyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-32.png b/...loyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/...loyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-48.png b/...loyment/Windows/store/images/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-100.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-125.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-150.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-200.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-400.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.scale-400.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-16.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-16.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-24.png
diff --git a/...loyment/Windows/store/images/Square44x44Logo.targetsize-24_altform-unplated.png b/...loyment/Windows/store/images/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-256.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-256.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-32.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-32.png
diff --git a/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-48.png b/cmake/Deployment/Windows/store/images/Square44x44Logo.targetsize-48.png
diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-100.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-125.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-150.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-200.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/StoreLogo.scale-400.png b/cmake/Deployment/Windows/store/images/StoreLogo.scale-400.png
diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-100.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-100.png
diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-125.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-125.png
diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-150.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-150.png
diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-200.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-200.png
diff --git a/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-400.png b/cmake/Deployment/Windows/store/images/Wide310x150Logo.scale-400.png
diff --git a/cmake/Deployment/Windows/store/images/ossia-150x150.png b/cmake/Deployment/Windows/store/images/ossia-150x150.png
diff --git a/cmake/Deployment/Windows/store/images/ossia-44x44.png b/cmake/Deployment/Windows/store/images/ossia-44x44.png
diff --git a/cmake/Deployment/Windows/store/images/ossia-50x50.png b/cmake/Deployment/Windows/store/images/ossia-50x50.png
diff --git a/cmake/Deployment/Windows/store/manifests/Package.appxmanifest.in b/cmake/Deployment/Windows/store/manifests/Package.appxmanifest.in
@@ -16,7 +16,7 @@
   <Properties>
     <DisplayName>ossia score</DisplayName>
     <PublisherDisplayName>ossia.io</PublisherDisplayName>
-    <Logo>images/ossia-50x50.png</Logo>
+    <Logo>images/StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
@@ -30,10 +30,11 @@
       <uap:VisualElements 
         DisplayName="ossia score"
         Description="an interactive and intermedia sequencer"
-        Square150x150Logo="images/ossia-150x150.png"
-        Square44x44Logo="images/ossia-44x44.png"
+        Square150x150Logo="images/Square150x150Logo.png"
+        Square44x44Logo="images/Square44x44Logo.png"
         BackgroundColor="transparent">
-        <uap:SplashScreen Image="images/banner-620x300.png" />
+        <uap:DefaultTile Wide310x150Logo="images/Wide310x150Logo.png" Square71x71Logo="images/SmallTile.png" Square310x310Logo="images/LargeTile.png"/>
+        <uap:SplashScreen Image="images/SplashScreen.png" />
       </uap:VisualElements>
 
       <Extensions>