v1.8.2

.github/workflows/build-nightly.yml

@@ -4,68 +4,79 @@ on:
     branches:
     - develop
 jobs:
-  buildAvaloniaLinuxX64:
-    name: Build Avalonia Linux X64
-    runs-on: windows-2022
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Prepare Env
-      uses: microsoft/setup-msbuild@v1.1
-    - name: Build
-      env:
-        DOTNET_NOLOGO: true
-      run: |
-        dotnet publish LRReader.Avalonia.Desktop\LRReader.Avalonia.Desktop.csproj -nologo -v:minimal /p:Configuration=Release /p:PublishProfile=linux-x64
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: LRReader.Avalonia.Desktop.Linux-X64
-        path: LRReader.Avalonia.Desktop/publish/linux-x64
-  buildAvaloniaMacOSX64:
-    name: Build Avalonia macOS X64
-    runs-on: windows-2022
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Prepare Env
-      uses: microsoft/setup-msbuild@v1.1
-    - name: Build
-      env:
-        DOTNET_NOLOGO: true
-      run: |
-        dotnet publish LRReader.Avalonia.Desktop\LRReader.Avalonia.Desktop.csproj -nologo -v:minimal /p:Configuration=Release /p:PublishProfile=macos-x64
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: LRReader.Avalonia.Desktop.macOS-X64
-        path: LRReader.Avalonia.Desktop/publish/macos-x64
-  buildAvaloniaWinX64:
-    name: Build Avalonia Windows X64
-    runs-on: windows-2022
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Prepare Env
-      uses: microsoft/setup-msbuild@v1.1
-    - name: Build
-      env:
-        DOTNET_NOLOGO: true
-      run: |
-        dotnet publish LRReader.Avalonia.Desktop\LRReader.Avalonia.Desktop.csproj -nologo -v:minimal /p:Configuration=Release /p:PublishProfile=win-x64
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: LRReader.Avalonia.Desktop.Win-X64
-        path: LRReader.Avalonia.Desktop/publish/win-x64
+  # buildAvaloniaLinuxX64:
+  #   name: Build Avalonia Linux X64
+  #   runs-on: windows-2022
+  #   steps:
+  #   - name: Checkout
+  #     uses: actions/checkout@v4
+  #   - name: Prepare Env
+  #     uses: microsoft/setup-msbuild@v2
+  #   - name: Build
+  #     env:
+  #       DOTNET_NOLOGO: true
+  #     run: |
+  #       dotnet publish LRReader.Avalonia.Desktop\LRReader.Avalonia.Desktop.csproj -nologo -v:minimal /p:Configuration=Release /p:PublishProfile=linux-x64
+  #   - name: Upload Artifacts
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: LRReader.Avalonia.Desktop.Linux-X64
+  #       path: LRReader.Avalonia.Desktop/publish/linux-x64
+  # buildAvaloniaMacOSX64:
+  #   name: Build Avalonia macOS X64
+  #   runs-on: windows-2022
+  #   steps:
+  #   - name: Checkout
+  #     uses: actions/checkout@v4
+  #   - name: Prepare Env
+  #     uses: microsoft/setup-msbuild@v2
+  #   - name: Build
+  #     env:
+  #       DOTNET_NOLOGO: true
+  #     run: |
+  #       dotnet publish LRReader.Avalonia.Desktop\LRReader.Avalonia.Desktop.csproj -nologo -v:minimal /p:Configuration=Release /p:PublishProfile=macos-x64
+  #   - name: Upload Artifacts
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: LRReader.Avalonia.Desktop.macOS-X64
+  #       path: LRReader.Avalonia.Desktop/publish/macos-x64
+  # buildAvaloniaWinX64:
+  #   name: Build Avalonia Windows X64
+  #   runs-on: windows-2022
+  #   steps:
+  #   - name: Checkout
+  #     uses: actions/checkout@v4
+  #   - name: Prepare Env
+  #     uses: microsoft/setup-msbuild@v2
+  #   - name: Build
+  #     env:
+  #       DOTNET_NOLOGO: true
+  #     run: |
+  #       dotnet publish LRReader.Avalonia.Desktop\LRReader.Avalonia.Desktop.csproj -nologo -v:minimal /p:Configuration=Release /p:PublishProfile=win-x64
+  #   - name: Upload Artifacts
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: LRReader.Avalonia.Desktop.Win-X64
+  #       path: LRReader.Avalonia.Desktop/publish/win-x64
   buildUWP:
