Merge branch 'develop' into 'master'

Develop See merge request passbolt/desktop/passbolt-windows!68
passbolt · Nov 10, 2023 · 52aaf08 · 52aaf08
2 parents 28e2d29 + bc7ad93
commit 52aaf08
Show file tree

Hide file tree

Showing 72 changed files with 349,110 additions and 386,827 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 passbolt/Webviews/.DS_Store
 
 .DS_Store
-/passbolt/bin/x64/Debug
+/passbolt/bin
 /passbolt/obj
 /.vs
 /.idea
@@ -17,3 +17,11 @@ passbolt/testEnvironments.json
 
 ._.DS_Store
 passbolt/Webviews/Background/coverage/
+
+*.user
+/passbolt/AppPackages
+/passbolt/BundleArtifacts
+
+*.pfx
+Package.StoreAssociation.xml
+
diff --git a/passbolt-windows-tests/passbolt-windows-tests.csproj b/passbolt-windows-tests/passbolt-windows-tests.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>passbolt-windows-tests</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>

diff --git a/passbolt/Assets/LargeTile.scale-100.png b/passbolt/Assets/LargeTile.scale-100.png
diff --git a/passbolt/Assets/LargeTile.scale-125.png b/passbolt/Assets/LargeTile.scale-125.png
diff --git a/passbolt/Assets/LargeTile.scale-150.png b/passbolt/Assets/LargeTile.scale-150.png
diff --git a/passbolt/Assets/LargeTile.scale-200.png b/passbolt/Assets/LargeTile.scale-200.png
diff --git a/passbolt/Assets/LargeTile.scale-400.png b/passbolt/Assets/LargeTile.scale-400.png
diff --git a/passbolt/Assets/LockScreenLogo.scale-200.png b/passbolt/Assets/LockScreenLogo.scale-200.png
diff --git a/passbolt/Assets/SmallTile.scale-100.png b/passbolt/Assets/SmallTile.scale-100.png
diff --git a/passbolt/Assets/SmallTile.scale-125.png b/passbolt/Assets/SmallTile.scale-125.png
diff --git a/passbolt/Assets/SmallTile.scale-150.png b/passbolt/Assets/SmallTile.scale-150.png
diff --git a/passbolt/Assets/SmallTile.scale-200.png b/passbolt/Assets/SmallTile.scale-200.png
diff --git a/passbolt/Assets/SmallTile.scale-400.png b/passbolt/Assets/SmallTile.scale-400.png
diff --git a/passbolt/Assets/SplashScreen.scale-100.png b/passbolt/Assets/SplashScreen.scale-100.png
diff --git a/passbolt/Assets/SplashScreen.scale-125.png b/passbolt/Assets/SplashScreen.scale-125.png
diff --git a/passbolt/Assets/SplashScreen.scale-150.png b/passbolt/Assets/SplashScreen.scale-150.png
diff --git a/passbolt/Assets/SplashScreen.scale-200.png b/passbolt/Assets/SplashScreen.scale-200.png
diff --git a/passbolt/Assets/SplashScreen.scale-400.png b/passbolt/Assets/SplashScreen.scale-400.png
diff --git a/passbolt/Assets/Square150x150Logo.scale-100.png b/passbolt/Assets/Square150x150Logo.scale-100.png
diff --git a/passbolt/Assets/Square150x150Logo.scale-125.png b/passbolt/Assets/Square150x150Logo.scale-125.png
diff --git a/passbolt/Assets/Square150x150Logo.scale-150.png b/passbolt/Assets/Square150x150Logo.scale-150.png
diff --git a/passbolt/Assets/Square150x150Logo.scale-200.png b/passbolt/Assets/Square150x150Logo.scale-200.png
diff --git a/passbolt/Assets/Square150x150Logo.scale-400.png b/passbolt/Assets/Square150x150Logo.scale-400.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/passbolt/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-24.png b/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-24.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/passbolt/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/passbolt/Assets/Square44x44Logo.scale-100.png b/passbolt/Assets/Square44x44Logo.scale-100.png
diff --git a/passbolt/Assets/Square44x44Logo.scale-125.png b/passbolt/Assets/Square44x44Logo.scale-125.png
diff --git a/passbolt/Assets/Square44x44Logo.scale-150.png b/passbolt/Assets/Square44x44Logo.scale-150.png
diff --git a/passbolt/Assets/Square44x44Logo.scale-200.png b/passbolt/Assets/Square44x44Logo.scale-200.png
diff --git a/passbolt/Assets/Square44x44Logo.scale-400.png b/passbolt/Assets/Square44x44Logo.scale-400.png
diff --git a/passbolt/Assets/Square44x44Logo.targetsize-16.png b/passbolt/Assets/Square44x44Logo.targetsize-16.png
diff --git a/passbolt/Assets/Square44x44Logo.targetsize-24.png b/passbolt/Assets/Square44x44Logo.targetsize-24.png
diff --git a/passbolt/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/passbolt/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/passbolt/Assets/Square44x44Logo.targetsize-256.png b/passbolt/Assets/Square44x44Logo.targetsize-256.png
diff --git a/passbolt/Assets/Square44x44Logo.targetsize-32.png b/passbolt/Assets/Square44x44Logo.targetsize-32.png
diff --git a/passbolt/Assets/Square44x44Logo.targetsize-48.png b/passbolt/Assets/Square44x44Logo.targetsize-48.png
diff --git a/passbolt/Assets/StoreLogo.backup.png b/passbolt/Assets/StoreLogo.backup.png
diff --git a/passbolt/Assets/StoreLogo.scale-100.png b/passbolt/Assets/StoreLogo.scale-100.png
diff --git a/passbolt/Assets/StoreLogo.scale-125.png b/passbolt/Assets/StoreLogo.scale-125.png
diff --git a/passbolt/Assets/StoreLogo.scale-150.png b/passbolt/Assets/StoreLogo.scale-150.png
diff --git a/passbolt/Assets/StoreLogo.scale-200.png b/passbolt/Assets/StoreLogo.scale-200.png
diff --git a/passbolt/Assets/StoreLogo.scale-400.png b/passbolt/Assets/StoreLogo.scale-400.png
diff --git a/passbolt/Assets/Wide310x150Logo.scale-100.png b/passbolt/Assets/Wide310x150Logo.scale-100.png
diff --git a/passbolt/Assets/Wide310x150Logo.scale-125.png b/passbolt/Assets/Wide310x150Logo.scale-125.png
diff --git a/passbolt/Assets/Wide310x150Logo.scale-150.png b/passbolt/Assets/Wide310x150Logo.scale-150.png
diff --git a/passbolt/Assets/Wide310x150Logo.scale-200.png b/passbolt/Assets/Wide310x150Logo.scale-200.png
diff --git a/passbolt/Assets/Wide310x150Logo.scale-400.png b/passbolt/Assets/Wide310x150Logo.scale-400.png
diff --git a/passbolt/Package.appxmanifest b/passbolt/Package.appxmanifest
@@ -7,8 +7,8 @@
   IgnorableNamespaces="uap mp">
 
   <Identity
-    Name="7a57bbf2-aa18-46c4-a24d-67165674edc0"
-    Publisher="CN=Passbolt"
+    Name="Passbolt.Passbolt"
+    Publisher="CN=741D8DC2-3150-4E31-91A8-695906ECE6D2"
     Version="0.5.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="7a57bbf2-aa18-46c4-a24d-67165674edc0" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
@@ -32,14 +32,13 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="passbolt.App">
       <uap:VisualElements
-        DisplayName="passbolt"
+        DisplayName="Passbolt"
         Square150x150Logo="Assets\Square150x150Logo.png"
         Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="passbolt"
+        Description="Passbolt - Open source password manager"
         BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-        <uap:LockScreen BadgeLogo="Assets\StoreLogo.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png"/>
       </uap:VisualElements>
     </Application>
   </Applications>