diff --git a/SafeExamBrowser.Client.Contracts/IClientController.cs b/SafeExamBrowser.Client.Contracts/IClientController.cs deleted file mode 100644 index ba649043..00000000 --- a/SafeExamBrowser.Client.Contracts/IClientController.cs +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2020 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.Client.Contracts -{ - /// - /// Controls the lifetime and is responsible for the event handling of the client application component. - /// - public interface IClientController - { - /// - /// Reverts any changes, releases all used resources and terminates the client. - /// - void Terminate(); - - /// - /// Tries to start the client. Returns true if successful, otherwise false. - /// - bool TryStart(); - - /// - /// Instructs the controller to update the application configuration. - /// - void UpdateAppConfig(); - } -} diff --git a/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj b/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj index d8d10dbe..80f71458 100644 --- a/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj +++ b/SafeExamBrowser.Client.Contracts/SafeExamBrowser.Client.Contracts.csproj @@ -54,7 +54,6 @@ - diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs index fe391ee9..5314fce7 100644 --- a/SafeExamBrowser.Client/ClientController.cs +++ b/SafeExamBrowser.Client/ClientController.cs @@ -13,7 +13,6 @@ using System.Linq; using SafeExamBrowser.Applications.Contracts; using SafeExamBrowser.Browser.Contracts; using SafeExamBrowser.Browser.Contracts.Events; -using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.Client.Operations.Events; using SafeExamBrowser.Communication.Contracts.Data; using SafeExamBrowser.Communication.Contracts.Events; @@ -37,7 +36,7 @@ using SafeExamBrowser.WindowsApi.Contracts; namespace SafeExamBrowser.Client { - internal class ClientController : IClientController + internal class ClientController { private IActionCenter actionCenter; private IApplicationMonitor applicationMonitor; @@ -60,7 +59,7 @@ namespace SafeExamBrowser.Client private IClientHost ClientHost => context.ClientHost; private AppSettings Settings => context.Settings; - public ClientController( + internal ClientController( IActionCenter actionCenter, IApplicationMonitor applicationMonitor, ClientContext context, @@ -96,7 +95,7 @@ namespace SafeExamBrowser.Client this.uiFactory = uiFactory; } - public bool TryStart() + internal bool TryStart() { logger.Info("Initiating startup procedure..."); @@ -139,7 +138,7 @@ namespace SafeExamBrowser.Client return success; } - public void Terminate() + internal void Terminate() { logger.Log(string.Empty); logger.Info("Initiating shutdown procedure..."); @@ -166,7 +165,7 @@ namespace SafeExamBrowser.Client splashScreen.Close(); } - public void UpdateAppConfig() + internal void UpdateAppConfig() { splashScreen.AppConfig = context.AppConfig; } diff --git a/SafeExamBrowser.Client/CompositionRoot.cs b/SafeExamBrowser.Client/CompositionRoot.cs index 56c05701..081e5a26 100644 --- a/SafeExamBrowser.Client/CompositionRoot.cs +++ b/SafeExamBrowser.Client/CompositionRoot.cs @@ -12,7 +12,6 @@ using System.Diagnostics; using SafeExamBrowser.Applications; using SafeExamBrowser.Browser; using SafeExamBrowser.Client.Communication; -using SafeExamBrowser.Client.Contracts; using SafeExamBrowser.Client.Notifications; using SafeExamBrowser.Client.Operations; using SafeExamBrowser.Communication.Contracts; @@ -74,7 +73,7 @@ namespace SafeExamBrowser.Client private IText text; private IUserInterfaceFactory uiFactory; - internal IClientController ClientController { get; private set; } + internal ClientController ClientController { get; private set; } internal void BuildObjectGraph(Action shutdown) { diff --git a/SafeExamBrowser.Runtime.Contracts/IRuntimeController.cs b/SafeExamBrowser.Runtime.Contracts/IRuntimeController.cs deleted file mode 100644 index b355e30a..00000000 --- a/SafeExamBrowser.Runtime.Contracts/IRuntimeController.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2020 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.Runtime.Contracts -{ - /// - /// Controls the lifetime and is responsible for the event handling of the runtime application component. - /// - public interface IRuntimeController - { - /// - /// Reverts any changes, releases all used resources and terminates the runtime. - /// - void Terminate(); - - /// - /// Tries to start the runtime. Returns true if successful, otherwise false. - /// - bool TryStart(); - } -} diff --git a/SafeExamBrowser.Runtime.Contracts/Properties/AssemblyInfo.cs b/SafeExamBrowser.Runtime.Contracts/Properties/AssemblyInfo.cs deleted file mode 100644 index c9eab677..00000000 --- a/SafeExamBrowser.Runtime.Contracts/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -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.Runtime.Contracts")] -[assembly: AssemblyDescription("Safe Exam Browser")] -[assembly: AssemblyCompany("ETH Zürich")] -[assembly: AssemblyProduct("SafeExamBrowser.Runtime.Contracts")] -[assembly: AssemblyCopyright("Copyright © 2020 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("5d0136b4-6d21-4f99-ae42-3fb7f478ae0a")] - -// 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.Runtime.Contracts/SafeExamBrowser.Runtime.Contracts.csproj b/SafeExamBrowser.Runtime.Contracts/SafeExamBrowser.Runtime.Contracts.csproj deleted file mode 100644 index b84c732c..00000000 --- a/SafeExamBrowser.Runtime.Contracts/SafeExamBrowser.Runtime.Contracts.csproj +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Debug - AnyCPU - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A} - Library - Properties - SafeExamBrowser.Runtime.Contracts - SafeExamBrowser.Runtime.Contracts - v4.7.2 - 512 - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - \ No newline at end of file diff --git a/SafeExamBrowser.Runtime/CompositionRoot.cs b/SafeExamBrowser.Runtime/CompositionRoot.cs index bba6486c..44a04601 100644 --- a/SafeExamBrowser.Runtime/CompositionRoot.cs +++ b/SafeExamBrowser.Runtime/CompositionRoot.cs @@ -25,7 +25,6 @@ using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging; using SafeExamBrowser.Logging.Contracts; using SafeExamBrowser.Runtime.Communication; -using SafeExamBrowser.Runtime.Contracts; using SafeExamBrowser.Runtime.Operations; using SafeExamBrowser.Settings.Logging; using SafeExamBrowser.SystemComponents; @@ -43,7 +42,7 @@ namespace SafeExamBrowser.Runtime private ISystemInfo systemInfo; private IText text; - internal IRuntimeController RuntimeController { get; private set; } + internal RuntimeController RuntimeController { get; private set; } internal void BuildObjectGraph(Action shutdown) { diff --git a/SafeExamBrowser.Runtime/RuntimeController.cs b/SafeExamBrowser.Runtime/RuntimeController.cs index 92b76a34..63ecd03b 100644 --- a/SafeExamBrowser.Runtime/RuntimeController.cs +++ b/SafeExamBrowser.Runtime/RuntimeController.cs @@ -17,7 +17,6 @@ using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Core.Contracts.OperationModel.Events; using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.Logging.Contracts; -using SafeExamBrowser.Runtime.Contracts; using SafeExamBrowser.Runtime.Operations.Events; using SafeExamBrowser.Settings.Security; using SafeExamBrowser.Settings.Service; @@ -27,7 +26,7 @@ using SafeExamBrowser.UserInterface.Contracts.Windows; namespace SafeExamBrowser.Runtime { - internal class RuntimeController : IRuntimeController + internal class RuntimeController { private AppConfig appConfig; private ILogger logger; @@ -53,7 +52,7 @@ namespace SafeExamBrowser.Runtime get { return Session != null; } } - public RuntimeController( + internal RuntimeController( AppConfig appConfig, ILogger logger, IMessageBox messageBox, @@ -83,7 +82,7 @@ namespace SafeExamBrowser.Runtime this.uiFactory = uiFactory; } - public bool TryStart() + internal bool TryStart() { logger.Info("Initiating startup procedure..."); @@ -120,7 +119,7 @@ namespace SafeExamBrowser.Runtime return initialized && SessionIsRunning; } - public void Terminate() + internal void Terminate() { DeregisterEvents(); diff --git a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj index cd96b8a2..0542bd86 100644 --- a/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj +++ b/SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj @@ -177,10 +177,6 @@ {e107026c-2011-4552-a7d8-3a0d37881df6} SafeExamBrowser.Logging - - {5d0136b4-6d21-4f99-ae42-3fb7f478ae0a} - SafeExamBrowser.Runtime.Contracts - {30b2d907-5861-4f39-abad-c4abf1b3470e} SafeExamBrowser.Settings diff --git a/SafeExamBrowser.Service.Contracts/IServiceController.cs b/SafeExamBrowser.Service.Contracts/IServiceController.cs deleted file mode 100644 index b9188875..00000000 --- a/SafeExamBrowser.Service.Contracts/IServiceController.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2020 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.Service.Contracts -{ - /// - /// Controls the lifetime and is responsible for the event handling of the service application component. - /// - public interface IServiceController - { - /// - /// Reverts any changes and releases all resources used by the service. - /// - void Terminate(); - - /// - /// Tries to start the service. Returns true if successful, otherwise false. - /// - bool TryStart(); - } -} diff --git a/SafeExamBrowser.Service.Contracts/Properties/AssemblyInfo.cs b/SafeExamBrowser.Service.Contracts/Properties/AssemblyInfo.cs deleted file mode 100644 index b886bbef..00000000 --- a/SafeExamBrowser.Service.Contracts/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -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.Service.Contracts")] -[assembly: AssemblyDescription("Safe Exam Browser")] -[assembly: AssemblyCompany("ETH Zürich")] -[assembly: AssemblyProduct("SafeExamBrowser.Service.Contracts")] -[assembly: AssemblyCopyright("Copyright © 2020 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("5167820f-2be5-43cf-b1cc-e4874bf83808")] - -// 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.Service.Contracts/SafeExamBrowser.Service.Contracts.csproj b/SafeExamBrowser.Service.Contracts/SafeExamBrowser.Service.Contracts.csproj deleted file mode 100644 index 7d91a250..00000000 --- a/SafeExamBrowser.Service.Contracts/SafeExamBrowser.Service.Contracts.csproj +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Debug - AnyCPU - {5167820F-2BE5-43CF-B1CC-E4874BF83808} - Library - Properties - SafeExamBrowser.Service.Contracts - SafeExamBrowser.Service.Contracts - v4.7.2 - 512 - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - \ No newline at end of file diff --git a/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj b/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj index b9ed0265..84661bb7 100644 --- a/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj +++ b/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj @@ -120,10 +120,6 @@ {64ea30fb-11d4-436a-9c2b-88566285363e} SafeExamBrowser.Logging.Contracts - - {5167820f-2be5-43cf-b1cc-e4874bf83808} - SafeExamBrowser.Service.Contracts - {fa3c6692-dfed-4afa-bd58-9a3da2753c78} SafeExamBrowser.Service diff --git a/SafeExamBrowser.Service/CompositionRoot.cs b/SafeExamBrowser.Service/CompositionRoot.cs index dfd9fbae..e7345bdf 100644 --- a/SafeExamBrowser.Service/CompositionRoot.cs +++ b/SafeExamBrowser.Service/CompositionRoot.cs @@ -22,7 +22,6 @@ 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; @@ -32,7 +31,7 @@ namespace SafeExamBrowser.Service { private ILogger logger; - internal IServiceController ServiceController { get; private set; } + internal ServiceController ServiceController { get; private set; } internal void BuildObjectGraph() { diff --git a/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj b/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj index 9d6fba89..0990b8b8 100644 --- a/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj +++ b/SafeExamBrowser.Service/SafeExamBrowser.Service.csproj @@ -121,10 +121,6 @@ {e107026c-2011-4552-a7d8-3a0d37881df6} SafeExamBrowser.Logging - - {5167820f-2be5-43cf-b1cc-e4874bf83808} - SafeExamBrowser.Service.Contracts - {30b2d907-5861-4f39-abad-c4abf1b3470e} SafeExamBrowser.Settings diff --git a/SafeExamBrowser.Service/ServiceController.cs b/SafeExamBrowser.Service/ServiceController.cs index 84943a1f..f0fe24f0 100644 --- a/SafeExamBrowser.Service/ServiceController.cs +++ b/SafeExamBrowser.Service/ServiceController.cs @@ -13,11 +13,10 @@ using SafeExamBrowser.Configuration.Contracts; using SafeExamBrowser.Core.Contracts.OperationModel; using SafeExamBrowser.Lockdown.Contracts; using SafeExamBrowser.Logging.Contracts; -using SafeExamBrowser.Service.Contracts; namespace SafeExamBrowser.Service { - internal class ServiceController : IServiceController + internal class ServiceController { private ILogger logger; private Func logWriterFactory; @@ -38,7 +37,7 @@ namespace SafeExamBrowser.Service get { return sessionContext.IsRunning; } } - public ServiceController( + internal ServiceController( ILogger logger, Func logWriterFactory, IOperationSequence bootstrapSequence, @@ -56,7 +55,7 @@ namespace SafeExamBrowser.Service this.systemConfigurationUpdate = systemConfigurationUpdate; } - public bool TryStart() + internal bool TryStart() { logger.Info("Initiating startup procedure..."); @@ -79,7 +78,7 @@ namespace SafeExamBrowser.Service return success; } - public void Terminate() + internal void Terminate() { DeregisterEvents(); diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln index e21d72db..fd76cfd1 100644 --- a/SafeExamBrowser.sln +++ b/SafeExamBrowser.sln @@ -92,10 +92,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Logging.Con EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Monitoring.Contracts", "SafeExamBrowser.Monitoring.Contracts\SafeExamBrowser.Monitoring.Contracts.csproj", "{6D563A30-366D-4C35-815B-2C9E6872278B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Runtime.Contracts", "SafeExamBrowser.Runtime.Contracts\SafeExamBrowser.Runtime.Contracts.csproj", "{5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Service.Contracts", "SafeExamBrowser.Service.Contracts\SafeExamBrowser.Service.Contracts.csproj", "{5167820F-2BE5-43CF-B1CC-E4874BF83808}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.SystemComponents.Contracts", "SafeExamBrowser.SystemComponents.Contracts\SafeExamBrowser.SystemComponents.Contracts.csproj", "{903129C6-E236-493B-9AD6-C6A57F647A3A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterface.Contracts", "SafeExamBrowser.UserInterface.Contracts\SafeExamBrowser.UserInterface.Contracts.csproj", "{C7889E97-6FF6-4A58-B7CB-521ED276B316}" @@ -405,22 +401,6 @@ Global {6D563A30-366D-4C35-815B-2C9E6872278B}.Release|x64.Build.0 = Release|x64 {6D563A30-366D-4C35-815B-2C9E6872278B}.Release|x86.ActiveCfg = Release|x86 {6D563A30-366D-4C35-815B-2C9E6872278B}.Release|x86.Build.0 = Release|x86 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Debug|x64.ActiveCfg = Debug|x64 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Debug|x64.Build.0 = Debug|x64 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Debug|x86.ActiveCfg = Debug|x86 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Debug|x86.Build.0 = Debug|x86 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Release|x64.ActiveCfg = Release|x64 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Release|x64.Build.0 = Release|x64 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Release|x86.ActiveCfg = Release|x86 - {5D0136B4-6D21-4F99-AE42-3FB7F478AE0A}.Release|x86.Build.0 = Release|x86 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Debug|x64.ActiveCfg = Debug|x64 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Debug|x64.Build.0 = Debug|x64 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Debug|x86.ActiveCfg = Debug|x86 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Debug|x86.Build.0 = Debug|x86 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Release|x64.ActiveCfg = Release|x64 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Release|x64.Build.0 = Release|x64 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Release|x86.ActiveCfg = Release|x86 - {5167820F-2BE5-43CF-B1CC-E4874BF83808}.Release|x86.Build.0 = Release|x86 {903129C6-E236-493B-9AD6-C6A57F647A3A}.Debug|x64.ActiveCfg = Debug|x64 {903129C6-E236-493B-9AD6-C6A57F647A3A}.Debug|x64.Build.0 = Debug|x64 {903129C6-E236-493B-9AD6-C6A57F647A3A}.Debug|x86.ActiveCfg = Debug|x86