-    name: Build UWP
+    name: Sideload
     runs-on: windows-2022
+    permissions:
+      packages: read
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare Env
-      uses: microsoft/[email protected]
+      uses: microsoft/setup-msbuild@v2
+    - name: Auth nuget registry
+      run: dotnet nuget update source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text guerra24
+    - name: Prepare nuget cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: nuget-uwp-${{ hashFiles('LRReader.Shared/packages.lock.json', 'LRReader.UWP/packages.lock.json') }}
+        restore-keys: |
+          nuget-uwp-
     - name: Build
       env:
         CERT_PASSWORD: ${{ secrets.CERT_PASSWORD }}
@@ -79,7 +90,7 @@ jobs:
         & "C:\Program Files\Git\usr\bin\gpg.exe" --quiet --batch --yes --decrypt --passphrase="${env:CERT_GPG}" --output Cert.pfx Cert.pfx.gpg
         Invoke-Expression "./Util/Version.ps1 ${env:BUILD_NUMBER}"
         Invoke-Expression "./Util/ConfigureAppCenter.ps1"
-        MSBuild LRReader.UWP\LRReader.UWP.csproj -nologo -r -v:minimal /p:Nightly=true /p:Configuration=Release /p:UapAppxPackageBuildMode="SideloadOnly" /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="" /p:PackageCertificateKeyFile="..\Cert.pfx" /p:PackageCertificatePassword="${env:CERT_PASSWORD}" /p:GenerateAppInstallerFile=True /p:AppInstallerUri="https://s3.guerra24.net/projects/lrr/nightly"
+        MSBuild LRReader.UWP\LRReader.UWP.csproj -nologo -r -v:minimal /p:RestoreLockedMode=true /p:Nightly=true /p:Configuration=Release /p:UapAppxPackageBuildMode="SideloadOnly" /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="" /p:PackageCertificateKeyFile="..\Cert.pfx" /p:PackageCertificatePassword="${env:CERT_PASSWORD}" /p:GenerateAppInstallerFile=True /p:AppInstallerUri="https://s3.guerra24.net/projects/lrr/nightly"
         Remove-Item -Path "./Cert.pfx.gpg","./Cert.pfx"
         Invoke-Expression "./Util/CleanInstaller.ps1"
     - name: Prepare for upload
@@ -89,7 +100,7 @@ jobs:
         Set-Location "./LRReader.UWP/AppPackages/LRReader.UWP"
         Remove-Item $(Get-ChildItem *.appxsym -File)
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -99,29 +110,43 @@ jobs:
         AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
       run: aws s3 sync LRReader.UWP/AppPackages s3://${env:AWS_S3_BUCKET}/projects/lrr/nightly --no-progress --acl public-read --follow-symlinks --delete
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: LRReader.UWP
         path: LRReader.UWP/AppPackages
-  buildUWPInstaller:
-    name: Build UWP Installer
+  buildInstaller:
+    name: Installer
     runs-on: windows-2022
+    permissions:
+      packages: read
+    strategy:
+      matrix:
+        arch: [x64, ARM64]
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare Env
-      uses: microsoft/[email protected]
+      uses: microsoft/setup-msbuild@v2
+    - name: Auth nuget registry
+      run: dotnet nuget update source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text guerra24
+    - name: Prepare nuget cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: nuget-installer-${{ hashFiles('LRReader.UWP.Installer/packages.lock.json') }}
+        restore-keys: |
+          nuget-installer-
     - name: Build
       env:
         APP_VERSION: Nightly
       run: |
         Invoke-Expression "./Util/ConfigureInstaller.ps1"
-        MSBuild LRReader.UWP.Installer\LRReader.UWP.Installer.csproj -nologo -r -v:minimal /p:Configuration=Release
+        MSBuild LRReader.UWP.Installer\LRReader.UWP.Installer.csproj -nologo -r -v:minimal /p:RestoreLockedMode=true /p:Configuration=Release /p:Platform=${{ matrix.arch }}
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: LRReader.UWP.Installer
-        path: LRReader.UWP.Installer/bin/Release/LRReader.exe
+        name: Installer-${{ matrix.arch }}
+        path: LRReader.UWP.Installer/bin/${{ matrix.arch }}/Release/net472/LRReader.UWP.Installer.exe
   purgeUWPCache:
     name: Purge UWP Nightly cache
     needs: buildUWP

