zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-219:

Browse source 
- Extracted operations and notifications from core library and moved them to client resp. runtime component.
- Renamead runtime component to SafeExamBrowser.Runtime.
- Moved post-build event from browser to client assembly.
This commit is contained in:
dbuechel 2018-01-18 08:16:20 +01:00
parent 0b52095453
commit 31d6d544d0
58 changed files with 359 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj
View file

@ -101,7 +101,8 @@
<Import Project="..\packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets" Condition="Exists('..\packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets')" />
<Import Project="..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets')" />
<PropertyGroup>
<PostBuildEvent>xcopy /E /Y "$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)" "$(SolutionDir)SafeExamBrowser\bin\$(PlatformName)\$(ConfigurationName)"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets')" />
</Project>

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/BrowserOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/BrowserOperationTests.cs
View file

@ -8,14 +8,14 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Behaviour;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class BrowserOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/ClientControllerOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ClientControllerOperationTests.cs
View file

@ -8,12 +8,12 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Client;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class ClientControllerOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/ClipboardOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ClipboardOperationTests.cs
View file

@ -8,12 +8,12 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.WindowsApi;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class ClipboardOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/DisplayMonitorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/DisplayMonitorOperationTests.cs
View file

@ -8,13 +8,13 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class DisplayMonitorOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/KeyboardInterceptorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/KeyboardInterceptorOperationTests.cs
View file

@ -8,13 +8,13 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.WindowsApi;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class KeyboardInterceptorOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/MouseInterceptorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/MouseInterceptorOperationTests.cs
View file

@ -8,13 +8,13 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.WindowsApi;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class MouseInterceptorOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/ProcessMonitorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/ProcessMonitorOperationTests.cs
View file

@ -8,12 +8,12 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class ProcessMonitorOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/TaskbarOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/TaskbarOperationTests.cs
View file

@ -8,6 +8,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.Configuration.Settings;
using SafeExamBrowser.Contracts.I18n;
@ -15,9 +16,8 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.SystemComponents;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class TaskbarOperationTests

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/WindowMonitorOperationTests.cs → SafeExamBrowser.Client.UnitTests/Behaviour/Operations/WindowMonitorOperationTests.cs
View file

