diff --git a/SafeExamBrowser.Browser/BrowserApplication.cs b/SafeExamBrowser.Browser/BrowserApplication.cs index 33ffe2b2..8b1d8dd9 100644 --- a/SafeExamBrowser.Browser/BrowserApplication.cs +++ b/SafeExamBrowser.Browser/BrowserApplication.cs @@ -19,9 +19,10 @@ using SafeExamBrowser.Browser.Events; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; using SafeExamBrowser.UserInterface.Contracts; using SafeExamBrowser.UserInterface.Contracts.MessageBox; -using BrowserSettings = SafeExamBrowser.Configuration.Contracts.Settings.Browser.BrowserSettings; +using BrowserSettings = SafeExamBrowser.Settings.Browser.BrowserSettings; namespace SafeExamBrowser.Browser { diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs index 7306fac5..61e81cf1 100644 --- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs +++ b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs @@ -14,7 +14,7 @@ using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Browser.Events; using SafeExamBrowser.Browser.Handlers; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.UserInterface.Contracts; diff --git a/SafeExamBrowser.Browser/Filters/RequestFilter.cs b/SafeExamBrowser.Browser/Filters/RequestFilter.cs index 94b72035..cb84e344 100644 --- a/SafeExamBrowser.Browser/Filters/RequestFilter.cs +++ b/SafeExamBrowser.Browser/Filters/RequestFilter.cs @@ -7,7 +7,7 @@ */ using System; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; namespace SafeExamBrowser.Browser.Filters { diff --git a/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs b/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs index 466b0a63..2ee1cb8e 100644 --- a/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs +++ b/SafeExamBrowser.Browser/Handlers/DownloadHandler.cs @@ -14,7 +14,7 @@ using CefSharp; using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Logging.Contracts; -using BrowserSettings = SafeExamBrowser.Configuration.Contracts.Settings.Browser.BrowserSettings; +using BrowserSettings = SafeExamBrowser.Settings.Browser.BrowserSettings; namespace SafeExamBrowser.Browser.Handlers { diff --git a/SafeExamBrowser.Browser/Handlers/RequestHandler.cs b/SafeExamBrowser.Browser/Handlers/RequestHandler.cs index d47bbcff..78dc4ffe 100644 --- a/SafeExamBrowser.Browser/Handlers/RequestHandler.cs +++ b/SafeExamBrowser.Browser/Handlers/RequestHandler.cs @@ -10,7 +10,7 @@ using CefSharp; using SafeExamBrowser.Browser.Filters; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Logging.Contracts; -using BrowserSettings = SafeExamBrowser.Configuration.Contracts.Settings.Browser.BrowserSettings; +using BrowserSettings = SafeExamBrowser.Settings.Browser.BrowserSettings; namespace SafeExamBrowser.Browser.Handlers { diff --git a/SafeExamBrowser.Browser/Handlers/ResourceRequestHandler.cs b/SafeExamBrowser.Browser/Handlers/ResourceRequestHandler.cs index ea56c2cd..35897e24 100644 --- a/SafeExamBrowser.Browser/Handlers/ResourceRequestHandler.cs +++ b/SafeExamBrowser.Browser/Handlers/ResourceRequestHandler.cs @@ -11,7 +11,7 @@ using System.Collections.Specialized; using CefSharp; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Logging.Contracts; -using BrowserSettings = SafeExamBrowser.Configuration.Contracts.Settings.Browser.BrowserSettings; +using BrowserSettings = SafeExamBrowser.Settings.Browser.BrowserSettings; namespace SafeExamBrowser.Browser.Handlers { diff --git a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj index 94619277..253bda8c 100644 --- a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj +++ b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj @@ -110,6 +110,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {c7889e97-6ff6-4a58-b7cb-521ed276b316} SafeExamBrowser.UserInterface.Contracts diff --git a/SafeExamBrowser.Client.Contracts/IClientController.cs b/SafeExamBrowser.Client.Contracts/IClientController.cs index 9401544c..2e974175 100644 --- a/SafeExamBrowser.Client.Contracts/IClientController.cs +++ b/SafeExamBrowser.Client.Contracts/IClientController.cs @@ -10,7 +10,6 @@ using System; using SafeExamBrowser.Browser.Contracts; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; namespace SafeExamBrowser.Client.Contracts { @@ -42,7 +41,7 @@ namespace SafeExamBrowser.Client.Contracts /// /// The settings to be used during application execution. /// - Settings Settings { set; } + Settings.ApplicationSettings Settings { set; } /// /// Reverts any changes, releases all used resources and terminates the client. diff --git a/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj b/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj index 3b448a1d..a91e9f5c 100644 --- a/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj +++ b/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj @@ -75,6 +75,10 @@ {fe0e1224-b447-4b14-81e7-ed7d84822aa0} SafeExamBrowser.Core.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + \ No newline at end of file diff --git a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs index 230e4bc1..e312ac27 100644 --- a/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs +++ b/SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs @@ -17,7 +17,7 @@ using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Configuration.Contracts.Cryptography; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; @@ -49,7 +49,7 @@ namespace SafeExamBrowser.Client.UnitTests private Mock operationSequence; private Mock runtimeProxy; private Guid sessionId; - private Settings settings; + private ApplicationSettings settings; private Mock shutdown; private Mock taskbar; private Mock terminationActivator; @@ -75,7 +75,7 @@ namespace SafeExamBrowser.Client.UnitTests operationSequence = new Mock(); runtimeProxy = new Mock(); sessionId = Guid.NewGuid(); - settings = new Settings(); + settings = new ApplicationSettings(); shutdown = new Mock(); taskbar = new Mock(); terminationActivator = new Mock(); diff --git a/SafeExamBrowser.Client.UnitTests/Operations/ConfigurationOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/ConfigurationOperationTests.cs index b7b4feea..24ec5469 100644 --- a/SafeExamBrowser.Client.UnitTests/Operations/ConfigurationOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/ConfigurationOperationTests.cs @@ -13,7 +13,7 @@ using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Communication.Contracts.Data; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Logging.Contracts; @@ -46,7 +46,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations { AppConfig = new AppConfig(), SessionId = Guid.NewGuid(), - Settings = new Settings() + Settings = new ApplicationSettings() } }; diff --git a/SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs index 16d2219b..c2095667 100644 --- a/SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/ProcessMonitorOperationTests.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Client.Operations; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Monitoring.Contracts.Processes; @@ -20,7 +20,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations { private Mock logger; private Mock processMonitor; - private Settings settings; + private ApplicationSettings settings; private ProcessMonitorOperation sut; [TestInitialize] @@ -28,7 +28,7 @@ namespace SafeExamBrowser.Client.UnitTests.Operations { logger = new Mock(); processMonitor = new Mock(); - settings = new Settings(); + settings = new ApplicationSettings(); sut = new ProcessMonitorOperation(logger.Object, processMonitor.Object,settings); } diff --git a/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs index 36795a4b..d29de61e 100644 --- a/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/ShellOperationTests.cs @@ -11,7 +11,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.Client.Operations; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; +using SafeExamBrowser.Settings.UserInterface; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.SystemComponents.Contracts; diff --git a/SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs b/SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs index 84b89dcf..f92fac30 100644 --- a/SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs +++ b/SafeExamBrowser.Client.UnitTests/Operations/WindowMonitorOperationTests.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Client.Operations; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Monitoring.Contracts.Windows; diff --git a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj index aee25bf6..b70d99ad 100644 --- a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj +++ b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj @@ -155,6 +155,10 @@ {6d563a30-366d-4c35-815b-2c9e6872278b} SafeExamBrowser.Monitoring.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs index 4ab55bf3..2d3749b6 100644 --- a/SafeExamBrowser.Client/ClientController.cs +++ b/SafeExamBrowser.Client/ClientController.cs @@ -17,7 +17,7 @@ using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Configuration.Contracts.Cryptography; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; @@ -56,7 +56,7 @@ namespace SafeExamBrowser.Client public IBrowserApplication Browser { private get; set; } public IClientHost ClientHost { private get; set; } public Guid SessionId { private get; set; } - public Settings Settings { private get; set; } + public ApplicationSettings Settings { private get; set; } public AppConfig AppConfig { diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index bbb6ee13..0c4298a9 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -23,7 +23,7 @@ using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Communication.Hosts; using SafeExamBrowser.Communication.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; +using SafeExamBrowser.Settings.UserInterface; using SafeExamBrowser.Configuration.Cryptography; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.OperationModel; @@ -52,6 +52,7 @@ using SafeExamBrowser.WindowsApi; using SafeExamBrowser.WindowsApi.Contracts; using Desktop = SafeExamBrowser.UserInterface.Desktop; using Mobile = SafeExamBrowser.UserInterface.Mobile; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Client { diff --git a/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs b/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs index a3cb8008..83875b01 100644 --- a/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/ProcessMonitorOperation.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; @@ -19,12 +19,12 @@ namespace SafeExamBrowser.Client.Operations { private ILogger logger; private IProcessMonitor processMonitor; - private Settings settings; + private ApplicationSettings settings; public event ActionRequiredEventHandler ActionRequired { add { } remove { } } public event StatusChangedEventHandler StatusChanged; - public ProcessMonitorOperation(ILogger logger, IProcessMonitor processMonitor, Settings settings) + public ProcessMonitorOperation(ILogger logger, IProcessMonitor processMonitor, ApplicationSettings settings) { this.logger = logger; this.processMonitor = processMonitor; diff --git a/SafeExamBrowser.Client/Operations/ShellOperation.cs b/SafeExamBrowser.Client/Operations/ShellOperation.cs index 665a1850..7a145f03 100644 --- a/SafeExamBrowser.Client/Operations/ShellOperation.cs +++ b/SafeExamBrowser.Client/Operations/ShellOperation.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using SafeExamBrowser.Client.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; +using SafeExamBrowser.Settings.UserInterface; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; diff --git a/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs b/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs index e8d50948..0df4659c 100644 --- a/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs +++ b/SafeExamBrowser.Client/Operations/WindowMonitorOperation.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; diff --git a/SafeExamBrowser.Client/Properties/Settings.Designer.cs b/SafeExamBrowser.Client/Properties/Settings.Designer.cs index 76967b3e..b3971338 100644 --- a/SafeExamBrowser.Client/Properties/Settings.Designer.cs +++ b/SafeExamBrowser.Client/Properties/Settings.Designer.cs @@ -8,10 +8,11 @@ // //------------------------------------------------------------------------------ -namespace SafeExamBrowser.Client.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] +namespace SafeExamBrowser.Client.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { diff --git a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj index 86a6c79e..1f2452f7 100644 --- a/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj +++ b/SafeExamBrowser.Client/SafeExamBrowser.Client.csproj @@ -184,6 +184,10 @@ {EF563531-4EB5-44B9-A5EC-D6D6F204469B} SafeExamBrowser.Monitoring + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.Configuration.Contracts/ClientConfiguration.cs b/SafeExamBrowser.Configuration.Contracts/ClientConfiguration.cs index 1142cc40..b51ab020 100644 --- a/SafeExamBrowser.Configuration.Contracts/ClientConfiguration.cs +++ b/SafeExamBrowser.Configuration.Contracts/ClientConfiguration.cs @@ -29,6 +29,6 @@ namespace SafeExamBrowser.Configuration.Contracts /// /// The application settings to be used by the client. /// - public Settings.Settings Settings { get; set; } + public Settings.ApplicationSettings Settings { get; set; } } } diff --git a/SafeExamBrowser.Configuration.Contracts/IConfigurationRepository.cs b/SafeExamBrowser.Configuration.Contracts/IConfigurationRepository.cs index e1bbb79a..3e277f19 100644 --- a/SafeExamBrowser.Configuration.Contracts/IConfigurationRepository.cs +++ b/SafeExamBrowser.Configuration.Contracts/IConfigurationRepository.cs @@ -36,7 +36,7 @@ namespace SafeExamBrowser.Configuration.Contracts /// /// Loads the default settings. /// - Settings.Settings LoadDefaultSettings(); + Settings.ApplicationSettings LoadDefaultSettings(); /// /// Registers the specified to be used to parse configuration data. @@ -61,6 +61,6 @@ namespace SafeExamBrowser.Configuration.Contracts /// /// Attempts to load settings from the specified resource. /// - LoadStatus TryLoadSettings(Uri resource, out Settings.Settings settings, PasswordParameters password = null); + LoadStatus TryLoadSettings(Uri resource, out Settings.ApplicationSettings settings, PasswordParameters password = null); } } diff --git a/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj b/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj index 1083a29f..91e59976 100644 --- a/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj +++ b/SafeExamBrowser.Configuration.Contracts/SafeExamBrowser.Configuration.Contracts.csproj @@ -76,27 +76,11 @@ - - - - - - - - - - - - - - - - - - {64ea30fb-11d4-436a-9c2b-88566285363e} - SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings diff --git a/SafeExamBrowser.Configuration.Contracts/ServiceConfiguration.cs b/SafeExamBrowser.Configuration.Contracts/ServiceConfiguration.cs index c3ee8050..c428327a 100644 --- a/SafeExamBrowser.Configuration.Contracts/ServiceConfiguration.cs +++ b/SafeExamBrowser.Configuration.Contracts/ServiceConfiguration.cs @@ -29,7 +29,7 @@ namespace SafeExamBrowser.Configuration.Contracts /// /// The application settings to be used by the service. /// - public Settings.Settings Settings { get; set; } + public Settings.ApplicationSettings Settings { get; set; } /// /// The user name of the currently logged in user. diff --git a/SafeExamBrowser.Configuration.Contracts/SessionConfiguration.cs b/SafeExamBrowser.Configuration.Contracts/SessionConfiguration.cs index 1361acc4..efc1ac3a 100644 --- a/SafeExamBrowser.Configuration.Contracts/SessionConfiguration.cs +++ b/SafeExamBrowser.Configuration.Contracts/SessionConfiguration.cs @@ -33,6 +33,6 @@ namespace SafeExamBrowser.Configuration.Contracts /// /// The settings used for this session. /// - public Settings.Settings Settings { get; set; } + public Settings.ApplicationSettings Settings { get; set; } } } diff --git a/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj b/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj index 3f75b64f..1004424a 100644 --- a/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj +++ b/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj @@ -122,6 +122,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Audio.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Audio.cs index da161eaa..75d8cfb5 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Audio.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Audio.cs @@ -6,13 +6,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapInitialVolumeLevel(Settings settings, object value) + private void MapInitialVolumeLevel(ApplicationSettings settings, object value) { if (value is int volume) { @@ -20,7 +20,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapMuteAudio(Settings settings, object value) + private void MapMuteAudio(ApplicationSettings settings, object value) { if (value is bool mute) { @@ -28,7 +28,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapSetInitialVolumeLevel(Settings settings, object value) + private void MapSetInitialVolumeLevel(ApplicationSettings settings, object value) { if (value is bool initialize) { diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs index 17889783..9579c2ac 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Browser.cs @@ -7,15 +7,15 @@ */ using System.Collections.Generic; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Browser; +using SafeExamBrowser.Settings.UserInterface; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapAllowAddressBar(Settings settings, object value) + private void MapAllowAddressBar(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -23,7 +23,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowAddressBarAdditionalWindow(Settings settings, object value) + private void MapAllowAddressBarAdditionalWindow(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -31,7 +31,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowConfigurationDownloads(Settings settings, object value) + private void MapAllowConfigurationDownloads(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -39,7 +39,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowDeveloperConsole(Settings settings, object value) + private void MapAllowDeveloperConsole(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -48,7 +48,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowDownloads(Settings settings, object value) + private void MapAllowDownloads(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -56,7 +56,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowNavigation(Settings settings, object value) + private void MapAllowNavigation(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -65,7 +65,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowNavigationAdditionalWindow(Settings settings, object value) + private void MapAllowNavigationAdditionalWindow(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -74,7 +74,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowPageZoom(Settings settings, object value) + private void MapAllowPageZoom(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -82,7 +82,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowPopups(Settings settings, object value) + private void MapAllowPopups(ApplicationSettings settings, object value) { if (value is bool block) { @@ -90,7 +90,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowReload(Settings settings, object value) + private void MapAllowReload(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -98,7 +98,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAllowReloadAdditionalWindow(Settings settings, object value) + private void MapAllowReloadAdditionalWindow(ApplicationSettings settings, object value) { if (value is bool allow) { @@ -106,7 +106,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableContentRequestFilter(Settings settings, object value) + private void MapEnableContentRequestFilter(ApplicationSettings settings, object value) { if (value is bool filter) { @@ -114,7 +114,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableMainRequestFilter(Settings settings, object value) + private void MapEnableMainRequestFilter(ApplicationSettings settings, object value) { if (value is bool filter) { @@ -122,7 +122,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapUrlFilterRules(Settings settings, object value) + private void MapUrlFilterRules(ApplicationSettings settings, object value) { const int ALLOW = 1; @@ -155,7 +155,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapMainWindowMode(Settings settings, object value) + private void MapMainWindowMode(ApplicationSettings settings, object value) { const int FULLSCREEN = 1; @@ -165,7 +165,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapShowReloadWarning(Settings settings, object value) + private void MapShowReloadWarning(ApplicationSettings settings, object value) { if (value is bool show) { @@ -173,7 +173,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapShowReloadWarningAdditionalWindow(Settings settings, object value) + private void MapShowReloadWarningAdditionalWindow(ApplicationSettings settings, object value) { if (value is bool show) { @@ -181,7 +181,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapUserAgentMode(IDictionary rawData, Settings settings) + private void MapUserAgentMode(IDictionary rawData, ApplicationSettings settings) { const int DEFAULT = 0; diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.ConfigurationFile.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.ConfigurationFile.cs index d2be711c..623b61ea 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.ConfigurationFile.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.ConfigurationFile.cs @@ -6,13 +6,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapConfigurationMode(Settings settings, object value) + private void MapConfigurationMode(ApplicationSettings settings, object value) { const int CONFIGURE_CLIENT = 1; diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.General.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.General.cs index 26839d1b..938af9ef 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.General.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.General.cs @@ -7,14 +7,14 @@ */ using System.Collections.Generic; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapAdminPasswordHash(Settings settings, object value) + private void MapAdminPasswordHash(ApplicationSettings settings, object value) { if (value is string hash) { @@ -22,7 +22,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapApplicationLogAccess(IDictionary rawData, Settings settings) + private void MapApplicationLogAccess(IDictionary rawData, ApplicationSettings settings) { var hasValue = rawData.TryGetValue(Keys.General.AllowApplicationLog, out var value); @@ -42,7 +42,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapLogLevel(Settings settings, object value) + private void MapLogLevel(ApplicationSettings settings, object value) { const int ERROR = 0, WARNING = 1, INFO = 2; @@ -52,7 +52,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapQuitPasswordHash(Settings settings, object value) + private void MapQuitPasswordHash(ApplicationSettings settings, object value) { if (value is string hash) { @@ -60,7 +60,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapStartUrl(Settings settings, object value) + private void MapStartUrl(ApplicationSettings settings, object value) { if (value is string url) { diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Input.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Input.cs index 5eda5025..40c0d124 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Input.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Input.cs @@ -6,13 +6,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapEnableAltEsc(Settings settings, object value) + private void MapEnableAltEsc(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -20,7 +20,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableAltF4(Settings settings, object value) + private void MapEnableAltF4(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -28,7 +28,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableAltTab(Settings settings, object value) + private void MapEnableAltTab(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -36,7 +36,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableCtrlEsc(Settings settings, object value) + private void MapEnableCtrlEsc(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -44,7 +44,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableEsc(Settings settings, object value) + private void MapEnableEsc(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -52,7 +52,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF1(Settings settings, object value) + private void MapEnableF1(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -60,7 +60,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF2(Settings settings, object value) + private void MapEnableF2(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -68,7 +68,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF3(Settings settings, object value) + private void MapEnableF3(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -76,7 +76,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF4(Settings settings, object value) + private void MapEnableF4(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -84,7 +84,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF5(Settings settings, object value) + private void MapEnableF5(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -92,7 +92,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF6(Settings settings, object value) + private void MapEnableF6(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -100,7 +100,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF7(Settings settings, object value) + private void MapEnableF7(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -108,7 +108,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF8(Settings settings, object value) + private void MapEnableF8(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -116,7 +116,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF9(Settings settings, object value) + private void MapEnableF9(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -124,7 +124,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF10(Settings settings, object value) + private void MapEnableF10(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -132,7 +132,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF11(Settings settings, object value) + private void MapEnableF11(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -140,7 +140,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableF12(Settings settings, object value) + private void MapEnableF12(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -148,7 +148,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnablePrintScreen(Settings settings, object value) + private void MapEnablePrintScreen(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -156,7 +156,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableSystemKey(Settings settings, object value) + private void MapEnableSystemKey(ApplicationSettings settings, object value) { if (value is bool enabled) { @@ -164,7 +164,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapEnableRightMouse(Settings settings, object value) + private void MapEnableRightMouse(ApplicationSettings settings, object value) { if (value is bool enabled) { diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs index 2fcddb89..73a9a4f3 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Security.cs @@ -7,14 +7,14 @@ */ using System.Collections.Generic; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Service; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapKioskMode(IDictionary rawData, Settings settings) + private void MapKioskMode(IDictionary rawData, ApplicationSettings settings) { var hasCreateNewDesktop = rawData.TryGetValue(Keys.Security.KioskModeCreateNewDesktop, out var createNewDesktop); var hasDisableExplorerShell = rawData.TryGetValue(Keys.Security.KioskModeDisableExplorerShell, out var disableExplorerShell); @@ -35,7 +35,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapServicePolicy(Settings settings, object value) + private void MapServicePolicy(ApplicationSettings settings, object value) { const int WARN = 1; const int FORCE = 2; diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs index 101ef936..2d0c5f8f 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.UserInterface.cs @@ -6,14 +6,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.UserInterface; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - private void MapApplicationLogButton(Settings settings, object value) + private void MapApplicationLogButton(ApplicationSettings settings, object value) { if (value is bool show) { @@ -21,7 +21,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapAudio(Settings settings, object value) + private void MapAudio(ApplicationSettings settings, object value) { if (value is bool show) { @@ -30,7 +30,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapClock(Settings settings, object value) + private void MapClock(ApplicationSettings settings, object value) { if (value is bool show) { @@ -39,7 +39,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapKeyboardLayout(Settings settings, object value) + private void MapKeyboardLayout(ApplicationSettings settings, object value) { if (value is bool show) { @@ -48,7 +48,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapWirelessNetwork(Settings settings, object value) + private void MapWirelessNetwork(ApplicationSettings settings, object value) { if (value is bool show) { @@ -57,7 +57,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapUserInterfaceMode(Settings settings, object value) + private void MapUserInterfaceMode(ApplicationSettings settings, object value) { if (value is bool mobile) { diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.cs index ee95b32d..6c23f198 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapper.cs @@ -7,13 +7,13 @@ */ using System.Collections.Generic; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; namespace SafeExamBrowser.Configuration.ConfigurationData { internal partial class DataMapper { - internal void MapRawDataToSettings(IDictionary rawData, Settings settings) + internal void MapRawDataToSettings(IDictionary rawData, ApplicationSettings settings) { foreach (var item in rawData) { @@ -31,7 +31,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData MapUserAgentMode(rawData, settings); } - private void MapAudioSettings(string key, object value, Settings settings) + private void MapAudioSettings(string key, object value, ApplicationSettings settings) { switch (key) { @@ -47,7 +47,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapBrowserSettings(string key, object value, Settings settings) + private void MapBrowserSettings(string key, object value, ApplicationSettings settings) { switch (key) { @@ -105,7 +105,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapConfigurationFileSettings(string key, object value, Settings settings) + private void MapConfigurationFileSettings(string key, object value, ApplicationSettings settings) { switch (key) { @@ -115,7 +115,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapGeneralSettings(string key, object value, Settings settings) + private void MapGeneralSettings(string key, object value, ApplicationSettings settings) { switch (key) { @@ -134,7 +134,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapInputSettings(string key, object value, Settings settings) + private void MapInputSettings(string key, object value, ApplicationSettings settings) { switch (key) { @@ -201,7 +201,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapSecuritySettings(string key, object value, Settings settings) + private void MapSecuritySettings(string key, object value, ApplicationSettings settings) { switch (key) { @@ -211,7 +211,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData } } - private void MapUserInterfaceSettings(string key, object value, Settings settings) + private void MapUserInterfaceSettings(string key, object value, ApplicationSettings settings) { switch (key) { diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs index c86130ce..33f0b875 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs @@ -9,10 +9,11 @@ using System; using System.IO; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Service; +using SafeExamBrowser.Settings.UserInterface; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Configuration.ConfigurationData { @@ -98,9 +99,9 @@ namespace SafeExamBrowser.Configuration.ConfigurationData return configuration; } - internal Settings LoadDefaultSettings() + internal ApplicationSettings LoadDefaultSettings() { - var settings = new Settings(); + var settings = new ApplicationSettings(); settings.ActionCenter.EnableActionCenter = true; settings.ActionCenter.ShowApplicationInfo = true; diff --git a/SafeExamBrowser.Configuration/ConfigurationRepository.cs b/SafeExamBrowser.Configuration/ConfigurationRepository.cs index 3e1b06cc..80a88a5d 100644 --- a/SafeExamBrowser.Configuration/ConfigurationRepository.cs +++ b/SafeExamBrowser.Configuration/ConfigurationRepository.cs @@ -15,7 +15,7 @@ using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Configuration.Contracts.Cryptography; using SafeExamBrowser.Configuration.Contracts.DataFormats; using SafeExamBrowser.Configuration.Contracts.DataResources; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Logging.Contracts; namespace SafeExamBrowser.Configuration @@ -100,7 +100,7 @@ namespace SafeExamBrowser.Configuration return dataValues.InitializeSessionConfiguration(); } - public Settings LoadDefaultSettings() + public ApplicationSettings LoadDefaultSettings() { return dataValues.LoadDefaultSettings(); } @@ -125,7 +125,7 @@ namespace SafeExamBrowser.Configuration resourceSavers.Add(saver); } - public LoadStatus TryLoadSettings(Uri resource, out Settings settings, PasswordParameters password = null) + public LoadStatus TryLoadSettings(Uri resource, out ApplicationSettings settings, PasswordParameters password = null) { logger.Info($"Attempting to load '{resource}'..."); diff --git a/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj b/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj index 4e11e3b1..dfc50fe2 100644 --- a/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj +++ b/SafeExamBrowser.Configuration/SafeExamBrowser.Configuration.csproj @@ -107,6 +107,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + \ No newline at end of file diff --git a/SafeExamBrowser.Logging.Contracts/ILogMessage.cs b/SafeExamBrowser.Logging.Contracts/ILogMessage.cs index a8771944..00c786f9 100644 --- a/SafeExamBrowser.Logging.Contracts/ILogMessage.cs +++ b/SafeExamBrowser.Logging.Contracts/ILogMessage.cs @@ -7,6 +7,7 @@ */ using System; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging.Contracts { diff --git a/SafeExamBrowser.Logging.Contracts/ILogger.cs b/SafeExamBrowser.Logging.Contracts/ILogger.cs index d43604d7..7ebf9dd8 100644 --- a/SafeExamBrowser.Logging.Contracts/ILogger.cs +++ b/SafeExamBrowser.Logging.Contracts/ILogger.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging.Contracts { diff --git a/SafeExamBrowser.Logging.Contracts/LogLevel.cs b/SafeExamBrowser.Logging.Contracts/LogLevel.cs deleted file mode 100644 index d86a58b2..00000000 --- a/SafeExamBrowser.Logging.Contracts/LogLevel.cs +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -namespace SafeExamBrowser.Logging.Contracts -{ - /// - /// Defines all possible severity levels supported by the application's . - /// - public enum LogLevel - { - Debug, - Info, - Warning, - Error - } -} diff --git a/SafeExamBrowser.Logging.Contracts/SafeExamBrowser.Logging.Contracts.csproj b/SafeExamBrowser.Logging.Contracts/SafeExamBrowser.Logging.Contracts.csproj index 033bca73..34870558 100644 --- a/SafeExamBrowser.Logging.Contracts/SafeExamBrowser.Logging.Contracts.csproj +++ b/SafeExamBrowser.Logging.Contracts/SafeExamBrowser.Logging.Contracts.csproj @@ -61,8 +61,13 @@ - + + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + + \ No newline at end of file diff --git a/SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs b/SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs index 5d2d508e..9c997b88 100644 --- a/SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs +++ b/SafeExamBrowser.Logging.UnitTests/DefaultLogFormatterTests.cs @@ -8,7 +8,7 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; -using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging.UnitTests { diff --git a/SafeExamBrowser.Logging.UnitTests/LoggerTests.cs b/SafeExamBrowser.Logging.UnitTests/LoggerTests.cs index e7cbd641..e14001c2 100644 --- a/SafeExamBrowser.Logging.UnitTests/LoggerTests.cs +++ b/SafeExamBrowser.Logging.UnitTests/LoggerTests.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging.UnitTests { diff --git a/SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs b/SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs index a4d2c1a2..a725d891 100644 --- a/SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs +++ b/SafeExamBrowser.Logging.UnitTests/ModuleLoggerTests.cs @@ -10,6 +10,7 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging.UnitTests { diff --git a/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj b/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj index 02315e40..2e07f1fb 100644 --- a/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj +++ b/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj @@ -105,6 +105,10 @@ {e107026c-2011-4552-a7d8-3a0d37881df6} SafeExamBrowser.Logging + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + diff --git a/SafeExamBrowser.Logging/LogMessage.cs b/SafeExamBrowser.Logging/LogMessage.cs index 66dcd872..d9d55286 100644 --- a/SafeExamBrowser.Logging/LogMessage.cs +++ b/SafeExamBrowser.Logging/LogMessage.cs @@ -8,6 +8,7 @@ using System; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging { diff --git a/SafeExamBrowser.Logging/Logger.cs b/SafeExamBrowser.Logging/Logger.cs index 910988e4..d8defc5a 100644 --- a/SafeExamBrowser.Logging/Logger.cs +++ b/SafeExamBrowser.Logging/Logger.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Text; using System.Threading; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging { diff --git a/SafeExamBrowser.Logging/ModuleLogger.cs b/SafeExamBrowser.Logging/ModuleLogger.cs index e06c1547..0c908f0c 100644 --- a/SafeExamBrowser.Logging/ModuleLogger.cs +++ b/SafeExamBrowser.Logging/ModuleLogger.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Logging { diff --git a/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj b/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj index 7a5407a1..ba383715 100644 --- a/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj +++ b/SafeExamBrowser.Logging/SafeExamBrowser.Logging.csproj @@ -68,6 +68,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + \ No newline at end of file diff --git a/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs b/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs index 4f8e8a15..8d983ba3 100644 --- a/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs +++ b/SafeExamBrowser.Monitoring/Keyboard/KeyboardInterceptor.cs @@ -9,7 +9,7 @@ using System; using System.Linq; using System.Windows.Input; -using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring; +using SafeExamBrowser.Settings.Monitoring; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Monitoring.Contracts.Keyboard; diff --git a/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs b/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs index af95dd42..17f160bf 100644 --- a/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs +++ b/SafeExamBrowser.Monitoring/Mouse/MouseInterceptor.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring; +using SafeExamBrowser.Settings.Monitoring; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Monitoring.Contracts.Mouse; diff --git a/SafeExamBrowser.Monitoring/SafeExamBrowser.Monitoring.csproj b/SafeExamBrowser.Monitoring/SafeExamBrowser.Monitoring.csproj index e9bce594..162bacaa 100644 --- a/SafeExamBrowser.Monitoring/SafeExamBrowser.Monitoring.csproj +++ b/SafeExamBrowser.Monitoring/SafeExamBrowser.Monitoring.csproj @@ -65,10 +65,6 @@ - - {7d74555e-63e1-4c46-bd0a-8580552368c8} - SafeExamBrowser.Configuration.Contracts - {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts @@ -77,6 +73,10 @@ {6d563a30-366d-4c35-815b-2c9e6872278b} SafeExamBrowser.Monitoring.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.ResetUtility/CompositionRoot.cs b/SafeExamBrowser.ResetUtility/CompositionRoot.cs index 7acb61b0..0e7d5c33 100644 --- a/SafeExamBrowser.ResetUtility/CompositionRoot.cs +++ b/SafeExamBrowser.ResetUtility/CompositionRoot.cs @@ -9,11 +9,12 @@ using System; using System.Collections.Generic; using System.IO; -using SafeExamBrowser.Lockdown.Contracts; -using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Lockdown; +using SafeExamBrowser.Lockdown.Contracts; using SafeExamBrowser.Logging; +using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.ResetUtility.Procedure; +using SafeExamBrowser.Settings.Logging; using SafeExamBrowser.SystemComponents; namespace SafeExamBrowser.ResetUtility diff --git a/SafeExamBrowser.ResetUtility/Procedure/Log.cs b/SafeExamBrowser.ResetUtility/Procedure/Log.cs index 6ca3e538..2614df79 100644 --- a/SafeExamBrowser.ResetUtility/Procedure/Log.cs +++ b/SafeExamBrowser.ResetUtility/Procedure/Log.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.ResetUtility.Procedure { diff --git a/SafeExamBrowser.ResetUtility/SafeExamBrowser.ResetUtility.csproj b/SafeExamBrowser.ResetUtility/SafeExamBrowser.ResetUtility.csproj index a552deae..4ca9617c 100644 --- a/SafeExamBrowser.ResetUtility/SafeExamBrowser.ResetUtility.csproj +++ b/SafeExamBrowser.ResetUtility/SafeExamBrowser.ResetUtility.csproj @@ -104,6 +104,10 @@ {e107026c-2011-4552-a7d8-3a0d37881df6} SafeExamBrowser.Logging + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.Runtime.UnitTests/Communication/RuntimeHostTests.cs b/SafeExamBrowser.Runtime.UnitTests/Communication/RuntimeHostTests.cs index bf68036f..dcfd6878 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Communication/RuntimeHostTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Communication/RuntimeHostTests.cs @@ -15,7 +15,7 @@ using SafeExamBrowser.Communication.Contracts.Data; using SafeExamBrowser.Communication.Contracts.Events; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Runtime.Communication; using SafeExamBrowser.UserInterface.Contracts.MessageBox; @@ -171,7 +171,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Communication public void MustHandleConfigurationRequestCorrectly() { var args = default(ClientConfigurationEventArgs); - var configuration = new ClientConfiguration { Settings = new Settings { AdminPasswordHash = "12345" } }; + var configuration = new ClientConfiguration { Settings = new ApplicationSettings { AdminPasswordHash = "12345" } }; sut.AllowConnection = true; sut.ClientConfigurationNeeded += (a) => { args = a; args.ClientConfiguration = configuration; }; diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs index 12f1d0fd..a43d5e47 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ClientOperationTests.cs @@ -15,7 +15,7 @@ using SafeExamBrowser.Communication.Contracts.Data; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.WindowsApi.Contracts; @@ -37,7 +37,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations private Mock runtimeHost; private SessionConfiguration session; private SessionContext sessionContext; - private Settings settings; + private ApplicationSettings settings; private ClientOperation sut; [TestInitialize] @@ -53,7 +53,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations runtimeHost = new Mock(); session = new SessionConfiguration(); sessionContext = new SessionContext(); - settings = new Settings(); + settings = new ApplicationSettings(); terminated = new Action(() => { runtimeHost.Raise(h => h.ClientDisconnected += null); diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs index 19e298e4..7ea63312 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ConfigurationOperationTests.cs @@ -13,7 +13,7 @@ using Moq; using SafeExamBrowser.Communication.Contracts.Data; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Configuration.Contracts.Cryptography; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Runtime.Operations; @@ -56,7 +56,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustUseCommandLineArgumentAs1stPrio() { - var settings = new Settings { ConfigurationMode = ConfigurationMode.Exam }; + var settings = new ApplicationSettings { ConfigurationMode = ConfigurationMode.Exam }; var url = @"http://www.safeexambrowser.org/whatever.seb"; var location = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), nameof(Operations), "Testdata", FILE_NAME); @@ -77,7 +77,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustUseProgramDataAs2ndPrio() { var location = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), nameof(Operations), "Testdata", FILE_NAME); - var settings = default(Settings); + var settings = default(ApplicationSettings); appConfig.ProgramDataFilePath = location; @@ -94,7 +94,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustUseAppDataAs3rdPrio() { var location = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), nameof(Operations), "Testdata", FILE_NAME); - var settings = default(Settings); + var settings = default(ApplicationSettings); appConfig.AppDataFilePath = location; repository.Setup(r => r.TryLoadSettings(It.IsAny(), out settings, It.IsAny())).Returns(LoadStatus.Success); @@ -109,7 +109,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustTestdatalyHandleBrowserResource() { - var settings = new Settings { ConfigurationMode = ConfigurationMode.Exam }; + var settings = new ApplicationSettings { ConfigurationMode = ConfigurationMode.Exam }; var url = @"http://www.safeexambrowser.org/whatever.seb"; nextSession.Settings = settings; @@ -125,7 +125,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustFallbackToDefaultsAsLastPrio() { - var defaultSettings = new Settings(); + var defaultSettings = new ApplicationSettings(); repository.Setup(r => r.LoadDefaultSettings()).Returns(defaultSettings); @@ -141,7 +141,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustAbortIfWishedByUser() { - var settings = new Settings(); + var settings = new ApplicationSettings(); var url = @"http://www.safeexambrowser.org/whatever.seb"; sessionContext.Current = null; @@ -166,7 +166,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustNotAbortIfNotWishedByUser() { - var settings = new Settings(); + var settings = new ApplicationSettings(); var url = @"http://www.safeexambrowser.org/whatever.seb"; settings.ConfigurationMode = ConfigurationMode.ConfigureClient; @@ -191,7 +191,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustInformAboutClientConfigurationError() { var informed = false; - var settings = new Settings(); + var settings = new ApplicationSettings(); var url = @"http://www.safeexambrowser.org/whatever.seb"; settings.ConfigurationMode = ConfigurationMode.ConfigureClient; @@ -216,7 +216,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustNotAllowToAbortIfNotInConfigureClientMode() { - var settings = new Settings(); + var settings = new ApplicationSettings(); settings.ConfigurationMode = ConfigurationMode.Exam; repository.Setup(r => r.TryLoadSettings(It.IsAny(), out settings, It.IsAny())).Returns(LoadStatus.Success); @@ -238,7 +238,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustNotFailWithoutCommandLineArgs() { - var defaultSettings = new Settings(); + var defaultSettings = new ApplicationSettings(); var result = OperationResult.Failed; repository.Setup(r => r.LoadDefaultSettings()).Returns(defaultSettings); @@ -272,8 +272,8 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustOnlyAllowToEnterAdminPasswordFiveTimes() { var count = 0; - var localSettings = new Settings { AdminPasswordHash = "1234" }; - var settings = new Settings { AdminPasswordHash = "9876", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var localSettings = new ApplicationSettings { AdminPasswordHash = "1234" }; + var settings = new ApplicationSettings { AdminPasswordHash = "9876", ConfigurationMode = ConfigurationMode.ConfigureClient }; var url = @"http://www.safeexambrowser.org/whatever.seb"; appConfig.AppDataFilePath = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), nameof(Operations), "Testdata", FILE_NAME); @@ -302,7 +302,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustOnlyAllowToEnterSettingsPasswordFiveTimes() { var count = 0; - var settings = default(Settings); + var settings = default(ApplicationSettings); var url = @"http://www.safeexambrowser.org/whatever.seb"; repository.Setup(r => r.TryLoadSettings(It.IsAny(), out settings, It.IsAny())).Returns(LoadStatus.PasswordNeeded); @@ -329,8 +329,8 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustSucceedIfAdminPasswordTestdata() { var password = "test"; - var currentSettings = new Settings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; - var nextSettings = new Settings { AdminPasswordHash = "9876", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var currentSettings = new ApplicationSettings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var nextSettings = new ApplicationSettings { AdminPasswordHash = "9876", ConfigurationMode = ConfigurationMode.ConfigureClient }; var url = @"http://www.safeexambrowser.org/whatever.seb"; nextSession.Settings = nextSettings; @@ -359,8 +359,8 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustNotAuthenticateIfSameAdminPassword() { - var currentSettings = new Settings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; - var nextSettings = new Settings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var currentSettings = new ApplicationSettings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var nextSettings = new ApplicationSettings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; var url = @"http://www.safeexambrowser.org/whatever.seb"; nextSession.Settings = nextSettings; @@ -388,7 +388,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustSucceedIfSettingsPasswordTestdata() { var password = "test"; - var settings = new Settings { ConfigurationMode = ConfigurationMode.Exam }; + var settings = new ApplicationSettings { ConfigurationMode = ConfigurationMode.Exam }; var url = @"http://www.safeexambrowser.org/whatever.seb"; repository.Setup(r => r.TryLoadSettings(It.IsAny(), out settings, It.IsAny())).Returns(LoadStatus.PasswordNeeded); @@ -416,7 +416,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations { var url = @"http://www.safeexambrowser.org/whatever.seb"; var location = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), nameof(Operations), "Testdata", FILE_NAME); - var settings = new Settings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.Exam }; + var settings = new ApplicationSettings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.Exam }; appConfig.AppDataFilePath = location; @@ -442,8 +442,8 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Perform_MustAbortAskingForAdminPasswordIfDecidedByUser() { var password = "test"; - var currentSettings = new Settings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; - var nextSettings = new Settings { AdminPasswordHash = "9876", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var currentSettings = new ApplicationSettings { AdminPasswordHash = "1234", ConfigurationMode = ConfigurationMode.ConfigureClient }; + var nextSettings = new ApplicationSettings { AdminPasswordHash = "9876", ConfigurationMode = ConfigurationMode.ConfigureClient }; var url = @"http://www.safeexambrowser.org/whatever.seb"; appConfig.AppDataFilePath = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), nameof(Operations), "Testdata", FILE_NAME); @@ -472,7 +472,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Perform_MustAbortAskingForSettingsPasswordIfDecidedByUser() { - var settings = default(Settings); + var settings = default(ApplicationSettings); var url = @"http://www.safeexambrowser.org/whatever.seb"; repository.Setup(r => r.TryLoadSettings(It.IsAny(), out settings, It.IsAny())).Returns(LoadStatus.PasswordNeeded); @@ -494,10 +494,10 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Repeat_MustPerformForExamWithTestdataUri() { - var currentSettings = new Settings(); + var currentSettings = new ApplicationSettings(); var location = Path.GetDirectoryName(GetType().Assembly.Location); var resource = new Uri(Path.Combine(location, nameof(Operations), "Testdata", FILE_NAME)); - var settings = new Settings { ConfigurationMode = ConfigurationMode.Exam }; + var settings = new ApplicationSettings { ConfigurationMode = ConfigurationMode.Exam }; currentSession.Settings = currentSettings; sessionContext.ReconfigurationFilePath = resource.LocalPath; @@ -515,10 +515,10 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Repeat_MustPerformForClientConfigurationWithTestdataUri() { - var currentSettings = new Settings(); + var currentSettings = new ApplicationSettings(); var location = Path.GetDirectoryName(GetType().Assembly.Location); var resource = new Uri(Path.Combine(location, nameof(Operations), "Testdata", FILE_NAME)); - var settings = new Settings { ConfigurationMode = ConfigurationMode.ConfigureClient }; + var settings = new ApplicationSettings { ConfigurationMode = ConfigurationMode.ConfigureClient }; currentSession.Settings = currentSettings; sessionContext.ReconfigurationFilePath = resource.LocalPath; @@ -538,7 +538,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Repeat_MustFailWithInvalidUri() { var resource = new Uri("file:///C:/does/not/exist.txt"); - var settings = default(Settings); + var settings = default(ApplicationSettings); sessionContext.ReconfigurationFilePath = null; repository.Setup(r => r.TryLoadSettings(It.IsAny(), out settings, It.IsAny())).Returns(LoadStatus.Success); @@ -559,10 +559,10 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations [TestMethod] public void Repeat_MustAbortForSettingsPasswordIfWishedByUser() { - var currentSettings = new Settings(); + var currentSettings = new ApplicationSettings(); var location = Path.GetDirectoryName(GetType().Assembly.Location); var resource = new Uri(Path.Combine(location, nameof(Operations), "Testdata", FILE_NAME)); - var settings = new Settings { ConfigurationMode = ConfigurationMode.ConfigureClient }; + var settings = new ApplicationSettings { ConfigurationMode = ConfigurationMode.ConfigureClient }; currentSession.Settings = currentSettings; sessionContext.ReconfigurationFilePath = resource.LocalPath; diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs index c9c9d79c..5863e4a8 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/KioskModeOperationTests.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.WindowsApi.Contracts; @@ -21,12 +21,12 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public class KioskModeOperationTests { private SessionConfiguration currentSession; - private Settings currentSettings; + private ApplicationSettings currentSettings; private Mock desktopFactory; private Mock explorerShell; private Mock logger; private SessionConfiguration nextSession; - private Settings nextSettings; + private ApplicationSettings nextSettings; private Mock processFactory; private SessionContext sessionContext; @@ -36,12 +36,12 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations public void Initialize() { currentSession = new SessionConfiguration(); - currentSettings = new Settings(); + currentSettings = new ApplicationSettings(); desktopFactory = new Mock(); explorerShell = new Mock(); logger = new Mock(); nextSession = new SessionConfiguration(); - nextSettings = new Settings(); + nextSettings = new ApplicationSettings(); processFactory = new Mock(); sessionContext = new SessionContext(); diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs index cdee2222..1e4a3418 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/ServiceOperationTests.cs @@ -13,8 +13,8 @@ using Moq; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Service; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Runtime.Operations; @@ -34,7 +34,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations private EventWaitHandle serviceEvent; private SessionConfiguration session; private SessionContext sessionContext; - private Settings settings; + private ApplicationSettings settings; private Mock userInfo; private ServiceOperation sut; @@ -50,7 +50,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations serviceEvent = new EventWaitHandle(false, EventResetMode.AutoReset, serviceEventName); session = new SessionConfiguration(); sessionContext = new SessionContext(); - settings = new Settings(); + settings = new ApplicationSettings(); userInfo = new Mock(); appConfig.ServiceEventName = serviceEventName; diff --git a/SafeExamBrowser.Runtime.UnitTests/Operations/SessionActivationOperationTests.cs b/SafeExamBrowser.Runtime.UnitTests/Operations/SessionActivationOperationTests.cs index 1421ea86..62c8abb4 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Operations/SessionActivationOperationTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Operations/SessionActivationOperationTests.cs @@ -9,10 +9,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Runtime.Operations; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Runtime.UnitTests.Operations { @@ -22,7 +23,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations private SessionConfiguration currentSession; private Mock logger; private SessionConfiguration nextSession; - private Settings nextSettings; + private ApplicationSettings nextSettings; private SessionContext sessionContext; private SessionActivationOperation sut; @@ -33,7 +34,7 @@ namespace SafeExamBrowser.Runtime.UnitTests.Operations currentSession = new SessionConfiguration(); logger = new Mock(); nextSession = new SessionConfiguration(); - nextSettings = new Settings(); + nextSettings = new ApplicationSettings(); sessionContext = new SessionContext(); nextSession.Settings = nextSettings; diff --git a/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs b/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs index 5ec0fe9f..2f76fca5 100644 --- a/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs +++ b/SafeExamBrowser.Runtime.UnitTests/RuntimeControllerTests.cs @@ -14,8 +14,8 @@ using SafeExamBrowser.Communication.Contracts.Events; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Service; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; @@ -36,11 +36,11 @@ namespace SafeExamBrowser.Runtime.UnitTests private Mock clientProcess; private Mock clientProxy; private SessionConfiguration currentSession; - private Settings currentSettings; + private ApplicationSettings currentSettings; private Mock logger; private Mock messageBox; private SessionConfiguration nextSession; - private Settings nextSettings; + private ApplicationSettings nextSettings; private Mock shutdown; private Mock text; private Mock uiFactory; @@ -58,11 +58,11 @@ namespace SafeExamBrowser.Runtime.UnitTests clientProcess = new Mock(); clientProxy = new Mock(); currentSession = new SessionConfiguration(); - currentSettings = new Settings(); + currentSettings = new ApplicationSettings(); logger = new Mock(); messageBox = new Mock(); nextSession = new SessionConfiguration(); - nextSettings = new Settings(); + nextSettings = new ApplicationSettings(); runtimeHost = new Mock(); service = new Mock(); sessionContext = new SessionContext(); @@ -134,7 +134,7 @@ namespace SafeExamBrowser.Runtime.UnitTests var args = new ClientConfigurationEventArgs(); var nextAppConfig = new AppConfig(); var nextSessionId = Guid.NewGuid(); - var nextSettings = new Settings(); + var nextSettings = new ApplicationSettings(); nextSession.AppConfig = nextAppConfig; nextSession.SessionId = nextSessionId; diff --git a/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj b/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj index 8fca42eb..c99eb8fa 100644 --- a/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj +++ b/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj @@ -134,6 +134,10 @@ {e3aed2f8-b5df-45d1-ac19-48066923d6d8} SafeExamBrowser.Runtime + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs index be8c07ae..76d56382 100644 --- a/SafeExamBrowser.Runtime/CompositionRoot.cs +++ b/SafeExamBrowser.Runtime/CompositionRoot.cs @@ -34,6 +34,7 @@ using SafeExamBrowser.Runtime.Operations; using SafeExamBrowser.SystemComponents; using SafeExamBrowser.UserInterface.Desktop; using SafeExamBrowser.WindowsApi; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Runtime { diff --git a/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs index 67bb2a76..6da4cf7b 100644 --- a/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ConfigurationOperation.cs @@ -11,7 +11,7 @@ using System.IO; using SafeExamBrowser.Communication.Contracts.Data; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Configuration.Contracts.Cryptography; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; @@ -107,7 +107,7 @@ namespace SafeExamBrowser.Runtime.Operations { var currentPassword = default(string); var passwordParams = default(PasswordParameters); - var settings = default(Settings); + var settings = default(ApplicationSettings); var status = default(LoadStatus?); if (source == UriSource.CommandLine) @@ -161,7 +161,7 @@ namespace SafeExamBrowser.Runtime.Operations } } - private OperationResult DetermineLoadResult(Uri uri, UriSource source, Settings settings, LoadStatus status, PasswordParameters passwordParams, string currentPassword = default(string)) + private OperationResult DetermineLoadResult(Uri uri, UriSource source, ApplicationSettings settings, LoadStatus status, PasswordParameters passwordParams, string currentPassword = default(string)) { if (status == LoadStatus.LoadWithBrowser || status == LoadStatus.Success) { @@ -218,7 +218,7 @@ namespace SafeExamBrowser.Runtime.Operations return OperationResult.Failed; } - private LoadStatus? TryLoadSettings(Uri uri, UriSource source, out PasswordParameters passwordParams, out Settings settings, string currentPassword = default(string)) + private LoadStatus? TryLoadSettings(Uri uri, UriSource source, out PasswordParameters passwordParams, out ApplicationSettings settings, string currentPassword = default(string)) { passwordParams = new PasswordParameters { Password = string.Empty, IsHash = true }; diff --git a/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs b/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs index 636fa8ec..963f0452 100644 --- a/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/KioskModeOperation.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; diff --git a/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs index 2e9da19e..157902ff 100644 --- a/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs +++ b/SafeExamBrowser.Runtime/Operations/ServiceOperation.cs @@ -12,7 +12,7 @@ using System.Threading; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; +using SafeExamBrowser.Settings.Service; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; diff --git a/SafeExamBrowser.Runtime/RuntimeController.cs b/SafeExamBrowser.Runtime/RuntimeController.cs index 8f52015f..38f71dca 100644 --- a/SafeExamBrowser.Runtime/RuntimeController.cs +++ b/SafeExamBrowser.Runtime/RuntimeController.cs @@ -13,8 +13,8 @@ using SafeExamBrowser.Communication.Contracts.Events; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Communication.Contracts.Proxies; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Service; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; diff --git a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj index 70dfbbf1..21e91c26 100644 --- a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj +++ b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj @@ -179,6 +179,10 @@ {5d0136b4-6d21-4f99-ae42-3fb7f478ae0a} SafeExamBrowser.Runtime.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.Service.UnitTests/Operations/LockdownOperationTests.cs b/SafeExamBrowser.Service.UnitTests/Operations/LockdownOperationTests.cs index 3416e15d..a92c9fe7 100644 --- a/SafeExamBrowser.Service.UnitTests/Operations/LockdownOperationTests.cs +++ b/SafeExamBrowser.Service.UnitTests/Operations/LockdownOperationTests.cs @@ -12,7 +12,7 @@ using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; +using SafeExamBrowser.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Lockdown.Contracts; using SafeExamBrowser.Logging.Contracts; @@ -27,7 +27,7 @@ namespace SafeExamBrowser.Service.UnitTests.Operations private Mock factory; private Mock monitor; private Mock logger; - private Settings settings; + private ApplicationSettings settings; private SessionContext sessionContext; private LockdownOperation sut; @@ -38,7 +38,7 @@ namespace SafeExamBrowser.Service.UnitTests.Operations factory = new Mock(); monitor = new Mock(); logger = new Mock(); - settings = new Settings(); + settings = new ApplicationSettings(); sessionContext = new SessionContext { Configuration = new ServiceConfiguration { Settings = settings, UserName = "TestName", UserSid = "S-1-234-TEST" } diff --git a/SafeExamBrowser.Service.UnitTests/Operations/SessionInitializationOperationTests.cs b/SafeExamBrowser.Service.UnitTests/Operations/SessionInitializationOperationTests.cs index 8f78427b..f544942c 100644 --- a/SafeExamBrowser.Service.UnitTests/Operations/SessionInitializationOperationTests.cs +++ b/SafeExamBrowser.Service.UnitTests/Operations/SessionInitializationOperationTests.cs @@ -12,11 +12,11 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Lockdown.Contracts; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Service.Operations; +using SafeExamBrowser.Settings; namespace SafeExamBrowser.Service.UnitTests.Operations { @@ -42,7 +42,7 @@ namespace SafeExamBrowser.Service.UnitTests.Operations sessionContext.Configuration = new ServiceConfiguration { AppConfig = new AppConfig { ServiceEventName = $"{nameof(SafeExamBrowser)}-{nameof(SessionInitializationOperationTests)}" }, - Settings = new Settings() + Settings = new ApplicationSettings() }; sut = new SessionInitializationOperation(logger.Object, serviceEventFactory.Object, sessionContext); diff --git a/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj b/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj index adc036fc..a2690e72 100644 --- a/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj +++ b/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj @@ -127,6 +127,10 @@ {fa3c6692-dfed-4afa-bd58-9a3da2753c78} SafeExamBrowser.Service + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + diff --git a/SafeExamBrowser.Service.UnitTests/ServiceControllerTests.cs b/SafeExamBrowser.Service.UnitTests/ServiceControllerTests.cs index 8ef30c40..738adbf0 100644 --- a/SafeExamBrowser.Service.UnitTests/ServiceControllerTests.cs +++ b/SafeExamBrowser.Service.UnitTests/ServiceControllerTests.cs @@ -13,10 +13,11 @@ using Moq; using SafeExamBrowser.Communication.Contracts.Events; using SafeExamBrowser.Communication.Contracts.Hosts; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Lockdown.Contracts; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Service.UnitTests { @@ -81,7 +82,7 @@ namespace SafeExamBrowser.Service.UnitTests { AppConfig = new AppConfig { ServiceLogFilePath = "Test.log" }, SessionId = Guid.NewGuid(), - Settings = new Settings { LogLevel = LogLevel.Warning } + Settings = new ApplicationSettings { LogLevel = LogLevel.Warning } } }; diff --git a/SafeExamBrowser.Service/CompositionRoot.cs b/SafeExamBrowser.Service/CompositionRoot.cs index bf14d8d8..b19a008d 100644 --- a/SafeExamBrowser.Service/CompositionRoot.cs +++ b/SafeExamBrowser.Service/CompositionRoot.cs @@ -16,14 +16,15 @@ using SafeExamBrowser.Communication.Hosts; using SafeExamBrowser.Communication.Proxies; using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Core.Contracts.OperationModel; -using SafeExamBrowser.Logging.Contracts; -using SafeExamBrowser.Service.Contracts; using SafeExamBrowser.Core.OperationModel; using SafeExamBrowser.Core.Operations; using SafeExamBrowser.Lockdown; using SafeExamBrowser.Logging; +using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Service.Communication; +using SafeExamBrowser.Service.Contracts; using SafeExamBrowser.Service.Operations; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.Service { diff --git a/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj b/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj index f3665c9f..2765bd6e 100644 --- a/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj +++ b/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj @@ -124,6 +124,10 @@ {5167820f-2be5-43cf-b1cc-e4874bf83808} SafeExamBrowser.Service.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs b/SafeExamBrowser.Settings/ApplicationSettings.cs similarity index 82% rename from SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs rename to SafeExamBrowser.Settings/ApplicationSettings.cs index fed39f96..4478cff8 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Settings.cs +++ b/SafeExamBrowser.Settings/ApplicationSettings.cs @@ -7,20 +7,20 @@ */ using System; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; -using SafeExamBrowser.Configuration.Contracts.Settings.Monitoring; -using SafeExamBrowser.Configuration.Contracts.Settings.Service; -using SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents; -using SafeExamBrowser.Configuration.Contracts.Settings.UserInterface; -using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Browser; +using SafeExamBrowser.Settings.Logging; +using SafeExamBrowser.Settings.Monitoring; +using SafeExamBrowser.Settings.Service; +using SafeExamBrowser.Settings.SystemComponents; +using SafeExamBrowser.Settings.UserInterface; -namespace SafeExamBrowser.Configuration.Contracts.Settings +namespace SafeExamBrowser.Settings { /// - /// Defines all configuration options for the application. + /// Defines all settings for the application. /// [Serializable] - public class Settings + public class ApplicationSettings { /// /// All action center-related settings. @@ -92,7 +92,7 @@ namespace SafeExamBrowser.Configuration.Contracts.Settings /// public UserInterfaceMode UserInterfaceMode { get; set; } - public Settings() + public ApplicationSettings() { ActionCenter = new ActionCenterSettings(); Audio = new AudioSettings(); diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/BrowserSettings.cs b/SafeExamBrowser.Settings/Browser/BrowserSettings.cs similarity index 97% rename from SafeExamBrowser.Configuration.Contracts/Settings/Browser/BrowserSettings.cs rename to SafeExamBrowser.Settings/Browser/BrowserSettings.cs index cab3b476..e371d2c5 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/BrowserSettings.cs +++ b/SafeExamBrowser.Settings/Browser/BrowserSettings.cs @@ -9,7 +9,7 @@ using System; using System.Collections.Generic; -namespace SafeExamBrowser.Configuration.Contracts.Settings.Browser +namespace SafeExamBrowser.Settings.Browser { /// /// Defines all configuration options for the browser engine of the application. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/BrowserWindowSettings.cs b/SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs similarity index 96% rename from SafeExamBrowser.Configuration.Contracts/Settings/Browser/BrowserWindowSettings.cs rename to SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs index ecd3bab9..811473fa 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/BrowserWindowSettings.cs +++ b/SafeExamBrowser.Settings/Browser/BrowserWindowSettings.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.Browser +namespace SafeExamBrowser.Settings.Browser { /// /// Defines all configuration options for a window of the browser engine. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterResult.cs b/SafeExamBrowser.Settings/Browser/FilterResult.cs similarity index 90% rename from SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterResult.cs rename to SafeExamBrowser.Settings/Browser/FilterResult.cs index 2e123d8e..ee0364b6 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterResult.cs +++ b/SafeExamBrowser.Settings/Browser/FilterResult.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings.Browser +namespace SafeExamBrowser.Settings.Browser { /// /// Defines all possible results of a request filter operation. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterRule.cs b/SafeExamBrowser.Settings/Browser/FilterRule.cs similarity index 92% rename from SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterRule.cs rename to SafeExamBrowser.Settings/Browser/FilterRule.cs index 29490037..f8c72693 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterRule.cs +++ b/SafeExamBrowser.Settings/Browser/FilterRule.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.Browser +namespace SafeExamBrowser.Settings.Browser { /// /// Defines a request filter rule. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterType.cs b/SafeExamBrowser.Settings/Browser/FilterType.cs similarity index 90% rename from SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterType.cs rename to SafeExamBrowser.Settings/Browser/FilterType.cs index a54a900d..271e4fc9 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Browser/FilterType.cs +++ b/SafeExamBrowser.Settings/Browser/FilterType.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings.Browser +namespace SafeExamBrowser.Settings.Browser { /// /// Defines all possible request filter types. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/ConfigurationMode.cs b/SafeExamBrowser.Settings/ConfigurationMode.cs similarity index 93% rename from SafeExamBrowser.Configuration.Contracts/Settings/ConfigurationMode.cs rename to SafeExamBrowser.Settings/ConfigurationMode.cs index 0a9df7bf..2ad58180 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/ConfigurationMode.cs +++ b/SafeExamBrowser.Settings/ConfigurationMode.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings +namespace SafeExamBrowser.Settings { /// /// Defines all possible configuration modes for the application. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs b/SafeExamBrowser.Settings/KioskMode.cs similarity index 93% rename from SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs rename to SafeExamBrowser.Settings/KioskMode.cs index 2b44cc54..2dfeedd6 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/KioskMode.cs +++ b/SafeExamBrowser.Settings/KioskMode.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings +namespace SafeExamBrowser.Settings { /// /// Defines all kiosk modes which the application supports. diff --git a/SafeExamBrowser.Settings/Logging/LogLevel.cs b/SafeExamBrowser.Settings/Logging/LogLevel.cs new file mode 100644 index 00000000..baa9b210 --- /dev/null +++ b/SafeExamBrowser.Settings/Logging/LogLevel.cs @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +namespace SafeExamBrowser.Settings.Logging +{ + /// + /// Defines all log levels supported by the application. + /// + public enum LogLevel + { + /// + /// All messages are logged. + /// + Debug, + + /// + /// Only messages with , and are logged. + /// + Info, + + /// + /// Only messages with and are logged. + /// + Warning, + + /// + /// Only messages with are logged. + /// + Error + } +} diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/KeyboardSettings.cs b/SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs similarity index 97% rename from SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/KeyboardSettings.cs rename to SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs index 0608cf5c..9a19c243 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/KeyboardSettings.cs +++ b/SafeExamBrowser.Settings/Monitoring/KeyboardSettings.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.Monitoring +namespace SafeExamBrowser.Settings.Monitoring { /// /// Defines all configuration options for monitoring keyboard input. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/MouseSettings.cs b/SafeExamBrowser.Settings/Monitoring/MouseSettings.cs similarity index 91% rename from SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/MouseSettings.cs rename to SafeExamBrowser.Settings/Monitoring/MouseSettings.cs index 0d00e4e0..9883a76e 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Monitoring/MouseSettings.cs +++ b/SafeExamBrowser.Settings/Monitoring/MouseSettings.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.Monitoring +namespace SafeExamBrowser.Settings.Monitoring { /// /// Defines all configuration options for monitoring mouse input. diff --git a/SafeExamBrowser.Settings/Properties/AssemblyInfo.cs b/SafeExamBrowser.Settings/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..5f7676da --- /dev/null +++ b/SafeExamBrowser.Settings/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SafeExamBrowser.Settings")] +[assembly: AssemblyDescription("Safe Exam Browser")] +[assembly: AssemblyCompany("ETH Zürich")] +[assembly: AssemblyProduct("SafeExamBrowser.Settings")] +[assembly: AssemblyCopyright("Copyright © 2019 ETH Zürich, Educational Development and Technology (LET)")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("30b2d907-5861-4f39-abad-c4abf1b3470e")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Settings/SafeExamBrowser.Settings.csproj b/SafeExamBrowser.Settings/SafeExamBrowser.Settings.csproj new file mode 100644 index 00000000..ab3498c7 --- /dev/null +++ b/SafeExamBrowser.Settings/SafeExamBrowser.Settings.csproj @@ -0,0 +1,76 @@ + + + + + Debug + AnyCPU + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E} + Library + Properties + SafeExamBrowser.Settings + SafeExamBrowser.Settings + v4.7.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServicePolicy.cs b/SafeExamBrowser.Settings/Service/ServicePolicy.cs similarity index 93% rename from SafeExamBrowser.Configuration.Contracts/Settings/Service/ServicePolicy.cs rename to SafeExamBrowser.Settings/Service/ServicePolicy.cs index 4c48c4ac..d01bdc5a 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServicePolicy.cs +++ b/SafeExamBrowser.Settings/Service/ServicePolicy.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings.Service +namespace SafeExamBrowser.Settings.Service { /// /// Defines all possible service policies which the application supports. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServiceSettings.cs b/SafeExamBrowser.Settings/Service/ServiceSettings.cs similarity index 97% rename from SafeExamBrowser.Configuration.Contracts/Settings/Service/ServiceSettings.cs rename to SafeExamBrowser.Settings/Service/ServiceSettings.cs index 5c95b48d..ff7d9463 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/Service/ServiceSettings.cs +++ b/SafeExamBrowser.Settings/Service/ServiceSettings.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings.Service +namespace SafeExamBrowser.Settings.Service { /// /// Defines all configuration options for the service application component. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/SystemComponents/AudioSettings.cs b/SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs similarity index 93% rename from SafeExamBrowser.Configuration.Contracts/Settings/SystemComponents/AudioSettings.cs rename to SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs index 03196d36..69f6f1ba 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/SystemComponents/AudioSettings.cs +++ b/SafeExamBrowser.Settings/SystemComponents/AudioSettings.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents +namespace SafeExamBrowser.Settings.SystemComponents { /// /// Defines all configuration options for the audio device of the computer. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/ActionCenterSettings.cs b/SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs similarity index 95% rename from SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/ActionCenterSettings.cs rename to SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs index b0abdf31..74bf3496 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/ActionCenterSettings.cs +++ b/SafeExamBrowser.Settings/UserInterface/ActionCenterSettings.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface +namespace SafeExamBrowser.Settings.UserInterface { /// /// Defines all configuration options for the action center. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/TaskbarSettings.cs b/SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs similarity index 95% rename from SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/TaskbarSettings.cs rename to SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs index e2cda72e..f450eac7 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/TaskbarSettings.cs +++ b/SafeExamBrowser.Settings/UserInterface/TaskbarSettings.cs @@ -8,7 +8,7 @@ using System; -namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface +namespace SafeExamBrowser.Settings.UserInterface { /// /// Defines all configuration options for the taskbar. diff --git a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/UserInterfaceMode.cs b/SafeExamBrowser.Settings/UserInterface/UserInterfaceMode.cs similarity index 90% rename from SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/UserInterfaceMode.cs rename to SafeExamBrowser.Settings/UserInterface/UserInterfaceMode.cs index 92511639..57a8203a 100644 --- a/SafeExamBrowser.Configuration.Contracts/Settings/UserInterface/UserInterfaceMode.cs +++ b/SafeExamBrowser.Settings/UserInterface/UserInterfaceMode.cs @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -namespace SafeExamBrowser.Configuration.Contracts.Settings.UserInterface +namespace SafeExamBrowser.Settings.UserInterface { /// /// Defines all possible look & feel options for the application. diff --git a/SafeExamBrowser.SystemComponents/Audio/Audio.cs b/SafeExamBrowser.SystemComponents/Audio/Audio.cs index 581a37be..14a2c1a5 100644 --- a/SafeExamBrowser.SystemComponents/Audio/Audio.cs +++ b/SafeExamBrowser.SystemComponents/Audio/Audio.cs @@ -9,7 +9,7 @@ using System; using System.Linq; using NAudio.CoreAudioApi; -using SafeExamBrowser.Configuration.Contracts.Settings.SystemComponents; +using SafeExamBrowser.Settings.SystemComponents; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.SystemComponents.Contracts.Audio; using SafeExamBrowser.SystemComponents.Contracts.Audio.Events; diff --git a/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj b/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj index 7058abac..022e772b 100644 --- a/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj +++ b/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj @@ -77,14 +77,14 @@ - - {7d74555e-63e1-4c46-bd0a-8580552368c8} - SafeExamBrowser.Configuration.Contracts - {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.UserInterface.Contracts/IUserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Contracts/IUserInterfaceFactory.cs index 77009a4e..9e7c6ded 100644 --- a/SafeExamBrowser.UserInterface.Contracts/IUserInterfaceFactory.cs +++ b/SafeExamBrowser.UserInterface.Contracts/IUserInterfaceFactory.cs @@ -9,7 +9,7 @@ using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.SystemComponents.Contracts.Audio; diff --git a/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj b/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj index addf13a2..6b92b2f8 100644 --- a/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj +++ b/SafeExamBrowser.UserInterface.Contracts/SafeExamBrowser.UserInterface.Contracts.csproj @@ -107,6 +107,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs index e762685d..bed06c1b 100644 --- a/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Desktop/BrowserWindow.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Imaging; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.Core.Contracts; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts; diff --git a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj index ed1a5acb..f8bc58f8 100644 --- a/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj +++ b/SafeExamBrowser.UserInterface.Desktop/SafeExamBrowser.UserInterface.Desktop.csproj @@ -440,6 +440,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs index 75dc9a05..a966e228 100644 --- a/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs +++ b/SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs @@ -13,7 +13,7 @@ using FontAwesome.WPF; using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.SystemComponents.Contracts.Audio; diff --git a/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs index d821ff0d..0ce8e377 100644 --- a/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/LogViewModel.cs @@ -13,6 +13,7 @@ using System.Windows.Documents; using System.Windows.Media; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.UserInterface.Desktop.ViewModels { diff --git a/SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs b/SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs index 1b959c82..88af39f6 100644 --- a/SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs +++ b/SafeExamBrowser.UserInterface.Desktop/ViewModels/RuntimeWindowViewModel.cs @@ -12,6 +12,7 @@ using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.UserInterface.Desktop.ViewModels { diff --git a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs index 3fe99c00..dc9cfcf2 100644 --- a/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs +++ b/SafeExamBrowser.UserInterface.Mobile/BrowserWindow.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Imaging; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.Core.Contracts; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts; diff --git a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj index 3e240281..80fc22e5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj +++ b/SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj @@ -195,6 +195,10 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts + + {30b2d907-5861-4f39-abad-c4abf1b3470e} + SafeExamBrowser.Settings + {903129c6-e236-493b-9ad6-c6a57f647a3a} SafeExamBrowser.SystemComponents.Contracts diff --git a/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs index 95d0584d..212aa940 100644 --- a/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs +++ b/SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs @@ -13,7 +13,7 @@ using FontAwesome.WPF; using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Settings.Browser; +using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.SystemComponents.Contracts.Audio; diff --git a/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs index 5ed2cebf..f13ebc99 100644 --- a/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs +++ b/SafeExamBrowser.UserInterface.Mobile/ViewModels/LogViewModel.cs @@ -13,6 +13,7 @@ using System.Windows.Documents; using System.Windows.Media; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.UserInterface.Mobile.ViewModels { diff --git a/SafeExamBrowser.UserInterface.Mobile/ViewModels/RuntimeWindowViewModel.cs b/SafeExamBrowser.UserInterface.Mobile/ViewModels/RuntimeWindowViewModel.cs index 7ca7ce7e..96d775a5 100644 --- a/SafeExamBrowser.UserInterface.Mobile/ViewModels/RuntimeWindowViewModel.cs +++ b/SafeExamBrowser.UserInterface.Mobile/ViewModels/RuntimeWindowViewModel.cs @@ -12,6 +12,7 @@ using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; using SafeExamBrowser.Logging.Contracts; +using SafeExamBrowser.Settings.Logging; namespace SafeExamBrowser.UserInterface.Mobile.ViewModels { diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln index 73ce335d..1278951d 100644 --- a/SafeExamBrowser.sln +++ b/SafeExamBrowser.sln @@ -102,6 +102,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterfa EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.WindowsApi.Contracts", "SafeExamBrowser.WindowsApi.Contracts\SafeExamBrowser.WindowsApi.Contracts.csproj", "{7016F080-9AA5-41B2-A225-385AD877C171}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Settings", "SafeExamBrowser.Settings\SafeExamBrowser.Settings.csproj", "{30B2D907-5861-4F39-ABAD-C4ABF1B3470E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -456,6 +458,14 @@ Global {7016F080-9AA5-41B2-A225-385AD877C171}.Release|Any CPU.Build.0 = Release|Any CPU {7016F080-9AA5-41B2-A225-385AD877C171}.Release|x86.ActiveCfg = Release|x86 {7016F080-9AA5-41B2-A225-385AD877C171}.Release|x86.Build.0 = Release|x86 + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Debug|x86.ActiveCfg = Debug|x86 + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Debug|x86.Build.0 = Debug|x86 + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Release|Any CPU.Build.0 = Release|Any CPU + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Release|x86.ActiveCfg = Release|x86 + {30B2D907-5861-4F39-ABAD-C4ABF1B3470E}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE