Merge pull request #147 from Leo-Corporation/vNext

Version 2.3.0.2203

.github/workflows/dotnet-desktop.yml

@@ -1,4 +1,4 @@
-name: .NET Desktop
+name: .NET CI
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
     - name: Install .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe

Passliss.Setup/Setup.iss

@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Passliss"
-#define MyAppVersion "2.2.1.2202"
-#define MyAppFullVersion "2.2.1.2202"
+#define MyAppVersion "2.3.0.2203"
+#define MyAppFullVersion "2.3.0.2203"
 #define MyAppPublisher "Léo Corporation"
 #define MyAppURL "https://leocorporation.dev/"
 #define MyAppExeName "Passliss.exe"
@@ -45,9 +45,9 @@ Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.i
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "H:\Passliss\Passliss\bin\Release\net5.0-windows\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "H:\Passliss\Xalyus Updater\bin\Release\net5.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "H:\Passliss\Passliss\bin\Release\net5.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "H:\Passliss\Passliss\bin\Release\net6.0-windows\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "H:\Passliss\Xalyus Updater\bin\Release\net6.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "H:\Passliss\Passliss\bin\Release\net6.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

Passliss/App.xaml.cs

@@ -25,35 +25,34 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using Passliss.Windows;
 using System.Windows;
 
-namespace Passliss
+namespace Passliss;
+
+/// <summary>
+/// Interaction logic for App.xaml
+/// </summary>
+public partial class App : Application
 {
-	/// <summary>
-	/// Interaction logic for App.xaml
-	/// </summary>
-	public partial class App : Application
+	protected override void OnStartup(StartupEventArgs e)
 	{
-		protected override void OnStartup(StartupEventArgs e)
+		SettingsManager.Load(); // Load settings
+
+		Global.ChangeTheme(); // Update the theme
+		Global.ChangeLanguage(); // Change the language
+
+		PasswordConfigurationManager.Load(); // Load configurations
+
+		Global.SettingsPage = new(); // Create a new settings page
+		Global.GeneratePage = new(); // Create a new generate page
+		Global.StrenghtPage = new(); // Create a new strenght page
+		Global.EncryptPage = new(); // Create a new encryption page
+
+		if (Global.Settings.IsFirstRun.Value)
+		{
+			new FirstRunWindow().Show(); // Show first run experience
+		}
+		else
 		{
-			SettingsManager.Load(); // Load settings
-
-			Global.ChangeTheme(); // Update the theme
-			Global.ChangeLanguage(); // Change the language
-
-			PasswordConfigurationManager.Load(); // Load configurations
-
-			Global.SettingsPage = new(); // Create a new settings page
-			Global.GeneratePage = new(); // Create a new generate page
-			Global.StrenghtPage = new(); // Create a new strenght page
-			Global.EncryptPage = new(); // Create a new encryption page
-
-			if (Global.Settings.IsFirstRun.Value)
-			{
-				new FirstRunWindow().Show(); // Show first run experience
-			}
-			else
-			{
-				new MainWindow().Show(); // Open Passliss
-			}
+			new MainWindow().Show(); // Open Passliss
 		}
 	}
 }