@ -8,12 +8,12 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour.Operations;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Core.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Client.UnitTests.Behaviour.Operations
{
[TestClass]
public class WindowMonitorOperationTests

1
SafeExamBrowser.Client.UnitTests/ClientControllerTests.cs
View file

@ -9,6 +9,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Behaviour;
using SafeExamBrowser.Contracts.Client;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;

4
SafeExamBrowser.Core.UnitTests/Notifications/AboutNotificationControllerTests.cs → SafeExamBrowser.Client.UnitTests/Notifications/AboutNotificationControllerTests.cs
View file

@ -8,12 +8,12 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Notifications;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Core.Notifications;
namespace SafeExamBrowser.Core.UnitTests.Notifications
namespace SafeExamBrowser.Client.UnitTests.Notifications
{
[TestClass]
public class AboutNotificationControllerTests

4
SafeExamBrowser.Core.UnitTests/Notifications/LogNotificationControllerTests.cs → SafeExamBrowser.Client.UnitTests/Notifications/LogNotificationControllerTests.cs
View file

@ -8,12 +8,12 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SafeExamBrowser.Client.Notifications;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Core.Notifications;
namespace SafeExamBrowser.Core.UnitTests.Notifications
namespace SafeExamBrowser.Client.UnitTests.Notifications
{
[TestClass]
public class LogNotificationControllerTests

2
SafeExamBrowser.Core.UnitTests/Notifications/NotificationButtonMock.cs → SafeExamBrowser.Client.UnitTests/Notifications/NotificationButtonMock.cs
View file

@ -8,7 +8,7 @@
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Core.UnitTests.Notifications
namespace SafeExamBrowser.Client.UnitTests.Notifications
{
class NotificationButtonMock : INotificationButton
{

12
SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj
View file

@ -78,6 +78,18 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\Operations\BrowserOperationTests.cs" />
<Compile Include="Behaviour\Operations\ClientControllerOperationTests.cs" />
<Compile Include="Behaviour\Operations\ClipboardOperationTests.cs" />
<Compile Include="Behaviour\Operations\DisplayMonitorOperationTests.cs" />
<Compile Include="Behaviour\Operations\KeyboardInterceptorOperationTests.cs" />
<Compile Include="Behaviour\Operations\MouseInterceptorOperationTests.cs" />
<Compile Include="Behaviour\Operations\ProcessMonitorOperationTests.cs" />
<Compile Include="Behaviour\Operations\TaskbarOperationTests.cs" />
<Compile Include="Behaviour\Operations\WindowMonitorOperationTests.cs" />
<Compile Include="Notifications\AboutNotificationControllerTests.cs" />
<Compile Include="Notifications\LogNotificationControllerTests.cs" />
<Compile Include="Notifications\NotificationButtonMock.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ClientControllerTests.cs" />
</ItemGroup>

4
SafeExamBrowser.Client/ClientController.cs → SafeExamBrowser.Client/Behaviour/ClientController.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Client
namespace SafeExamBrowser.Client.Behaviour
{
public class ClientController : IClientController
internal class ClientController : IClientController
{
private IDisplayMonitor displayMonitor;
private ILogger logger;

4
SafeExamBrowser.Core/Behaviour/Operations/BrowserOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/BrowserOperation.cs
View file

@ -13,9 +13,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class BrowserOperation : IOperation
internal class BrowserOperation : IOperation
{
private IApplicationController browserController;
private IApplicationInfo browserInfo;

4
SafeExamBrowser.Core/Behaviour/Operations/ClientControllerOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/ClientControllerOperation.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class ClientControllerOperation : IOperation
internal class ClientControllerOperation : IOperation
{
private ILogger logger;
private IClientController controller;

4
SafeExamBrowser.Core/Behaviour/Operations/ClipboardOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/ClipboardOperation.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.WindowsApi;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class ClipboardOperation : IOperation
internal class ClipboardOperation : IOperation
{
private ILogger logger;
private INativeMethods nativeMethods;

4
SafeExamBrowser.Core/Behaviour/Operations/DisplayMonitorOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/DisplayMonitorOperation.cs
View file

@ -13,9 +13,9 @@ using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class DisplayMonitorOperation : IOperation
internal class DisplayMonitorOperation : IOperation
{
private IDisplayMonitor displayMonitor;
private ILogger logger;

4
SafeExamBrowser.Core/Behaviour/Operations/KeyboardInterceptorOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/KeyboardInterceptorOperation.cs
View file

@ -13,9 +13,9 @@ using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.WindowsApi;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class KeyboardInterceptorOperation : IOperation
internal class KeyboardInterceptorOperation : IOperation
{
private IKeyboardInterceptor keyboardInterceptor;
private ILogger logger;

4
SafeExamBrowser.Core/Behaviour/Operations/MouseInterceptorOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/MouseInterceptorOperation.cs
View file

@ -13,9 +13,9 @@ using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.WindowsApi;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class MouseInterceptorOperation : IOperation
internal class MouseInterceptorOperation : IOperation
{
private ILogger logger;
private IMouseInterceptor mouseInterceptor;

4
SafeExamBrowser.Core/Behaviour/Operations/ProcessMonitorOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/ProcessMonitorOperation.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class ProcessMonitorOperation : IOperation
internal class ProcessMonitorOperation : IOperation
{
private ILogger logger;
private IProcessMonitor processMonitor;

6
SafeExamBrowser.Core/Behaviour/Operations/TaskbarOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/TaskbarOperation.cs
View file

@ -6,6 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
using SafeExamBrowser.Client.Notifications;
using SafeExamBrowser.Contracts.Behaviour;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.Configuration.Settings;
@ -14,11 +15,10 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.SystemComponents;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
using SafeExamBrowser.Core.Notifications;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class TaskbarOperation : IOperation
internal class TaskbarOperation : IOperation
{
private ILogger logger;
private INotificationController logController;

4
SafeExamBrowser.Core/Behaviour/Operations/WindowMonitorOperation.cs → SafeExamBrowser.Client/Behaviour/Operations/WindowMonitorOperation.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Monitoring;
using SafeExamBrowser.Contracts.UserInterface;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Client.Behaviour.Operations
{
public class WindowMonitorOperation : IOperation
internal class WindowMonitorOperation : IOperation
{
private ILogger logger;
private IWindowMonitor windowMonitor;

5
SafeExamBrowser.Core/Notifications/AboutNotificationController.cs → SafeExamBrowser.Client/Notifications/AboutNotificationController.cs
View file

@ -8,14 +8,13 @@
using SafeExamBrowser.Contracts.Behaviour;
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.Configuration.Settings;
using SafeExamBrowser.Contracts.I18n;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Core.Notifications
namespace SafeExamBrowser.Client.Notifications
{
public class AboutNotificationController : INotificationController
internal class AboutNotificationController : INotificationController
{
private INotificationButton notification;
private IRuntimeInfo runtimeInfo;

4
SafeExamBrowser.Core/Notifications/AboutNotificationIconResource.cs → SafeExamBrowser.Client/Notifications/AboutNotificationIconResource.cs
View file

@ -9,9 +9,9 @@
using System;
using SafeExamBrowser.Contracts.Configuration;
namespace SafeExamBrowser.Core.Notifications
namespace SafeExamBrowser.Client.Notifications
{
public class AboutNotificationIconResource : IIconResource
internal class AboutNotificationIconResource : IIconResource
{
public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser;component/SafeExamBrowser.ico");
public bool IsBitmapResource => true;

4
SafeExamBrowser.Core/Notifications/AboutNotificationInfo.cs → SafeExamBrowser.Client/Notifications/AboutNotificationInfo.cs
View file

@ -9,9 +9,9 @@
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
namespace SafeExamBrowser.Core.Notifications
namespace SafeExamBrowser.Client.Notifications
{
public class AboutNotificationInfo : INotificationInfo
internal class AboutNotificationInfo : INotificationInfo
{
private IText text;

4
SafeExamBrowser.Core/Notifications/LogNotificationController.cs → SafeExamBrowser.Client/Notifications/LogNotificationController.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Contracts.UserInterface.Taskbar;
namespace SafeExamBrowser.Core.Notifications
namespace SafeExamBrowser.Client.Notifications
{
public class LogNotificationController : INotificationController
internal class LogNotificationController : INotificationController
{
private INotificationButton notification;
private ILogger logger;

4
SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs → SafeExamBrowser.Client/Notifications/LogNotificationIconResource.cs
View file

@ -9,9 +9,9 @@
using System;
using SafeExamBrowser.Contracts.Configuration;
namespace SafeExamBrowser.Core.Notifications
namespace SafeExamBrowser.Client.Notifications
{
class LogNotificationIconResource : IIconResource
internal class LogNotificationIconResource : IIconResource
{
public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Classic;component/Images/LogNotification.ico");
public bool IsBitmapResource => true;

4
SafeExamBrowser.Core/Notifications/LogNotificationInfo.cs → SafeExamBrowser.Client/Notifications/LogNotificationInfo.cs
View file

@ -9,9 +9,9 @@
using SafeExamBrowser.Contracts.Configuration;
using SafeExamBrowser.Contracts.I18n;
namespace SafeExamBrowser.Core.Notifications
namespace SafeExamBrowser.Client.Notifications
{
class LogNotificationInfo : INotificationInfo
internal class LogNotificationInfo : INotificationInfo
{
private IText text;

2
SafeExamBrowser.Client/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
@ -15,6 +16,7 @@ using System.Windows;
// 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)]
[assembly: InternalsVisibleTo("SafeExamBrowser.Client.UnitTests")]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file

20
SafeExamBrowser.Client/SafeExamBrowser.Client.csproj
View file

@ -69,8 +69,23 @@
</ItemGroup>
<ItemGroup>
<Compile Include="App.cs" />
<Compile Include="ClientController.cs" />
<Compile Include="Behaviour\ClientController.cs" />
<Compile Include="CompositionRoot.cs" />
<Compile Include="Notifications\AboutNotificationController.cs" />
<Compile Include="Notifications\AboutNotificationIconResource.cs" />
<Compile Include="Notifications\AboutNotificationInfo.cs" />
<Compile Include="Notifications\LogNotificationController.cs" />
<Compile Include="Notifications\LogNotificationIconResource.cs" />
<Compile Include="Notifications\LogNotificationInfo.cs" />
<Compile Include="Behaviour\Operations\BrowserOperation.cs" />
<Compile Include="Behaviour\Operations\ClientControllerOperation.cs" />
<Compile Include="Behaviour\Operations\ClipboardOperation.cs" />
<Compile Include="Behaviour\Operations\DisplayMonitorOperation.cs" />
<Compile Include="Behaviour\Operations\KeyboardInterceptorOperation.cs" />
<Compile Include="Behaviour\Operations\MouseInterceptorOperation.cs" />
<Compile Include="Behaviour\Operations\ProcessMonitorOperation.cs" />
<Compile Include="Behaviour\Operations\TaskbarOperation.cs" />
<Compile Include="Behaviour\Operations\WindowMonitorOperation.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
@ -132,4 +147,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /E /Y "$(SolutionDir)SafeExamBrowser.Browser\bin\$(PlatformName)\$(ConfigurationName)" "$(ProjectDir)bin\$(PlatformName)\$(ConfigurationName)"</PostBuildEvent>
</PropertyGroup>
</Project>

13
SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj
View file

@ -78,17 +78,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\Operations\BrowserOperationTests.cs" />
<Compile Include="Behaviour\Operations\ClipboardOperationTests.cs" />
<Compile Include="Behaviour\Operations\DisplayMonitorOperationTests.cs" />
<Compile Include="Behaviour\Operations\I18nOperationTests.cs" />
<Compile Include="Behaviour\Operations\KeyboardInterceptorOperationTests.cs" />
<Compile Include="Behaviour\Operations\MouseInterceptorOperationTests.cs" />
<Compile Include="Behaviour\Operations\ProcessMonitorOperationTests.cs" />
<Compile Include="Behaviour\Operations\ClientControllerOperationTests.cs" />
<Compile Include="Behaviour\Operations\RuntimeControllerOperationTests.cs" />
<Compile Include="Behaviour\Operations\TaskbarOperationTests.cs" />
<Compile Include="Behaviour\Operations\WindowMonitorOperationTests.cs" />
<Compile Include="Behaviour\StartupControllerTests.cs" />
<Compile Include="Behaviour\ShutdownControllerTests.cs" />
<Compile Include="I18n\TextTests.cs" />
@ -97,9 +87,6 @@
<Compile Include="Logging\LoggerTests.cs" />
<Compile Include="Logging\ModuleLoggerTests.cs" />
<Compile Include="Logging\NewLogContentType.cs" />
<Compile Include="Notifications\AboutNotificationControllerTests.cs" />
<Compile Include="Notifications\LogNotificationControllerTests.cs" />
<Compile Include="Notifications\NotificationButtonMock.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>

16
SafeExamBrowser.Core/SafeExamBrowser.Core.csproj
View file

@ -54,17 +54,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\Operations\ClientControllerOperation.cs" />
<Compile Include="Behaviour\Operations\ClipboardOperation.cs" />
<Compile Include="Behaviour\Operations\I18nOperation.cs" />
<Compile Include="Behaviour\Operations\KeyboardInterceptorOperation.cs" />
<Compile Include="Behaviour\Operations\MouseInterceptorOperation.cs" />
<Compile Include="Behaviour\Operations\BrowserOperation.cs" />
<Compile Include="Behaviour\Operations\RuntimeControllerOperation.cs" />
<Compile Include="Behaviour\Operations\ProcessMonitorOperation.cs" />
<Compile Include="Behaviour\Operations\TaskbarOperation.cs" />
<Compile Include="Behaviour\Operations\WindowMonitorOperation.cs" />
<Compile Include="Behaviour\Operations\DisplayMonitorOperation.cs" />
<Compile Include="Behaviour\ShutdownController.cs" />
<Compile Include="Behaviour\StartupController.cs" />
<Compile Include="Logging\DefaultLogFormatter.cs" />
@ -76,12 +66,6 @@
<Compile Include="Logging\LogText.cs" />
<Compile Include="Logging\ModuleLogger.cs" />
<Compile Include="Logging\ThreadInfo.cs" />
<Compile Include="Notifications\AboutNotificationController.cs" />
<Compile Include="Notifications\AboutNotificationIconResource.cs" />
<Compile Include="Notifications\AboutNotificationInfo.cs" />
<Compile Include="Notifications\LogNotificationController.cs" />
<Compile Include="Notifications\LogNotificationIconResource.cs" />
<Compile Include="Notifications\LogNotificationInfo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>

4
SafeExamBrowser.Core.UnitTests/Behaviour/Operations/RuntimeControllerOperationTests.cs → SafeExamBrowser.Runtime.UnitTests/Behaviour/Operations/RuntimeControllerOperationTests.cs
View file

@ -11,9 +11,9 @@ using Moq;
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Runtime;
using SafeExamBrowser.Contracts.UserInterface;
using SafeExamBrowser.Core.Behaviour.Operations;
using SafeExamBrowser.Runtime.Behaviour.Operations;
namespace SafeExamBrowser.Core.UnitTests.Behaviour.Operations
namespace SafeExamBrowser.Runtime.UnitTests.Behaviour.Operations
{
[TestClass]
public class RuntimeControllerOperationTests

16
SafeExamBrowser.Runtime.UnitTests/Properties/AssemblyInfo.cs Normal file
View file

@ -0,0 +1,16 @@
using System.Reflection;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("SafeExamBrowser.Runtime.UnitTests")]
[assembly: AssemblyDescription("Safe Exam Browser")]
[assembly: AssemblyCompany("ETH Zürich")]
[assembly: AssemblyProduct("SafeExamBrowser.Runtime.UnitTests")]
[assembly: AssemblyCopyright("Copyright © 2018 ETH Zürich, Educational Development and Technology (LET)")]
[assembly: ComVisible(false)]
[assembly: Guid("b716a8b2-df72-4143-9941-25e033089f5f")]
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

110
SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj Normal file
View file

@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B716A8B2-DF72-4143-9941-25E033089F5F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SafeExamBrowser.Runtime.UnitTests</RootNamespace>
<AssemblyName>SafeExamBrowser.Runtime.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.8.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.8.1\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Behaviour\Operations\RuntimeControllerOperationTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Contracts\SafeExamBrowser.Contracts.csproj">
<Project>{47DA5933-BEF8-4729-94E6-ABDE2DB12262}</Project>
<Name>SafeExamBrowser.Contracts</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj">
<Project>{e3aed2f8-b5df-45d1-ac19-48066923d6d8}</Project>
<Name>SafeExamBrowser.Runtime</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
</Project>

11
SafeExamBrowser.Runtime.UnitTests/app.config Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

9
SafeExamBrowser.Runtime.UnitTests/packages.config Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
<package id="Moq" version="4.8.1" targetFramework="net461" />
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net461" />
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.4.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
</packages>

0
SafeExamBrowser/App.config → SafeExamBrowser.Runtime/App.config
View file

2
SafeExamBrowser/App.cs → SafeExamBrowser.Runtime/App.cs
View file

@ -14,7 +14,7 @@ using System.Threading;
using System.Windows;
using SafeExamBrowser.Contracts.Behaviour;
namespace SafeExamBrowser
namespace SafeExamBrowser.Runtime
{
public class App : Application
{

4
SafeExamBrowser.Core/Behaviour/Operations/RuntimeControllerOperation.cs → SafeExamBrowser.Runtime/Behaviour/Operations/RuntimeControllerOperation.cs
View file

@ -12,9 +12,9 @@ using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Runtime;
using SafeExamBrowser.Contracts.UserInterface;
namespace SafeExamBrowser.Core.Behaviour.Operations
namespace SafeExamBrowser.Runtime.Behaviour.Operations
{
public class RuntimeControllerOperation : IOperation
internal class RuntimeControllerOperation : IOperation
{
private ILogger logger;
private IRuntimeController controller;

4
SafeExamBrowser/RuntimeController.cs → SafeExamBrowser.Runtime/Behaviour/RuntimeController.cs
View file

@ -9,9 +9,9 @@
using SafeExamBrowser.Contracts.Logging;
using SafeExamBrowser.Contracts.Runtime;
namespace SafeExamBrowser
namespace SafeExamBrowser.Runtime.Behaviour
{
public class RuntimeController : IRuntimeController
internal class RuntimeController : IRuntimeController
{
private ILogger logger;

4
SafeExamBrowser/CompositionRoot.cs → SafeExamBrowser.Runtime/CompositionRoot.cs
View file

@ -19,10 +19,12 @@ using SafeExamBrowser.Core.Behaviour;
using SafeExamBrowser.Core.Behaviour.Operations;
using SafeExamBrowser.Core.I18n;
using SafeExamBrowser.Core.Logging;
using SafeExamBrowser.Runtime.Behaviour;
using SafeExamBrowser.Runtime.Behaviour.Operations;
using SafeExamBrowser.UserInterface.Classic;
using SafeExamBrowser.WindowsApi;
namespace SafeExamBrowser
namespace SafeExamBrowser.Runtime
{
internal class CompositionRoot
{

2
SafeExamBrowser/Properties/AssemblyInfo.cs → SafeExamBrowser.Runtime/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
@ -15,6 +16,7 @@ using System.Windows;
// 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)]
[assembly: InternalsVisibleTo("SafeExamBrowser.Runtime.UnitTests")]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file

63
SafeExamBrowser.Runtime/Properties/Resources.Designer.cs generated Normal file
View file

@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SafeExamBrowser.Runtime.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.Runtime.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}

0
SafeExamBrowser/Properties/Resources.resx → SafeExamBrowser.Runtime/Properties/Resources.resx
View file

26
SafeExamBrowser.Runtime/Properties/Settings.Designer.cs generated Normal file
View file

@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SafeExamBrowser.Runtime.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
}
}

0
SafeExamBrowser/Properties/Settings.settings → SafeExamBrowser.Runtime/Properties/Settings.settings
View file

20
SafeExamBrowser/SafeExamBrowser.csproj → SafeExamBrowser.Runtime/SafeExamBrowser.Runtime.csproj
View file

@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{E3AED2F8-B5DF-45D1-AC19-48066923D6D8}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>SafeExamBrowser</RootNamespace>
<RootNamespace>SafeExamBrowser.Runtime</RootNamespace>
<AssemblyName>SafeExamBrowser</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
@ -49,7 +49,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject>SafeExamBrowser.App</StartupObject>
<StartupObject>SafeExamBrowser.Runtime.App</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>SafeExamBrowser.ico</ApplicationIcon>
@ -87,6 +87,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="App.cs" />
<Compile Include="Behaviour\Operations\RuntimeControllerOperation.cs" />
<Compile Include="CompositionRoot.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
@ -101,7 +102,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="RuntimeController.cs" />
<Compile Include="Behaviour\RuntimeController.cs" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@ -117,10 +118,6 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SafeExamBrowser.Browser\SafeExamBrowser.Browser.csproj">
<Project>{04E653F1-98E6-4E34-9DD7-7F2BC1A8B767}</Project>
<Name>SafeExamBrowser.Browser</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Configuration\SafeExamBrowser.Configuration.csproj">
<Project>{c388c4dd-a159-457d-af92-89f7ad185109}</Project>
<Name>SafeExamBrowser.Configuration</Name>
@ -133,14 +130,6 @@
<Project>{3d6fdbb6-a4af-4626-bb2b-bf329d44f9cc}</Project>
<Name>SafeExamBrowser.Core</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.Monitoring\SafeExamBrowser.Monitoring.csproj">
<Project>{ef563531-4eb5-44b9-a5ec-d6d6f204469b}</Project>
<Name>SafeExamBrowser.Monitoring</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.SystemComponents\SafeExamBrowser.SystemComponents.csproj">
<Project>{ACEE2EF1-14D2-4B52-8994-5C053055BB51}</Project>
<Name>SafeExamBrowser.SystemComponents</Name>
</ProjectReference>
<ProjectReference Include="..\SafeExamBrowser.UserInterface.Classic\SafeExamBrowser.UserInterface.Classic.csproj">
<Project>{a502df54-7169-4647-94bd-18b192924866}</Project>
<Name>SafeExamBrowser.UserInterface.Classic</Name>
@ -165,5 +154,6 @@
<ItemGroup>
<Resource Include="SafeExamBrowser.ico" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

0
SafeExamBrowser/SafeExamBrowser.ico → SafeExamBrowser.Runtime/SafeExamBrowser.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 361 KiB

0
SafeExamBrowser/app.manifest → SafeExamBrowser.Runtime/app.manifest
View file

0
SafeExamBrowser/packages.config → SafeExamBrowser.Runtime/packages.config
View file

14
SafeExamBrowser.sln
View file

@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2020
VisualStudioVersion = 15.0.27130.2024
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser", "SafeExamBrowser\SafeExamBrowser.csproj", "{E3AED2F8-B5DF-45D1-AC19-48066923D6D8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Runtime", "SafeExamBrowser.Runtime\SafeExamBrowser.Runtime.csproj", "{E3AED2F8-B5DF-45D1-AC19-48066923D6D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Core", "SafeExamBrowser.Core\SafeExamBrowser.Core.csproj", "{3D6FDBB6-A4AF-4626-BB2B-BF329D44F9CC}"
EndProject
@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Client", "S
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Client.UnitTests", "SafeExamBrowser.Client.UnitTests\SafeExamBrowser.Client.UnitTests.csproj", "{15684416-FADF-4C51-85DE-4F343BFAB752}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Runtime.UnitTests", "SafeExamBrowser.Runtime.UnitTests\SafeExamBrowser.Runtime.UnitTests.csproj", "{B716A8B2-DF72-4143-9941-25E033089F5F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -151,6 +153,14 @@ Global
{15684416-FADF-4C51-85DE-4F343BFAB752}.Release|Any CPU.Build.0 = Release|Any CPU
{15684416-FADF-4C51-85DE-4F343BFAB752}.Release|x86.ActiveCfg = Release|Any CPU
{15684416-FADF-4C51-85DE-4F343BFAB752}.Release|x86.Build.0 = Release|Any CPU
{B716A8B2-DF72-4143-9941-25E033089F5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B716A8B2-DF72-4143-9941-25E033089F5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B716A8B2-DF72-4143-9941-25E033089F5F}.Debug|x86.ActiveCfg = Debug|x86
{B716A8B2-DF72-4143-9941-25E033089F5F}.Debug|x86.Build.0 = Debug|x86
{B716A8B2-DF72-4143-9941-25E033089F5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B716A8B2-DF72-4143-9941-25E033089F5F}.Release|Any CPU.Build.0 = Release|Any CPU
{B716A8B2-DF72-4143-9941-25E033089F5F}.Release|x86.ActiveCfg = Release|Any CPU
{B716A8B2-DF72-4143-9941-25E033089F5F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

71
SafeExamBrowser/Properties/Resources.Designer.cs generated
View file

@ -1,71 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SafeExamBrowser.Properties
{
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}

30
SafeExamBrowser/Properties/Settings.Designer.cs generated
View file

@ -1,30 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SafeExamBrowser.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}

5
appveyor.yml
View file

@ -5,8 +5,9 @@ before_build:
build_script:
- msbuild /verbosity:quiet "SafeExamBrowser.sln"
test_script:
- .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Core.UnitTests\bin\x86\Debug\SafeExamBrowser.Core.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -output:"coverage.xml"
- .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Client.UnitTests\bin\x86\Debug\SafeExamBrowser.Client.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
- .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Client.UnitTests\bin\x86\Debug\SafeExamBrowser.Client.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -output:"coverage.xml"
- .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Core.UnitTests\bin\x86\Debug\SafeExamBrowser.Core.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
- .\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Runtime.UnitTests\bin\x86\Debug\SafeExamBrowser.Runtime.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]*" -mergebyhash -mergeoutput -output:"coverage.xml"
after_test:
- "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
- pip install codecov