Merge pull request #154 from 2fast-team/master

fix: missing login wallpaper
2fast-team · Jul 24, 2024 · a288a0f · a288a0f
2 parents d8b07d0 + 41150b9
commit a288a0f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/Project2FA.Shared/ViewModels/Base/CredentialViewModelBase.cs b/Project2FA.Shared/ViewModels/Base/CredentialViewModelBase.cs
@@ -67,8 +67,12 @@ public bool IsMDMLoginScreenWallpaperNotAvailable
                     {
                         return true;
                     }
+                    else
+                    {
+                        return false;
+                    }
                 }
-                return false;
+                return true;
             }
         }
 

diff --git a/Project2FA.UNO.MauiControls/Project2FA.UNO.MauiControls.csproj b/Project2FA.UNO.MauiControls/Project2FA.UNO.MauiControls.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
 	<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj b/Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj
@@ -58,25 +58,25 @@
     <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240606-rc" />
     <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240606-rc" />
     <PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.1.240606-rc" />
-	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
+	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.70" />
+	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
     <PackageReference Include="DryIoc" Version="5.4.3" />
     <PackageReference Include="Prism.Core" Version="8.1.97" />
-    <PackageReference Include="Svg.Skia" Version="1.0.0.19" />
+    <PackageReference Include="Svg.Skia" Version="2.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
-    <PackageReference Include="Uno.Extensions.Maui.WinUI" Version="4.1.28" />
-    <PackageReference Include="Uno.Resizetizer" Version="1.4.10">
+    <PackageReference Include="Uno.Extensions.Maui.WinUI" Version="4.2.2" />
+    <PackageReference Include="Uno.Resizetizer" Version="1.5.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="6.0.24" />
-    <PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="6.0.24" />
-    <PackageReference Include="Uno.WinUI" Version="5.2.175" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="5.2.175" />
-	<PackageReference Include="Uno.WinUI.DevServer" Version="5.2.175" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.175" />
+    <PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="6.1.8" />
+    <PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="6.1.8" />
+    <PackageReference Include="Uno.WinUI" Version="5.3.90" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="5.3.90" />
+	<PackageReference Include="Uno.WinUI.DevServer" Version="5.3.90" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Uno.WinUI.Svg" Version="5.2.175" />
+    <PackageReference Include="Uno.WinUI.Svg" Version="5.3.90" />
     <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
   <Choose>

diff --git a/Project2FA/Project2FA.UWP/Package.appxmanifest b/Project2FA/Project2FA.UWP/Package.appxmanifest
@@ -6,7 +6,7 @@
          xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"
          IgnorableNamespaces="uap mp rescap uap6">
 	<Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.3.0.0" />
-	<mp:PhoneIdentity PhoneProductId="25dac588-a4b0-460b-9963-9fd47458a930" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+	<mp:PhoneIdentity PhoneProductId="cff10835-96e3-42d9-8ce6-607aa854a03f" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 	<Properties>
 		<DisplayName>2fast (Beta)</DisplayName>
 		<PublisherDisplayName>Jan Philipp Weber</PublisherDisplayName>

diff --git a/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj b/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj
@@ -23,7 +23,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64|arm64</AppxBundlePlatforms>
     <PackageCertificateThumbprint>D17FB9F254A915E499415F614115D6D86A448B38</PackageCertificateThumbprint>
     <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>