Cleanup rebase from release branch

src/Certify.Client/CertifyServiceClient.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Certify.Models;

src/Certify.Core/Management/CertifyManager/CertifyManager.Maintenance.cs

@@ -15,29 +15,6 @@ namespace Certify.Management
 {
  public partial class CertifyManager
  {
- /// <summary>
- /// Upgrade/migrate settings from previous version if applicable
- /// </summary>
- /// <returns></returns>
- private async Task UpgradeSettings()
- {
- var systemVersion = Util.GetAppVersion().ToString();
- var previousVersion = CoreAppSettings.Current.CurrentServiceVersion;
-
- if (CoreAppSettings.Current.CurrentServiceVersion != systemVersion)
- {
- _tc?.TrackEvent("ServiceUpgrade", new Dictionary<string, string> {
- { "previousVersion", previousVersion },
- { "currentVersion", systemVersion }
- });
-
- // service has been updated, run any required migrations
- await PerformServiceUpgrades();
-
- CoreAppSettings.Current.CurrentServiceVersion = systemVersion;
- SettingsManager.SaveAppSettings();
- }
- }
 
  /// <summary>
  /// Upgrade/migrate settings from previous version if applicable

src/Certify.Models/Config/CertRequestConfig.cs

@@ -343,8 +343,6 @@ internal List<string> GetCertificateDomains()
 
  private static JsonSerializerOptions _defaultJsonSerializerOptions = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
 
- private static JsonSerializerOptions _defaultJsonSerializerOptions = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
-
  public List<CertIdentifierItem> GetCertificateIdentifiers()
  {
  var identifiers = new List<CertIdentifierItem>();

src/Certify.Models/Util/EnvironmentUtil.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.Security.Principal;
 
 namespace Certify.Models
 {

src/Certify.Shared/Management/CertificateManager.cs

@@ -752,9 +752,6 @@ private static string GetWindowsPrivateKeyLocation(string keyFileName)
  // if EC/CNG key may be under /keys
  machineKeyPath = Path.Combine(new string[] { appDataPath, "Microsoft", "Crypto", "Keys" });
 
- // if EC/CNG key may be under /keys
- machineKeyPath = Path.Combine(new string[] { appDataPath, "Microsoft", "Crypto", "Keys" });
-
  fileList = Directory.GetFiles(machineKeyPath, keyFileName);
 
  if (fileList.Any())

src/Certify.UI.Shared/ViewModel/AppViewModel/AppViewModel.ManagedCerticates.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;