Rename CreateAppDataPath to EnsuredAppDataPath

webprofusion-chrisc · webprofusion-chrisc · commit b4246771ba26 · 2025-04-29T10:27:02.000+08:00
diff --git a/src/Certify.CLI/CertifyCLI.Activation.cs b/src/Certify.CLI/CertifyCLI.Activation.cs
@@ -13,7 +13,7 @@ private bool IsRegistered()
             var licensingManager = _pluginManager.LicensingManager;
             if (licensingManager != null)
             {
-                if (licensingManager.IsInstallRegistered(ProductTypeID, EnvironmentUtil.CreateAppDataPath()))
+                if (licensingManager.IsInstallRegistered(ProductTypeID, EnvironmentUtil.EnsuredAppDataPath()))
                 {
                     return true;
                 }
@@ -52,7 +52,7 @@ internal async Task Activate(string[] args)
             var licensingManager = _pluginManager.LicensingManager;
             if (licensingManager != null)
             {
-                var settingsPath = EnvironmentUtil.CreateAppDataPath();
+                var settingsPath = EnvironmentUtil.EnsuredAppDataPath();
 
                 var activated = await licensingManager.IsInstallActive(ProductTypeID, settingsPath);
                 if (!activated)
@@ -127,7 +127,7 @@ private async Task<bool> Deactivate(string email)
                     AppVersion = Management.Util.GetAppVersion().ToString()
                 };
 
-                var deactivated = await licensingManager.DeactivateInstall(ProductTypeID, EnvironmentUtil.CreateAppDataPath(), email, instance);
+                var deactivated = await licensingManager.DeactivateInstall(ProductTypeID, EnvironmentUtil.EnsuredAppDataPath(), email, instance);
 
                 return deactivated;
             }
diff --git a/src/Certify.CLI/CertifyCLI.RunCertDiagnostics.cs b/src/Certify.CLI/CertifyCLI.RunCertDiagnostics.cs
@@ -110,7 +110,7 @@ static bool isNumeric(string input)
         public async Task FindPendingAuthorizations(bool autoFix)
         {
             // scan log files for authz URLs, check status of each
-            var logFolder = EnvironmentUtil.CreateAppDataPath("logs");
+            var logFolder = EnvironmentUtil.EnsuredAppDataPath("logs");
             var files = System.IO.Directory.GetFiles(logFolder, "log_*.txt");
             var orderUrls = new List<string>();
 
diff --git a/src/Certify.Client/CertifyServiceClient.cs b/src/Certify.Client/CertifyServiceClient.cs
@@ -59,7 +59,7 @@ public async Task ConnectStatusStreamAsync()
                 _legacyConnection.Closed += OnConnectionClosed;
 
 #if DEBUG
-                var logPath = Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "hubconnection.log");
+                var logPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "hubconnection.log");
                 var writer = new StreamWriter(logPath);
                 writer.AutoFlush = true;
                 _legacyConnection.TraceLevel = TraceLevels.All;