.github/workflows/build-release.yml

@@ -4,14 +4,25 @@ on:
     types: [published]
 jobs:
   buildAppxBundle:
-    name: Build AppInstaller
+    name: Sideload
     runs-on: windows-2022
+    permissions:
+      packages: read
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare Env
-      uses: microsoft/[email protected]
-    - name: Build AppInstaller
+      uses: microsoft/setup-msbuild@v2
+    - name: Auth nuget registry
+      run: dotnet nuget update source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text guerra24
+    - name: Prepare nuget cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: nuget-uwp-${{ hashFiles('LRReader.Shared/packages.lock.json', 'LRReader.UWP/packages.lock.json') }}
+        restore-keys: |
+          nuget-uwp-
+    - name: Build
       env:
         CERT_PASSWORD: ${{ secrets.CERT_PASSWORD }}
         CERT_GPG: ${{ secrets.CERT_GPG }}
@@ -24,7 +35,7 @@ jobs:
         [IO.File]::WriteAllBytes("./Cert.pfx.gpg", [Convert]::FromBase64String("${env:CERT_BASE64}"))
         & "C:\Program Files\Git\usr\bin\gpg.exe" --quiet --batch --yes --decrypt --passphrase="${env:CERT_GPG}" --output Cert.pfx Cert.pfx.gpg
         Invoke-Expression "./Util/ConfigureAppCenter.ps1"
-        MSBuild LRReader.UWP\LRReader.UWP.csproj -nologo -r -v:minimal /p:Sideload=true /p:Configuration=Release /p:UapAppxPackageBuildMode="SideloadOnly" /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="" /p:PackageCertificateKeyFile="..\Cert.pfx" /p:PackageCertificatePassword="${env:CERT_PASSWORD}" /p:GenerateAppInstallerFile=True /p:AppInstallerUri="https://s3.guerra24.net/projects/lrr/$($xmlDoc.Package.Identity.Version)"
+        MSBuild LRReader.UWP\LRReader.UWP.csproj -nologo -r -v:minimal /p:RestoreLockedMode=true /p:Sideload=true /p:Configuration=Release /p:UapAppxPackageBuildMode="SideloadOnly" /p:AppxPackageSigningEnabled=true /p:PackageCertificateThumbprint="" /p:PackageCertificateKeyFile="..\Cert.pfx" /p:PackageCertificatePassword="${env:CERT_PASSWORD}" /p:GenerateAppInstallerFile=True /p:AppInstallerUri="https://s3.guerra24.net/projects/lrr/$($xmlDoc.Package.Identity.Version)"
         Remove-Item -Path "./Cert.pfx.gpg","./Cert.pfx"
         Invoke-Expression "./Util/CleanInstaller.ps1"
     - name: Prepare for upload
@@ -38,12 +49,12 @@ jobs:
         foreach ($file in $(Get-ChildItem *.appxsym -File)) { appcenter crashes upload-symbols --app Guerra24/LRReader --appxsym $file --token ${env:APPCENTER_TOKEN} }
         Remove-Item $(Get-ChildItem *.appxsym -File)
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: LRReader
         path: LRReader.UWP/AppPackages
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -59,47 +70,72 @@ jobs:
         path: LRReader.UWP/AppPackages/LRReader.UWP.appinstaller
         repo-token: ${{ secrets.GITHUB_TOKEN }}
   buildInstaller:
-    name: Build Installer
+    name: Installer
     runs-on: windows-2022
