Update dependencies

leosac · May 13, 2024 · a9a53b5 · a9a53b5
1 parent ce9e476
commit a9a53b5
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 36 deletions.
diff --git a/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj b/KeyManager.Library.KeyGen/KeyManager.Library.KeyGen.csproj
@@ -10,7 +10,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager Key Generation Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>
@@ -40,7 +40,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
+ <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
  <PackageReference Include="Crc32.NET" Version="1.2.0" />
  <PackageReference Include="SecretSharingDotNet" Version="0.11.0" />
  </ItemGroup>

diff --git a/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj b/KeyManager.Library.KeyStore.File/KeyManager.Library.KeyStore.File.csproj
@@ -11,7 +11,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager File Key Store Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>
@@ -27,7 +27,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="log4net" Version="2.0.15">
+ <PackageReference Include="log4net" Version="2.0.17">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3">

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
@@ -10,7 +10,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Leosac.WpfApp" Version="1.16.0">
+ <PackageReference Include="Leosac.WpfApp" Version="1.17.0">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="MaterialDesignThemes" Version="4.9.0">

diff --git a/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj b/KeyManager.Library.KeyStore.LCP/KeyManager.Library.KeyStore.LCP.csproj
@@ -11,7 +11,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager LCP Key Store Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>
@@ -27,8 +27,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Leosac.CredentialProvisioning.API" Version="1.6.0" />
- <PackageReference Include="log4net" Version="2.0.15">
+ <PackageReference Include="Leosac.CredentialProvisioning.API" Version="1.7.0" />
+ <PackageReference Include="log4net" Version="2.0.17">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3">

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
@@ -12,9 +12,9 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
- <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
- <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
- <PackageReference Include="coverlet.collector" Version="6.0.1">
+ <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+ <PackageReference Include="coverlet.collector" Version="6.0.2">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>

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
@@ -10,7 +10,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Leosac.WpfApp" Version="1.16.0">
+ <PackageReference Include="Leosac.WpfApp" Version="1.17.0">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="MaterialDesignThemes" Version="4.9.0">

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
@@ -10,7 +10,7 @@
 
  <ItemGroup>
  <PackageReference Include="LibLogicalAccessNetCE" Version="3.1.1" />
- <PackageReference Include="log4net" Version="2.0.15">
+ <PackageReference Include="log4net" Version="2.0.17">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3">

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
@@ -10,7 +10,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Leosac.WpfApp" Version="1.16.0">
+ <PackageReference Include="Leosac.WpfApp" Version="1.17.0">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="MaterialDesignThemes" Version="4.9.0">

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
@@ -13,7 +13,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="log4net" Version="2.0.15">
+ <PackageReference Include="log4net" Version="2.0.17">
  <ExcludeAssets>runtime</ExcludeAssets>
  </PackageReference>
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3">

diff --git a/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj b/KeyManager.Library.Plugin.UI/KeyManager.Library.Plugin.UI.csproj
@@ -10,7 +10,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager Plugin UI Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>

diff --git a/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj b/KeyManager.Library.Plugin/KeyManager.Library.Plugin.csproj
@@ -9,7 +9,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager Plugin Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>

diff --git a/KeyManager.Library.Tests/KeyManager.Library.Tests.csproj b/KeyManager.Library.Tests/KeyManager.Library.Tests.csproj
@@ -12,9 +12,9 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
- <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
- <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
- <PackageReference Include="coverlet.collector" Version="6.0.1">
+ <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+ <PackageReference Include="coverlet.collector" Version="6.0.2">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>

diff --git 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
@@ -11,7 +11,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager UI Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>
@@ -31,11 +31,11 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Leosac.WpfApp" Version="1.16.0" />
+ <PackageReference Include="Leosac.WpfApp" Version="1.17.0" />
  <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
- <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.4" />
+ <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.5" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
- <PackageReference Include="SkiaSharp" Version="2.88.7" />
+ <PackageReference Include="SkiaSharp" Version="2.88.8" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/KeyManager.Library/KeyManager.Library.csproj b/KeyManager.Library/KeyManager.Library.csproj
@@ -10,7 +10,7 @@
  <PropertyGroup>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageId>Leosac.$(AssemblyName)</PackageId>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Title>Leosac Key Manager Core Library</Title>
  <Company>Leosac SAS</Company>
  <Product>Leosac Key Manager</Product>
@@ -27,7 +27,7 @@
 
  <ItemGroup>
  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
- <PackageReference Include="log4net" Version="2.0.15" />
+ <PackageReference Include="log4net" Version="2.0.17" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>
 

diff --git a/KeyManager.Setup/KeyManager.Setup.wixproj b/KeyManager.Setup/KeyManager.Setup.wixproj
@@ -125,7 +125,7 @@
  <Content Include="leosac_key.ico" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="WixToolset.Netfx.wixext" Version="4.0.4" />
- <PackageReference Include="WixToolset.UI.wixext" Version="4.0.4" />
+ <PackageReference Include="WixToolset.Netfx.wixext" Version="4.0.5" />
+ <PackageReference Include="WixToolset.UI.wixext" Version="4.0.5" />
  </ItemGroup>
 </Project>
diff --git a/KeyManager.Setup/config.wxi b/KeyManager.Setup/config.wxi
@@ -1,7 +1,7 @@
 <Include xmlns="http:https://wixtoolset.org/schemas/v4/wxs">
  <?define Manufacturer = "Leosac" ?>
  <?define ProductName = "Leosac Key Manager" ?>
- <?define Version = "1.15.0.0" ?>
+ <?define Version = "1.16.0.0" ?>
  <?define AboutURL = "https://www.leosac.com" ?>
  <?define SupportURL = "https://www.leosac.com" ?>
  <?define UpdatesURL = "https://www.leosac.com" ?>

diff --git 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
@@ -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
@@ -5,7 +5,7 @@
  <TargetFramework>net8.0-windows7.0</TargetFramework>
  <Nullable>enable</Nullable>
  <UseWPF>true</UseWPF>
- <Version>1.15.0</Version>
+ <Version>1.16.0</Version>
  <Product>Leosac Key Manager</Product>
  <Description>Key Manager for Access Control and RFID related technologies, by Leosac.</Description>
  <Company>Leosac SAS</Company>
@@ -25,8 +25,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Leosac.WpfApp" Version="1.16.0" />
- <PackageReference Include="log4net" Version="2.0.15" />
+ <PackageReference Include="Leosac.WpfApp" Version="1.17.0" />
+ <PackageReference Include="log4net" Version="2.0.17" />
  <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
  </ItemGroup>