diff --git a/src/Certify.Core/Management/CertifyManager/CertifyManager.Account.cs b/src/Certify.Core/Management/CertifyManager/CertifyManager.Account.cs
@@ -72,7 +72,7 @@ private async Task<IACMEClientProvider> GetACMEProvider(string storageKey, strin
             else
             {
                 var userAgent = Util.GetUserAgent();
-                var settingBaseFolder = EnvironmentUtil.CreateAppDataPath();
+                var settingBaseFolder = EnvironmentUtil.EnsuredAppDataPath();
                 var providerPath = Path.Combine(settingBaseFolder, "certes_" + storageKey);
 
                 var newProvider = new AnvilACMEProvider(new AnvilACMEProviderSettings
@@ -540,7 +540,7 @@ private async Task PerformAccountUpgrades()
 
                 // create provider pointing to legacy storage
                 var apiEndpoint = _certificateAuthorities[StandardCertAuthorities.LETS_ENCRYPT].ProductionAPIEndpoint;
-                var settingBaseFolder = EnvironmentUtil.CreateAppDataPath();
+                var settingBaseFolder = EnvironmentUtil.EnsuredAppDataPath();
                 var providerPath = System.IO.Path.Combine(settingBaseFolder, "certes");
                 var provider = new AnvilACMEProvider(new AnvilACMEProviderSettings
                 {
diff --git a/src/Certify.Core/Management/CertifyManager/CertifyManager.DataStores.cs b/src/Certify.Core/Management/CertifyManager/CertifyManager.DataStores.cs
@@ -255,7 +255,7 @@ public async Task<List<DataStoreConnection>> GetDataStores()
         {
             var dataStores = new List<DataStoreConnection>();
 
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var path = Path.Combine(appDataPath, "datastores.json");
 
             if (System.IO.File.Exists(path))
@@ -420,7 +420,7 @@ public async Task<List<ActionStep>> UpdateDataStoreConnection(DataStoreConnectio
             }
 
             //save
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var path = Path.Combine(appDataPath, "datastores.json");
 
             lock (_dataStoreLocker)
@@ -457,7 +457,7 @@ public async Task<List<ActionStep>> RemoveDataStoreConnection(string dataStoreId
                 dataStores.Remove(existing);
 
                 //save
-                var appDataPath = EnvironmentUtil.CreateAppDataPath();
+                var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
                 var path = Path.Combine(appDataPath, "datastores.json");
 
                 lock (_dataStoreLocker)
diff --git a/src/Certify.Core/Management/CertifyManager/CertifyManager.Maintenance.cs b/src/Certify.Core/Management/CertifyManager/CertifyManager.Maintenance.cs
@@ -640,14 +640,14 @@ public async Task PerformCertificateCleanup()
                     {
 
                         // cleanup old pfx files in asset store(s), if any
-                        var assetPath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "certes", "assets");
+                        var assetPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "certes", "assets");
                         if (Directory.Exists(assetPath))
                         {
                             var ext = new List<string> { ".pfx" };
                             DeleteOldCertificateFiles(assetPath, ext);
                         }
 
-                        assetPath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "assets");
+                        assetPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "assets");
                         if (Directory.Exists(assetPath))
                         {
                             var ext = new List<string> { ".pfx", ".key", ".crt", ".pem" };
diff --git a/src/Certify.Core/Management/CertifyManager/CertifyManager.cs b/src/Certify.Core/Management/CertifyManager/CertifyManager.cs
@@ -388,7 +388,7 @@ private void InitLogging(Shared.ServiceConfig serverConfig)
                .Enrich.FromLogContext()
                .MinimumLevel.ControlledBy(ManagedCertificateLog.LogLevelSwitchFromLogLevel(_loggingLevelSwitch))
                .WriteTo.Console()
-               .WriteTo.File(Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "session.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10), rollOnFileSizeLimit: true, fileSizeLimitBytes: 5 * 1024 * 1024)
+               .WriteTo.File(Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "session.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10), rollOnFileSizeLimit: true, fileSizeLimitBytes: 5 * 1024 * 1024)
                .CreateLogger();
 
             var msLogger = new Serilog.Extensions.Logging.SerilogLoggerFactory(serilogLog).CreateLogger<CertifyManager>();
@@ -497,7 +497,7 @@ public async Task<string[]> GetServiceLog(string type, int limit)
 
             if (type == "session")
             {
-                logPath = Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "session.log");
+                logPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "session.log");
             }
 
             if (logPath != null && System.IO.File.Exists(logPath))
diff --git a/src/Certify.Core/Management/Challenges/DNS/DnsProviderLibcloud.cs b/src/Certify.Core/Management/Challenges/DNS/DnsProviderLibcloud.cs
@@ -18,7 +18,7 @@ public class LibcloudDNSProvider : IDnsProvider
         public LibcloudDNSProvider(Dictionary<string, string> credentials)
         {
             _credentials = credentials;
-            _pythonPath = EnvironmentUtil.CreateAppDataPath("python-embedded") + "\\python.exe";
+            _pythonPath = EnvironmentUtil.EnsuredAppDataPath("python-embedded") + "\\python.exe";
         }
 
         public int PropagationDelaySeconds => 60;
diff --git a/src/Certify.Core/Management/SettingsManager.cs b/src/Certify.Core/Management/SettingsManager.cs
@@ -288,7 +288,7 @@ public static Models.Preferences ToPreferences()
 
         public static void SaveAppSettings()
         {
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var json = Newtonsoft.Json.JsonConvert.SerializeObject(CoreAppSettings.Current, Newtonsoft.Json.Formatting.Indented);
 
             lock (settingsLocker)
@@ -300,7 +300,7 @@ public static void SaveAppSettings()
         public static List<CertificateAuthority> GetCustomCertificateAuthorities()
         {
             var caList = new List<CertificateAuthority>();
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var path = Path.Combine(appDataPath, "ca.json");
 
             if (System.IO.File.Exists(path))
@@ -323,7 +323,7 @@ public static List<CertificateAuthority> GetCustomCertificateAuthorities()
         public static bool SaveCustomCertificateAuthorities(List<CertificateAuthority> caList)
         {
 
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var path = Path.Combine(appDataPath, "ca.json");
 
             try
@@ -343,7 +343,7 @@ public static void LoadAppSettings()
         {
             try
             {
-                var appDataPath = EnvironmentUtil.CreateAppDataPath();
+                var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
                 var path = Path.Combine(appDataPath, COREAPPSETTINGSFILE);
 
                 if (System.IO.File.Exists(path))
diff --git a/src/Certify.Providers/DNS/AcmeDns/AcmeDns/DnsProviderAcmeDns.cs b/src/Certify.Providers/DNS/AcmeDns/AcmeDns/DnsProviderAcmeDns.cs
@@ -90,7 +90,7 @@ public static ChallengeProviderDefinition Definition
         private Uri _apiBaseUri { get; set; }
         public DnsProviderAcmeDns()
         {
-            _settingsPath = EnvironmentUtil.CreateAppDataPath();
+            _settingsPath = EnvironmentUtil.EnsuredAppDataPath();
 
             _client = new HttpClient();
             _client.DefaultRequestHeaders.Add("User-Agent", "Certify/DnsProviderAcmeDns");
diff --git a/src/Certify.Providers/DNS/CertifyDns/DnsProviderCertifyDns.cs b/src/Certify.Providers/DNS/CertifyDns/DnsProviderCertifyDns.cs
@@ -71,7 +71,7 @@ public DnsProviderCertifyDns() : base()
         {
             EnableExtensions = true;
 
-            _settingsPath = EnvironmentUtil.CreateAppDataPath();
+            _settingsPath = EnvironmentUtil.EnsuredAppDataPath();
 
             _client = new HttpClient();
             _client.DefaultRequestHeaders.Add("User-Agent", "Certify/DnsProviderCertifyDns");
diff --git a/src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Startup.cs b/src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Startup.cs
@@ -101,7 +101,7 @@ private void ConfigureSignalR(IServiceCollection services)
 
         private void ConfigureDataProtection(IServiceCollection services)
         {
-            var appDataPath = EnvironmentUtil.CreateAppDataPath("keys");
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath("keys");
             services.AddDataProtection(a => a.ApplicationDiscriminator = "certify")
                     .PersistKeysToFileSystem(new DirectoryInfo(appDataPath));
         }
diff --git a/src/Certify.Server/Certify.Server.HubService/Program.cs b/src/Certify.Server/Certify.Server.HubService/Program.cs
@@ -62,7 +62,7 @@
      })
     .AddSignalR(opt => opt.MaximumReceiveMessageSize = null).AddMessagePackProtocol();
 
-var appDataPath = EnvironmentUtil.CreateAppDataPath("keys");
+var appDataPath = EnvironmentUtil.EnsuredAppDataPath("keys");
 
 builder.Services
     .AddDataProtection(a =>
diff --git a/src/Certify.Service/Program.cs b/src/Certify.Service/Program.cs
@@ -57,7 +57,7 @@ public static void LogEvent(object exceptionObject, string msg = null, bool incl
             // log event/exception
             try
             {
-                var logPath = System.IO.Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "service.exceptions.log");
+                var logPath = System.IO.Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "service.exceptions.log");
                 if (msg != null)
                 {
                     System.IO.File.AppendAllText(logPath, "\r\n[" + DateTime.Now + "] :: " + msg);
diff --git a/src/Certify.Shared/Management/CredentialsUtil.cs b/src/Certify.Shared/Management/CredentialsUtil.cs
@@ -123,7 +123,7 @@ public static string Unprotect(
 
         private static IDataProtector GetDataProtector()
         {
-            var keyDirectory = EnvironmentUtil.CreateAppDataPath("credentials");
+            var keyDirectory = EnvironmentUtil.EnsuredAppDataPath("credentials");
             var dataProtectionProvider = DataProtectionProvider.Create(new DirectoryInfo(keyDirectory));
             return dataProtectionProvider.CreateProtector("StoredCredentials");
         }
diff --git a/src/Certify.Shared/Management/DataStoreConnectionManager.cs b/src/Certify.Shared/Management/DataStoreConnectionManager.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -12,7 +12,7 @@ public class DataStoreConnectionManager
     {
         private static string GetConfigPath()
         {
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var configFile = Path.Combine(appDataPath, "datastores.json");
             return configFile;
         }
diff --git a/src/Certify.Shared/Management/PluginManager.cs b/src/Certify.Shared/Management/PluginManager.cs
@@ -68,7 +68,7 @@ public PluginManager()
             var serilogLogger = new LoggerConfiguration()
                         .Enrich.FromLogContext()
                         .MinimumLevel.Information()
-                        .WriteTo.File(Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "plugins.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10))
+                        .WriteTo.File(Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "plugins.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10))
                         .WriteTo.Console()
                         .CreateLogger();
 
@@ -104,7 +104,7 @@ private string GetPluginFolderPath(bool usePluginSubfolder = true, bool useAppDa
             }
             else
             {
-                return EnvironmentUtil.CreateAppDataPath("plugins");
+                return EnvironmentUtil.EnsuredAppDataPath("plugins");
             }
         }
 
diff --git a/src/Certify.Shared/Management/ServerConnectionManager.cs b/src/Certify.Shared/Management/ServerConnectionManager.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -12,7 +12,7 @@ public class ServerConnectionManager
     {
         private static string GetConfigPath()
         {
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var connectionConfigFile = Path.Combine(appDataPath, "servers.json");
             return connectionConfigFile;
         }
diff --git a/src/Certify.Shared/Utils/EnvironmentUtil.cs b/src/Certify.Shared/Utils/EnvironmentUtil.cs
@@ -85,7 +85,7 @@ private static void CreateAndApplyRestrictedACL(string path)
         /// </summary>
         /// <param name="subDirectory">optional subfolder to include</param>
         /// <returns>full app data with with optional subdirectory</returns>
-        public static string CreateAppDataPath(string subDirectory = null, bool skipCreation = false)
+        public static string EnsuredAppDataPath(string subDirectory = null, bool skipCreation = false)
         {
             // use the environment variable CERTIFY_APPDATA_PATH if set, otherwise use the common app data folder
             var parts = new List<string>()
diff --git a/src/Certify.Shared/Utils/HttpChallengeServer.cs b/src/Certify.Shared/Utils/HttpChallengeServer.cs
@@ -74,7 +74,7 @@ private void Log(string msg, bool clearLog = false)
 
             try
             {
-                var logPath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "logs", "httpChallengeServer.log");
+                var logPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "logs", "httpChallengeServer.log");
                 if (clearLog)
                 {
                     System.IO.File.WriteAllText(logPath, msg);
diff --git a/src/Certify.Shared/Utils/ManagedCertificateLog.cs b/src/Certify.Shared/Utils/ManagedCertificateLog.cs
@@ -30,7 +30,7 @@ public static class ManagedCertificateLog
     {
         private static ConcurrentDictionary<string, Microsoft.Extensions.Logging.ILogger> _managedItemLoggers { get; set; }
 
-        public static string GetLogPath(string managedItemId) => Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "log_" + managedItemId.Replace(':', '_') + ".txt");
+        public static string GetLogPath(string managedItemId) => Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "log_" + managedItemId.Replace(':', '_') + ".txt");
 
         public static ILog GetLogger(string managedItemId, LogLevel logLevelSwitch)
         {
diff --git a/src/Certify.Shared/Utils/ServiceConfigManager.cs b/src/Certify.Shared/Utils/ServiceConfigManager.cs
@@ -20,7 +20,7 @@ public static ServiceConfig GetAppServiceConfig()
                 ConfigStatus = ConfigStatus.DefaultFailed
             };
 
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var serviceConfigFile = Path.Combine(appDataPath, "serviceconfig.json");
 #if DEBUG
             serviceConfigFile = Path.Combine(appDataPath, "serviceconfig.debug.json");
@@ -70,7 +70,7 @@ public static void StoreUpdatedAppServiceConfig(ServiceConfig config, bool throw
                 return;
             }
 
-            var appDataPath = EnvironmentUtil.CreateAppDataPath();
+            var appDataPath = EnvironmentUtil.EnsuredAppDataPath();
             var serviceConfigFile = Path.Combine(appDataPath, "serviceconfig.json");
 #if DEBUG
             serviceConfigFile = Path.Combine(appDataPath, "serviceconfig.debug.json");
diff --git a/src/Certify.Tests/Certify.Core.Tests.Integration/CertRequestTests.cs b/src/Certify.Tests/Certify.Core.Tests.Integration/CertRequestTests.cs
@@ -632,7 +632,7 @@ public async Task TestRequestTnAuthList()
         {
 
             var apiEndpoint = ConfigSettings["TestAuthTokenEndpoint"];
-            var settingBaseFolder = EnvironmentUtil.CreateAppDataPath();
+            var settingBaseFolder = EnvironmentUtil.EnsuredAppDataPath();
             var providerPath = System.IO.Path.Combine(settingBaseFolder, "certes");
             var provider = new AnvilACMEProvider(new AnvilACMEProviderSettings
             {
diff --git a/src/Certify.Tests/Certify.Core.Tests.Unit/Tests/LoggyTests.cs b/src/Certify.Tests/Certify.Core.Tests.Unit/Tests/LoggyTests.cs
@@ -16,7 +16,7 @@ public class LoggyTests
         [TestInitialize]
         public void TestInitialize()
         {
-            testsDataPath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "Tests");
+            testsDataPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "Tests");
             logFilePath = Path.Combine(testsDataPath, "test.log");
 
             if (!Directory.Exists(testsDataPath))
@@ -71,7 +71,7 @@ public void TestLoggyErrorException()
 
             // Trigger an exception error and log it using Loggy.Error()
             var logMessage = "New Loggy Exception Error";
-            var badFilePath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "Tests", "test1.log");
+            var badFilePath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "Tests", "test1.log");
 
             var exceptionError = $"System.IO.FileNotFoundException: Could not find file '{badFilePath}'.";
             try
diff --git a/src/Certify.UI.Shared/Settings/UISettings.cs b/src/Certify.UI.Shared/Settings/UISettings.cs
@@ -23,7 +23,7 @@ public class UISettings
 
         public static UISettings Load()
         {
-            var uiSettingsFilePath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), SETTINGS_FILE);
+            var uiSettingsFilePath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), SETTINGS_FILE);
             if (File.Exists(uiSettingsFilePath))
             {
                 try
@@ -47,7 +47,7 @@ public static void Save(UISettings uiSettings)
             try
             {
                 var json = Newtonsoft.Json.JsonConvert.SerializeObject(uiSettings, Newtonsoft.Json.Formatting.Indented);
-                File.WriteAllText(Path.Combine(EnvironmentUtil.CreateAppDataPath(), SETTINGS_FILE), json);
+                File.WriteAllText(Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), SETTINGS_FILE), json);
             }
             catch { }
         }
diff --git a/src/Certify.UI.Shared/ViewModel/AppViewModel/AppViewModel.Dashboard.cs b/src/Certify.UI.Shared/ViewModel/AppViewModel/AppViewModel.Dashboard.cs
@@ -46,7 +46,7 @@ public async Task<bool> CheckLicenseIsActive()
         {
             var licensingManager = PluginManager?.LicensingManager;
 
-            if (licensingManager != null && !await licensingManager.IsInstallActive(ProductTypeId, EnvironmentUtil.CreateAppDataPath()))
+            if (licensingManager != null && !await licensingManager.IsInstallActive(ProductTypeId, EnvironmentUtil.EnsuredAppDataPath()))
             {
                 return false;
             }
@@ -60,7 +60,7 @@ public bool IsInstallBeforeDate(DateTime target)
         {
             var licensingManager = PluginManager?.LicensingManager;
 
-            var installDate = licensingManager?.GetInstallDate(EnvironmentUtil.CreateAppDataPath());
+            var installDate = licensingManager?.GetInstallDate(EnvironmentUtil.EnsuredAppDataPath());
 
             if (installDate == null)
             {
diff --git a/src/Certify.UI.Shared/ViewModel/AppViewModel/AppViewModel.cs b/src/Certify.UI.Shared/ViewModel/AppViewModel/AppViewModel.cs
@@ -72,7 +72,7 @@ private void Init()
             var serilogLog = new Serilog.LoggerConfiguration()
             .Enrich.FromLogContext()
             .MinimumLevel.Verbose()
-                .WriteTo.File(Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "ui.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10))
+                .WriteTo.File(Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "ui.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10))
                 .CreateLogger();
 
             Log = new Loggy(new Serilog.Extensions.Logging.SerilogLoggerFactory(serilogLog).CreateLogger<AppViewModel>());
diff --git a/src/Certify.UI.Shared/Windows/MainWindow.xaml.cs b/src/Certify.UI.Shared/Windows/MainWindow.xaml.cs
diff --git a/src/Certify.UI.Shared/Windows/Registration.xaml.cs b/src/Certify.UI.Shared/Windows/Registration.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ private bool IsRegistered()`
`13`	`13`	`var licensingManager = _pluginManager.LicensingManager;`
`14`	`14`	`if (licensingManager != null)`
`15`	`15`	`{`
`16`		`- if (licensingManager.IsInstallRegistered(ProductTypeID, EnvironmentUtil.CreateAppDataPath()))`
	`16`	`+ if (licensingManager.IsInstallRegistered(ProductTypeID, EnvironmentUtil.EnsuredAppDataPath()))`
`17`	`17`	`{`
`18`	`18`	`return true;`
`19`	`19`	`}`
`@@ -52,7 +52,7 @@ internal async Task Activate(string[] args)`
`52`	`52`	`var licensingManager = _pluginManager.LicensingManager;`
`53`	`53`	`if (licensingManager != null)`
`54`	`54`	`{`
`55`		`- var settingsPath = EnvironmentUtil.CreateAppDataPath();`
	`55`	`+ var settingsPath = EnvironmentUtil.EnsuredAppDataPath();`
`56`	`56`
`57`	`57`	`var activated = await licensingManager.IsInstallActive(ProductTypeID, settingsPath);`
`58`	`58`	`if (!activated)`
`@@ -127,7 +127,7 @@ private async Task<bool> Deactivate(string email)`
`127`	`127`	`AppVersion = Management.Util.GetAppVersion().ToString()`
`128`	`128`	`};`
`129`	`129`
`130`		`- var deactivated = await licensingManager.DeactivateInstall(ProductTypeID, EnvironmentUtil.CreateAppDataPath(), email, instance);`
	`130`	`+ var deactivated = await licensingManager.DeactivateInstall(ProductTypeID, EnvironmentUtil.EnsuredAppDataPath(), email, instance);`
`131`	`131`
`132`	`132`	`return deactivated;`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ static bool isNumeric(string input)`
`110`	`110`	`public async Task FindPendingAuthorizations(bool autoFix)`
`111`	`111`	`{`
`112`	`112`	`// scan log files for authz URLs, check status of each`
`113`		`- var logFolder = EnvironmentUtil.CreateAppDataPath("logs");`
	`113`	`+ var logFolder = EnvironmentUtil.EnsuredAppDataPath("logs");`
`114`	`114`	`var files = System.IO.Directory.GetFiles(logFolder, "log_*.txt");`
`115`	`115`	`var orderUrls = new List<string>();`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -640,14 +640,14 @@ public async Task PerformCertificateCleanup()`
`640`	`640`	`{`
`641`	`641`
`642`	`642`	`// cleanup old pfx files in asset store(s), if any`
`643`		`- var assetPath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "certes", "assets");`
	`643`	`+ var assetPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "certes", "assets");`
`644`	`644`	`if (Directory.Exists(assetPath))`
`645`	`645`	`{`
`646`	`646`	`var ext = new List<string> { ".pfx" };`
`647`	`647`	`DeleteOldCertificateFiles(assetPath, ext);`
`648`	`648`	`}`
`649`	`649`
`650`		`- assetPath = Path.Combine(EnvironmentUtil.CreateAppDataPath(), "assets");`
	`650`	`+ assetPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath(), "assets");`
`651`	`651`	`if (Directory.Exists(assetPath))`
`652`	`652`	`{`
`653`	`653`	`var ext = new List<string> { ".pfx", ".key", ".crt", ".pem" };`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ private void InitLogging(Shared.ServiceConfig serverConfig)`
`388`	`388`	`.Enrich.FromLogContext()`
`389`	`389`	`.MinimumLevel.ControlledBy(ManagedCertificateLog.LogLevelSwitchFromLogLevel(_loggingLevelSwitch))`
`390`	`390`	`.WriteTo.Console()`
`391`		`- .WriteTo.File(Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "session.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10), rollOnFileSizeLimit: true, fileSizeLimitBytes: 5 * 1024 * 1024)`
	`391`	`+ .WriteTo.File(Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "session.log"), shared: true, flushToDiskInterval: new TimeSpan(0, 0, 10), rollOnFileSizeLimit: true, fileSizeLimitBytes: 5 * 1024 * 1024)`
`392`	`392`	`.CreateLogger();`
`393`	`393`
`394`	`394`	`var msLogger = new Serilog.Extensions.Logging.SerilogLoggerFactory(serilogLog).CreateLogger<CertifyManager>();`
`@@ -497,7 +497,7 @@ public async Task<string[]> GetServiceLog(string type, int limit)`
`497`	`497`
`498`	`498`	`if (type == "session")`
`499`	`499`	`{`
`500`		`- logPath = Path.Combine(EnvironmentUtil.CreateAppDataPath("logs"), "session.log");`
	`500`	`+ logPath = Path.Combine(EnvironmentUtil.EnsuredAppDataPath("logs"), "session.log");`
`501`	`501`	`}`
`502`	`502`
`503`	`503`	`if (logPath != null && System.IO.File.Exists(logPath))`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class LibcloudDNSProvider : IDnsProvider`
`18`	`18`	`public LibcloudDNSProvider(Dictionary<string, string> credentials)`
`19`	`19`	`{`
`20`	`20`	`_credentials = credentials;`
`21`		`- _pythonPath = EnvironmentUtil.CreateAppDataPath("python-embedded") + "\\python.exe";`
	`21`	`+ _pythonPath = EnvironmentUtil.EnsuredAppDataPath("python-embedded") + "\\python.exe";`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public int PropagationDelaySeconds => 60;`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public static Models.Preferences ToPreferences()`
`288`	`288`
`289`	`289`	`public static void SaveAppSettings()`
`290`	`290`	`{`
`291`		`- var appDataPath = EnvironmentUtil.CreateAppDataPath();`
	`291`	`+ var appDataPath = EnvironmentUtil.EnsuredAppDataPath();`
`292`	`292`	`var json = Newtonsoft.Json.JsonConvert.SerializeObject(CoreAppSettings.Current, Newtonsoft.Json.Formatting.Indented);`
`293`	`293`
`294`	`294`	`lock (settingsLocker)`
`@@ -300,7 +300,7 @@ public static void SaveAppSettings()`
`300`	`300`	`public static List<CertificateAuthority> GetCustomCertificateAuthorities()`
`301`	`301`	`{`
`302`	`302`	`var caList = new List<CertificateAuthority>();`
`303`		`- var appDataPath = EnvironmentUtil.CreateAppDataPath();`
	`303`	`+ var appDataPath = EnvironmentUtil.EnsuredAppDataPath();`
`304`	`304`	`var path = Path.Combine(appDataPath, "ca.json");`
`305`	`305`
`306`	`306`	`if (System.IO.File.Exists(path))`
`@@ -323,7 +323,7 @@ public static List<CertificateAuthority> GetCustomCertificateAuthorities()`
`323`	`323`	`public static bool SaveCustomCertificateAuthorities(List<CertificateAuthority> caList)`
`324`	`324`	`{`
`325`	`325`
`326`		`- var appDataPath = EnvironmentUtil.CreateAppDataPath();`
	`326`	`+ var appDataPath = EnvironmentUtil.EnsuredAppDataPath();`
`327`	`327`	`var path = Path.Combine(appDataPath, "ca.json");`
`328`	`328`
`329`	`329`	`try`
`@@ -343,7 +343,7 @@ public static void LoadAppSettings()`
`343`	`343`	`{`
`344`	`344`	`try`
`345`	`345`	`{`
`346`		`- var appDataPath = EnvironmentUtil.CreateAppDataPath();`
	`346`	`+ var appDataPath = EnvironmentUtil.EnsuredAppDataPath();`
`347`	`347`	`var path = Path.Combine(appDataPath, COREAPPSETTINGSFILE);`
`348`	`348`
`349`	`349`	`if (System.IO.File.Exists(path))`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static ChallengeProviderDefinition Definition`
`90`	`90`	`private Uri _apiBaseUri { get; set; }`
`91`	`91`	`public DnsProviderAcmeDns()`
`92`	`92`	`{`
`93`		`- _settingsPath = EnvironmentUtil.CreateAppDataPath();`
	`93`	`+ _settingsPath = EnvironmentUtil.EnsuredAppDataPath();`
`94`	`94`
`95`	`95`	`_client = new HttpClient();`
`96`	`96`	`_client.DefaultRequestHeaders.Add("User-Agent", "Certify/DnsProviderAcmeDns");`