diff --git a/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj b/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
index c76dc3b..62cb9f7 100644
--- a/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
+++ b/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
@@ -10,7 +10,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager Key Generation Library
Leosac SAS
Leosac Key Manager
@@ -40,7 +40,7 @@
-
+
diff --git a/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj b/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
index b63a12b..3db4967 100644
--- a/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
+++ b/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
@@ -11,7 +11,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager File Key Store Library
Leosac SAS
Leosac Key Manager
@@ -27,7 +27,7 @@
-
+
runtime
diff --git a/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj b/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj
index 751e2fc..44028af 100644
--- a/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj
+++ b/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj
@@ -10,7 +10,7 @@
-
+
runtime
diff --git a/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj b/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
index 40e4750..6978f15 100644
--- a/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
+++ b/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
@@ -11,7 +11,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager LCP Key Store Library
Leosac SAS
Leosac Key Manager
@@ -27,8 +27,8 @@
-
-
+
+
runtime
diff --git a/KeyManager.Library.KeyStore.NXP_SAM.Tests/KeyManager.Library.KeyStore.NXP_SAM.Tests.csproj b/KeyManager.Library.KeyStore.NXP_SAM.Tests/KeyManager.Library.KeyStore.NXP_SAM.Tests.csproj
index 2ade3c5..a07674c 100644
--- a/KeyManager.Library.KeyStore.NXP_SAM.Tests/KeyManager.Library.KeyStore.NXP_SAM.Tests.csproj
+++ b/KeyManager.Library.KeyStore.NXP_SAM.Tests/KeyManager.Library.KeyStore.NXP_SAM.Tests.csproj
@@ -12,9 +12,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj b/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj
index c2c1b51..eff432b 100644
--- a/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj
+++ b/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj
@@ -10,7 +10,7 @@
-
+
runtime
diff --git a/KeyManager.Library.KeyStore.NXP_SAM/KeyManager.Library.KeyStore.NXP_SAM.csproj b/KeyManager.Library.KeyStore.NXP_SAM/KeyManager.Library.KeyStore.NXP_SAM.csproj
index 1f00a97..6f52fb2 100644
--- a/KeyManager.Library.KeyStore.NXP_SAM/KeyManager.Library.KeyStore.NXP_SAM.csproj
+++ b/KeyManager.Library.KeyStore.NXP_SAM/KeyManager.Library.KeyStore.NXP_SAM.csproj
@@ -10,7 +10,7 @@
-
+
runtime
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj b/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj
index 541bb2b..0fefeb4 100644
--- a/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj
+++ b/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj
@@ -10,7 +10,7 @@
-
+
runtime
diff --git a/KeyManager.Library.KeyStore.SAM_SE/KeyManager.Library.KeyStore.SAM_SE.csproj b/KeyManager.Library.KeyStore.SAM_SE/KeyManager.Library.KeyStore.SAM_SE.csproj
index e34ee38..f97eb60 100644
--- a/KeyManager.Library.KeyStore.SAM_SE/KeyManager.Library.KeyStore.SAM_SE.csproj
+++ b/KeyManager.Library.KeyStore.SAM_SE/KeyManager.Library.KeyStore.SAM_SE.csproj
@@ -13,7 +13,7 @@
-
+
runtime
diff --git a/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj b/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
index 57dd8aa..ed47460 100644
--- a/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
+++ b/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
@@ -10,7 +10,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager Plugin UI Library
Leosac SAS
Leosac Key Manager
diff --git a/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj b/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
index 26a987d..a4221ab 100644
--- a/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
+++ b/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
@@ -9,7 +9,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager Plugin Library
Leosac SAS
Leosac Key Manager
diff --git a/KeyManager.Library.Tests/KeyManager.Library.Tests.csproj b/KeyManager.Library.Tests/KeyManager.Library.Tests.csproj
index 132fa8f..e02e07a 100644
--- a/KeyManager.Library.Tests/KeyManager.Library.Tests.csproj
+++ b/KeyManager.Library.Tests/KeyManager.Library.Tests.csproj
@@ -12,9 +12,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/KeyManager.Library.UI/Favorites.cs b/KeyManager.Library.UI/Favorites.cs
index c8b3a11..ea200c1 100644
--- a/KeyManager.Library.UI/Favorites.cs
+++ b/KeyManager.Library.UI/Favorites.cs
@@ -22,6 +22,11 @@ private static void OnSingletonCreated()
return GetSingletonInstance(false);
}
+ public Favorites()
+ {
+ IsUserConfiguration = true;
+ }
+
public static Favorites? GetSingletonInstance(bool forceRecreate)
{
lock (_objlock)
@@ -30,14 +35,14 @@ private static void OnSingletonCreated()
{
try
{
- _settings = KMSettings.LoadFromFile();
+ _settings = KMSettings.LoadFromFile(true);
if (!string.IsNullOrEmpty(_settings?.FavoritesPath))
{
_singleton = LoadFromFile(_settings.FavoritesPath);
}
else
{
- _singleton = LoadFromFile();
+ _singleton = LoadFromFile(true);
}
OnSingletonCreated();
}
diff --git a/KeyManager.Library.UI/KeyManager.Library.UI.csproj b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
index 23eb93d..3691578 100644
--- a/KeyManager.Library.UI/KeyManager.Library.UI.csproj
+++ b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
@@ -11,7 +11,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager UI Library
Leosac SAS
Leosac Key Manager
@@ -31,11 +31,11 @@
-
+
-
+
-
+
diff --git a/KeyManager.Library/KeyManager.Library.csproj b/KeyManager.Library/KeyManager.Library.csproj
index 3302a05..1e2b4f6 100644
--- a/KeyManager.Library/KeyManager.Library.csproj
+++ b/KeyManager.Library/KeyManager.Library.csproj
@@ -10,7 +10,7 @@
True
Leosac.$(AssemblyName)
- 1.15.0
+ 1.16.0
Leosac Key Manager Core Library
Leosac SAS
Leosac Key Manager
@@ -27,7 +27,7 @@
-
+
diff --git a/KeyManager.Setup/KeyManager.Setup.wixproj b/KeyManager.Setup/KeyManager.Setup.wixproj
index e7a28db..00e105c 100644
--- a/KeyManager.Setup/KeyManager.Setup.wixproj
+++ b/KeyManager.Setup/KeyManager.Setup.wixproj
@@ -125,7 +125,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/KeyManager.Setup/config.wxi b/KeyManager.Setup/config.wxi
index d9563c2..131191d 100644
--- a/KeyManager.Setup/config.wxi
+++ b/KeyManager.Setup/config.wxi
@@ -1,7 +1,7 @@
-
+
diff --git a/KeyManager/App.xaml.cs b/KeyManager/App.xaml.cs
index 7991b13..f7e100b 100644
--- a/KeyManager/App.xaml.cs
+++ b/KeyManager/App.xaml.cs
@@ -38,7 +38,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
{
log.Debug("Starting up the application...");
- var settings = AppSettings.GetSingletonInstance();
+ var settings = UserAppSettings.GetSingletonInstance();
if (!string.IsNullOrEmpty(settings.Language))
{
LangHelper.ChangeLanguage(settings.Language);
diff --git a/KeyManager/KMLeosacAppInfo.cs b/KeyManager/KMLeosacAppInfo.cs
index 13466cb..f652ded 100644
--- a/KeyManager/KMLeosacAppInfo.cs
+++ b/KeyManager/KMLeosacAppInfo.cs
@@ -26,7 +26,7 @@ public KMLeosacAppInfo()
SettingsCommand = new RelayCommand(() =>
{
var settingsWindow = new SettingsWindow();
- settingsWindow.DataContext = KMSettings.LoadFromFile();
+ settingsWindow.DataContext = KMSettings.LoadFromFile(false);
settingsWindow.ShowDialog();
});
}
diff --git a/KeyManager/KeyManager.csproj b/KeyManager/KeyManager.csproj
index 8d09d20..5cc1c89 100644
--- a/KeyManager/KeyManager.csproj
+++ b/KeyManager/KeyManager.csproj
@@ -5,7 +5,7 @@
net8.0-windows7.0
enable
true
- 1.15.0
+ 1.16.0
Leosac Key Manager
Key Manager for Access Control and RFID related technologies, by Leosac.
Leosac SAS
@@ -25,8 +25,8 @@
-
-
+
+