+    permissions:
+      packages: read
+    strategy:
+      matrix:
+        arch: [x64, ARM64]
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare Env
-      uses: microsoft/[email protected]
-    - name: Installer
+      uses: microsoft/setup-msbuild@v2
+    - name: Auth nuget registry
+      run: dotnet nuget update source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text guerra24
+    - name: Prepare nuget cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: nuget-installer-${{ hashFiles('LRReader.UWP.Installer/packages.lock.json') }}
+        restore-keys: |
+          nuget-installer-
+    - name: Build
       run: |
         [xml]$xmlDoc = Get-Content "./Util/Package.appxmanifest"
         $env:APP_INSTALLER_URL="https://s3.guerra24.net/projects/lrr/$($xmlDoc.Package.Identity.Version)/LRReader.UWP.appinstaller"
         $env:APP_VERSION="$($xmlDoc.Package.Identity.Version)"
         Invoke-Expression "./Util/ConfigureInstaller.ps1"
-        MSBuild LRReader.UWP.Installer\LRReader.UWP.Installer.csproj -nologo -r -v:minimal /p:Configuration=Release
+        MSBuild LRReader.UWP.Installer\LRReader.UWP.Installer.csproj -nologo -r -v:minimal /p:RestoreLockedMode=true /p:Configuration=Release /p:Platform=${{ matrix.arch }}
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: Installer
-        path: LRReader.UWP.Installer/bin/Release/LRReader.exe
+        name: Installer-${{ matrix.arch }}
+        path: LRReader.UWP.Installer/bin/${{ matrix.arch }}/Release/net472/LRReader.UWP.Installer.exe
     - name: Upload to Release
       uses: Guerra24/upload-to-release@v1
       with:
-        name: LRReader.exe
-        path: LRReader.UWP.Installer/bin/Release/LRReader.exe
+        name: LRReader.${{ matrix.arch }}.exe
+        path: LRReader.UWP.Installer/bin/${{ matrix.arch }}/Release/net472/LRReader.UWP.Installer.exe
         repo-token: ${{ secrets.GITHUB_TOKEN }}
   buildStoreBundle:
-    name: Build Store Bundle
+    name: Store
     runs-on: windows-2022
+    permissions:
+      packages: read
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare Env
-      uses: microsoft/[email protected]
-    - name: Build AppInstaller
+      uses: microsoft/setup-msbuild@v2
+    - name: Auth nuget registry
+      run: dotnet nuget update source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text guerra24
+    - name: Prepare nuget cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: nuget-uwp-${{ hashFiles('LRReader.Shared/packages.lock.json', 'LRReader.UWP/packages.lock.json') }}
+        restore-keys: |
+          nuget-uwp-
+    - name: Build
       env:
         APPCENTER_APP_ID: ${{ secrets.APPCENTER_APP_ID }}
       run: |
         Invoke-Expression "./Util/ConfigureAppCenter.ps1"
-        MSBuild LRReader.UWP\LRReader.UWP.csproj -nologo -r -v:minimal /p:Configuration=Release /p:UapAppxPackageBuildMode="StoreOnly" /p:AppxPackageSigningEnabled=false
+        MSBuild LRReader.UWP\LRReader.UWP.csproj -nologo -r -v:minimal /p:RestoreLockedMode=true /p:Configuration=Release /p:UapAppxPackageBuildMode="StoreOnly" /p:AppxPackageSigningEnabled=false
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: LRReader_Store
         path: LRReader.UWP/AppPackages/*.msixupload

LRReader.Avalonia.Desktop/LRReader.Avalonia.Desktop.csproj

@@ -11,7 +11,7 @@
     <Content Include="logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LRReader.Avalonia\LRReader.Avalonia.csproj" />

LRReader.Avalonia/LRReader.Avalonia.csproj

@@ -6,11 +6,11 @@
   <ItemGroup>
     <PackageReference Include="Aura.UI" Version="0.1.4.2" />
     <PackageReference Include="Aura.UI.FluentTheme" Version="0.1.4.2" />
-    <PackageReference Include="Avalonia" Version="0.10.18" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageReference Include="Avalonia" Version="0.10.21" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.21" />
     <PackageReference Include="FluentAvaloniaUI" Version="1.4.5" />
-    <PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" />
+    <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LRReader.Shared\LRReader.Shared.csproj" />

LRReader.Avalonia/Services/Platform.cs

@@ -38,6 +38,8 @@ public override void Init()
 
 		public override uint HoverTime => 500;
 
+		public override bool DualScreen => false;
+
 		public override void ChangeTheme(AppTheme theme)
 		{
 			throw new NotImplementedException();