diff --git a/SafeExamBrowser.Browser.UnitTests/SafeExamBrowser.Browser.UnitTests.csproj b/SafeExamBrowser.Browser.UnitTests/SafeExamBrowser.Browser.UnitTests.csproj index 57123257..38363820 100644 --- a/SafeExamBrowser.Browser.UnitTests/SafeExamBrowser.Browser.UnitTests.csproj +++ b/SafeExamBrowser.Browser.UnitTests/SafeExamBrowser.Browser.UnitTests.csproj @@ -1,9 +1,9 @@  - - - - + + + + Debug @@ -64,17 +64,17 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - - ..\packages\CefSharp.Common.95.7.141\lib\net452\CefSharp.dll + + ..\packages\CefSharp.Common.96.0.142\lib\net452\CefSharp.dll - - ..\packages\CefSharp.Common.95.7.141\lib\net452\CefSharp.Core.dll + + ..\packages\CefSharp.Common.96.0.142\lib\net452\CefSharp.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -82,8 +82,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -150,13 +150,13 @@ 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}. - - - - - - + + + + + + - - + + \ No newline at end of file diff --git a/SafeExamBrowser.Browser.UnitTests/app.config b/SafeExamBrowser.Browser.UnitTests/app.config index fd374e53..746f5f6b 100644 --- a/SafeExamBrowser.Browser.UnitTests/app.config +++ b/SafeExamBrowser.Browser.UnitTests/app.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + diff --git a/SafeExamBrowser.Browser.UnitTests/packages.config b/SafeExamBrowser.Browser.UnitTests/packages.config index b8a1fa06..7b49e9ed 100644 --- a/SafeExamBrowser.Browser.UnitTests/packages.config +++ b/SafeExamBrowser.Browser.UnitTests/packages.config @@ -1,12 +1,12 @@  - - - + + + - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs index a8c14895..1719e9b1 100644 --- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs +++ b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs @@ -134,8 +134,6 @@ namespace SafeExamBrowser.Browser var downloadHandler = new DownloadHandler(appConfig, downloadLogger, settings, WindowSettings); var keyboardHandler = new KeyboardHandler(); var lifeSpanHandler = new LifeSpanHandler(); - var renderProcessMessageLogger = logger.CloneFor($"{nameof(RenderProcessMessageHandler)} #{Id}"); - var renderProcessMessageHandler = new RenderProcessMessageHandler(appConfig, renderProcessMessageLogger, keyGenerator, text); var requestFilter = new RequestFilter(); var requestLogger = logger.CloneFor($"{nameof(RequestHandler)} #{Id}"); var resourceHandler = new ResourceHandler(appConfig, requestFilter, keyGenerator, logger, settings, WindowSettings, text); @@ -162,14 +160,16 @@ namespace SafeExamBrowser.Browser InitializeRequestFilter(requestFilter); control = new BrowserControl( + appConfig, contextMenuHandler, dialogHandler, displayHandler, downloadHandler, + keyGenerator, keyboardHandler, lifeSpanHandler, - renderProcessMessageHandler, requestHandler, + text, startUrl); control.AddressChanged += Control_AddressChanged; control.LoadFailed += Control_LoadFailed; diff --git a/SafeExamBrowser.Browser/BrowserControl.cs b/SafeExamBrowser.Browser/BrowserControl.cs index cb14d3cf..6aaa4fa2 100644 --- a/SafeExamBrowser.Browser/BrowserControl.cs +++ b/SafeExamBrowser.Browser/BrowserControl.cs @@ -9,6 +9,10 @@ using System; using CefSharp; using CefSharp.WinForms; +using SafeExamBrowser.Browser.Content; +using SafeExamBrowser.Configuration.Contracts; +using SafeExamBrowser.Configuration.Contracts.Cryptography; +using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.UserInterface.Contracts.Browser; using SafeExamBrowser.UserInterface.Contracts.Browser.Events; @@ -16,14 +20,17 @@ namespace SafeExamBrowser.Browser { internal class BrowserControl : ChromiumWebBrowser, IBrowserControl { + private readonly AppConfig appConfig; + private readonly ContentLoader contentLoader; private readonly IContextMenuHandler contextMenuHandler; private readonly IDialogHandler dialogHandler; private readonly IDisplayHandler displayHandler; private readonly IDownloadHandler downloadHandler; + private readonly IKeyGenerator generator; private readonly IKeyboardHandler keyboardHandler; private readonly ILifeSpanHandler lifeSpanHandler; - private readonly IRenderProcessMessageHandler renderProcessMessageHandler; private readonly IRequestHandler requestHandler; + private readonly IText text; private AddressChangedEventHandler addressChanged; private LoadFailedEventHandler loadFailed; @@ -58,24 +65,29 @@ namespace SafeExamBrowser.Browser } public BrowserControl( + AppConfig appConfig, IContextMenuHandler contextMenuHandler, IDialogHandler dialogHandler, IDisplayHandler displayHandler, IDownloadHandler downloadHandler, + IKeyGenerator generator, IKeyboardHandler keyboardHandler, ILifeSpanHandler lifeSpanHandler, - IRenderProcessMessageHandler renderProcessMessageHandler, IRequestHandler requestHandler, + IText text, string url) : base(url) { + this.appConfig = appConfig; + this.contentLoader = new ContentLoader(text); this.contextMenuHandler = contextMenuHandler; this.dialogHandler = dialogHandler; this.displayHandler = displayHandler; this.downloadHandler = downloadHandler; + this.generator = generator; this.keyboardHandler = keyboardHandler; this.lifeSpanHandler = lifeSpanHandler; - this.renderProcessMessageHandler = renderProcessMessageHandler; this.requestHandler = requestHandler; + this.text = text; } public void Destroy() @@ -89,6 +101,7 @@ namespace SafeExamBrowser.Browser public void Initialize() { AddressChanged += (o, args) => addressChanged?.Invoke(args.Address); + FrameLoadStart += BrowserControl_FrameLoadStart; IsBrowserInitializedChanged += BrowserControl_IsBrowserInitializedChanged; LoadError += BrowserControl_LoadError; LoadingStateChanged += (o, args) => loadingStateChanged?.Invoke(args.IsLoading); @@ -100,10 +113,18 @@ namespace SafeExamBrowser.Browser KeyboardHandler = keyboardHandler; LifeSpanHandler = lifeSpanHandler; MenuHandler = contextMenuHandler; - RenderProcessMessageHandler = renderProcessMessageHandler; RequestHandler = requestHandler; } + private void BrowserControl_FrameLoadStart(object sender, FrameLoadStartEventArgs e) + { + var browserExamKey = generator.CalculateBrowserExamKeyHash(e.Url); + var configurationKey = generator.CalculateConfigurationKeyHash(e.Url); + var api = contentLoader.LoadApi(browserExamKey, configurationKey, appConfig.ProgramBuildVersion); + + e.Frame.ExecuteJavaScriptAsync(api); + } + public void Find(string term, bool isInitial, bool caseSensitive, bool forward = true) { this.Find(0, term, forward, caseSensitive, !isInitial); diff --git a/SafeExamBrowser.Browser/Handlers/RenderProcessMessageHandler.cs b/SafeExamBrowser.Browser/Handlers/RenderProcessMessageHandler.cs deleted file mode 100644 index 583c01e4..00000000 --- a/SafeExamBrowser.Browser/Handlers/RenderProcessMessageHandler.cs +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2021 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/. - */ - -using CefSharp; -using SafeExamBrowser.Browser.Content; -using SafeExamBrowser.Configuration.Contracts; -using SafeExamBrowser.Configuration.Contracts.Cryptography; -using SafeExamBrowser.I18n.Contracts; -using SafeExamBrowser.Logging.Contracts; - -namespace SafeExamBrowser.Browser.Handlers -{ - internal class RenderProcessMessageHandler : IRenderProcessMessageHandler - { - private readonly AppConfig appConfig; - private readonly ContentLoader contentLoader; - private readonly ILogger logger; - private readonly IKeyGenerator generator; - - internal RenderProcessMessageHandler(AppConfig appConfig, ILogger logger, IKeyGenerator generator, IText text) - { - this.appConfig = appConfig; - this.contentLoader = new ContentLoader(text); - this.logger = logger; - this.generator = generator; - } - - public void OnContextCreated(IWebBrowser webBrowser, IBrowser browser, IFrame frame) - { - var browserExamKey = generator.CalculateBrowserExamKeyHash(webBrowser.Address); - var configurationKey = generator.CalculateConfigurationKeyHash(webBrowser.Address); - var api = contentLoader.LoadApi(browserExamKey, configurationKey, appConfig.ProgramBuildVersion); - - frame.ExecuteJavaScriptAsync(api); - } - - public void OnContextReleased(IWebBrowser webBrowser, IBrowser browser, IFrame frame) - { - } - - public void OnFocusedNodeChanged(IWebBrowser webBrowser, IBrowser browser, IFrame frame, IDomNode node) - { - } - - public void OnUncaughtException(IWebBrowser webBrowser, IBrowser browser, IFrame frame, JavascriptException exception) - { - } - } -} diff --git a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj index 9f5b158b..c12f868a 100644 --- a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj +++ b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj @@ -1,8 +1,8 @@  - - - + + + Debug @@ -53,14 +53,14 @@ prompt - - ..\packages\CefSharp.Common.95.7.141\lib\net452\CefSharp.dll + + ..\packages\CefSharp.Common.96.0.142\lib\net452\CefSharp.dll - - ..\packages\CefSharp.Common.95.7.141\lib\net452\CefSharp.Core.dll + + ..\packages\CefSharp.Common.96.0.142\lib\net452\CefSharp.Core.dll - - ..\packages\CefSharp.WinForms.95.7.141\lib\net462\CefSharp.WinForms.dll + + ..\packages\CefSharp.WinForms.96.0.142\lib\net462\CefSharp.WinForms.dll ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -104,7 +104,6 @@ - @@ -173,10 +172,10 @@ 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}. - - - - + + + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Browser/packages.config b/SafeExamBrowser.Browser/packages.config index 357fc88d..d0b17c90 100644 --- a/SafeExamBrowser.Browser/packages.config +++ b/SafeExamBrowser.Browser/packages.config @@ -1,9 +1,9 @@  - - - - + + + + diff --git a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj index aad0783c..bfb0786a 100644 --- a/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj +++ b/SafeExamBrowser.Client.UnitTests/SafeExamBrowser.Client.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -61,10 +61,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -76,11 +76,11 @@ True True - - ..\packages\System.IO.Packaging.5.0.0\lib\net46\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.6.0.0\lib\net461\System.IO.Packaging.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -194,8 +194,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Client.UnitTests/app.config b/SafeExamBrowser.Client.UnitTests/app.config index 266e7160..e4bd4e93 100644 --- a/SafeExamBrowser.Client.UnitTests/app.config +++ b/SafeExamBrowser.Client.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.Client.UnitTests/packages.config b/SafeExamBrowser.Client.UnitTests/packages.config index 69cc6ab5..003e28fd 100644 --- a/SafeExamBrowser.Client.UnitTests/packages.config +++ b/SafeExamBrowser.Client.UnitTests/packages.config @@ -2,11 +2,11 @@ - - + + - - + + \ No newline at end of file diff --git a/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj b/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj index 5504c13f..57f77879 100644 --- a/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj +++ b/SafeExamBrowser.Communication.UnitTests/SafeExamBrowser.Communication.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -63,10 +63,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -74,8 +74,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -96,7 +96,9 @@ - + + Designer + Designer @@ -125,8 +127,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Communication.UnitTests/app.config b/SafeExamBrowser.Communication.UnitTests/app.config index 472f79ce..7c2797ce 100644 --- a/SafeExamBrowser.Communication.UnitTests/app.config +++ b/SafeExamBrowser.Communication.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.Communication.UnitTests/packages.config b/SafeExamBrowser.Communication.UnitTests/packages.config index f529cfe2..2b50560d 100644 --- a/SafeExamBrowser.Communication.UnitTests/packages.config +++ b/SafeExamBrowser.Communication.UnitTests/packages.config @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj b/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj index 5dd896fa..8eb766f4 100644 --- a/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj +++ b/SafeExamBrowser.Configuration.UnitTests/SafeExamBrowser.Configuration.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -63,10 +63,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -74,8 +74,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -143,8 +143,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Configuration.UnitTests/app.config b/SafeExamBrowser.Configuration.UnitTests/app.config index 472f79ce..7c2797ce 100644 --- a/SafeExamBrowser.Configuration.UnitTests/app.config +++ b/SafeExamBrowser.Configuration.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.Configuration.UnitTests/packages.config b/SafeExamBrowser.Configuration.UnitTests/packages.config index f529cfe2..2b50560d 100644 --- a/SafeExamBrowser.Configuration.UnitTests/packages.config +++ b/SafeExamBrowser.Configuration.UnitTests/packages.config @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj b/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj index 27b604b8..0b72ff92 100644 --- a/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj +++ b/SafeExamBrowser.Core.UnitTests/SafeExamBrowser.Core.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -61,18 +61,18 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -133,8 +133,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Core.UnitTests/app.config b/SafeExamBrowser.Core.UnitTests/app.config index 472f79ce..7c2797ce 100644 --- a/SafeExamBrowser.Core.UnitTests/app.config +++ b/SafeExamBrowser.Core.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.Core.UnitTests/packages.config b/SafeExamBrowser.Core.UnitTests/packages.config index f529cfe2..2b50560d 100644 --- a/SafeExamBrowser.Core.UnitTests/packages.config +++ b/SafeExamBrowser.Core.UnitTests/packages.config @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj b/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj index fbf31158..564656ad 100644 --- a/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj +++ b/SafeExamBrowser.I18n.UnitTests/SafeExamBrowser.I18n.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -63,10 +63,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -74,8 +74,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -129,8 +129,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.I18n.UnitTests/app.config b/SafeExamBrowser.I18n.UnitTests/app.config index 472f79ce..7c2797ce 100644 --- a/SafeExamBrowser.I18n.UnitTests/app.config +++ b/SafeExamBrowser.I18n.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.I18n.UnitTests/packages.config b/SafeExamBrowser.I18n.UnitTests/packages.config index f529cfe2..2b50560d 100644 --- a/SafeExamBrowser.I18n.UnitTests/packages.config +++ b/SafeExamBrowser.I18n.UnitTests/packages.config @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.Lockdown.UnitTests/SafeExamBrowser.Lockdown.UnitTests.csproj b/SafeExamBrowser.Lockdown.UnitTests/SafeExamBrowser.Lockdown.UnitTests.csproj index c9a433a0..8f4e243b 100644 --- a/SafeExamBrowser.Lockdown.UnitTests/SafeExamBrowser.Lockdown.UnitTests.csproj +++ b/SafeExamBrowser.Lockdown.UnitTests/SafeExamBrowser.Lockdown.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -62,10 +62,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -73,8 +73,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -111,8 +111,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Lockdown.UnitTests/app.config b/SafeExamBrowser.Lockdown.UnitTests/app.config index fe205877..2833cc44 100644 --- a/SafeExamBrowser.Lockdown.UnitTests/app.config +++ b/SafeExamBrowser.Lockdown.UnitTests/app.config @@ -8,7 +8,7 @@ - + diff --git a/SafeExamBrowser.Lockdown.UnitTests/packages.config b/SafeExamBrowser.Lockdown.UnitTests/packages.config index 04f0d080..14e803d7 100644 --- a/SafeExamBrowser.Lockdown.UnitTests/packages.config +++ b/SafeExamBrowser.Lockdown.UnitTests/packages.config @@ -2,8 +2,8 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj b/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj index d772f1de..00b66b62 100644 --- a/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj +++ b/SafeExamBrowser.Logging.UnitTests/SafeExamBrowser.Logging.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -63,10 +63,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -74,8 +74,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -95,7 +95,9 @@ Designer - + + Designer + @@ -117,8 +119,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Logging.UnitTests/app.config b/SafeExamBrowser.Logging.UnitTests/app.config index 472f79ce..7c2797ce 100644 --- a/SafeExamBrowser.Logging.UnitTests/app.config +++ b/SafeExamBrowser.Logging.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.Logging.UnitTests/packages.config b/SafeExamBrowser.Logging.UnitTests/packages.config index f529cfe2..2b50560d 100644 --- a/SafeExamBrowser.Logging.UnitTests/packages.config +++ b/SafeExamBrowser.Logging.UnitTests/packages.config @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj b/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj index 6be1c36f..da1b8689 100644 --- a/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj +++ b/SafeExamBrowser.Proctoring/SafeExamBrowser.Proctoring.csproj @@ -52,14 +52,14 @@ MinimumRecommendedRules.ruleset - - ..\packages\Microsoft.Web.WebView2.1.0.1020.30\lib\net45\Microsoft.Web.WebView2.Core.dll + + ..\packages\Microsoft.Web.WebView2.1.0.1054.31\lib\net45\Microsoft.Web.WebView2.Core.dll - - ..\packages\Microsoft.Web.WebView2.1.0.1020.30\lib\net45\Microsoft.Web.WebView2.WinForms.dll + + ..\packages\Microsoft.Web.WebView2.1.0.1054.31\lib\net45\Microsoft.Web.WebView2.WinForms.dll - - ..\packages\Microsoft.Web.WebView2.1.0.1020.30\lib\net45\Microsoft.Web.WebView2.Wpf.dll + + ..\packages\Microsoft.Web.WebView2.1.0.1054.31\lib\net45\Microsoft.Web.WebView2.Wpf.dll ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -124,11 +124,11 @@ - + 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}. - + \ No newline at end of file diff --git a/SafeExamBrowser.Proctoring/packages.config b/SafeExamBrowser.Proctoring/packages.config index 1283cd2f..35989194 100644 --- a/SafeExamBrowser.Proctoring/packages.config +++ b/SafeExamBrowser.Proctoring/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj b/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj index 2e135670..a83e77ba 100644 --- a/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj +++ b/SafeExamBrowser.Runtime.UnitTests/SafeExamBrowser.Runtime.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -61,10 +61,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -72,8 +72,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -177,8 +177,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Runtime.UnitTests/app.config b/SafeExamBrowser.Runtime.UnitTests/app.config index 43982168..988c5967 100644 --- a/SafeExamBrowser.Runtime.UnitTests/app.config +++ b/SafeExamBrowser.Runtime.UnitTests/app.config @@ -12,7 +12,7 @@ - + diff --git a/SafeExamBrowser.Runtime.UnitTests/packages.config b/SafeExamBrowser.Runtime.UnitTests/packages.config index f529cfe2..2b50560d 100644 --- a/SafeExamBrowser.Runtime.UnitTests/packages.config +++ b/SafeExamBrowser.Runtime.UnitTests/packages.config @@ -2,9 +2,9 @@ - - - + + + \ 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 3ec25603..30a484ee 100644 --- a/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj +++ b/SafeExamBrowser.Service.UnitTests/SafeExamBrowser.Service.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -62,10 +62,10 @@ ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.2.2.8\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Moq.4.16.1\lib\net45\Moq.dll @@ -73,8 +73,8 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -136,8 +136,8 @@ 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}. - - + + - + \ No newline at end of file diff --git a/SafeExamBrowser.Service.UnitTests/app.config b/SafeExamBrowser.Service.UnitTests/app.config index fe205877..2833cc44 100644 --- a/SafeExamBrowser.Service.UnitTests/app.config +++ b/SafeExamBrowser.Service.UnitTests/app.config @@ -8,7 +8,7 @@ - + diff --git a/SafeExamBrowser.Service.UnitTests/packages.config b/SafeExamBrowser.Service.UnitTests/packages.config index 04f0d080..14e803d7 100644 --- a/SafeExamBrowser.Service.UnitTests/packages.config +++ b/SafeExamBrowser.Service.UnitTests/packages.config @@ -2,8 +2,8 @@ - - - + + + \ No newline at end of file diff --git a/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj b/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj index ca42f7b6..2247f97a 100644 --- a/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj +++ b/SafeExamBrowser.SystemComponents/SafeExamBrowser.SystemComponents.csproj @@ -81,8 +81,8 @@ - - ..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll + + ..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll diff --git a/SafeExamBrowser.SystemComponents/packages.config b/SafeExamBrowser.SystemComponents/packages.config index e48a4e61..5ea88d16 100644 --- a/SafeExamBrowser.SystemComponents/packages.config +++ b/SafeExamBrowser.SystemComponents/packages.config @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/SebWindowsConfig/SebWindowsConfig.csproj b/SebWindowsConfig/SebWindowsConfig.csproj index 3816ee4b..50f9d1af 100644 --- a/SebWindowsConfig/SebWindowsConfig.csproj +++ b/SebWindowsConfig/SebWindowsConfig.csproj @@ -77,8 +77,8 @@ - - ..\packages\DotNetZip.1.15.0\lib\net40\DotNetZip.dll + + ..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll diff --git a/SebWindowsConfig/packages.config b/SebWindowsConfig/packages.config index b4b50131..5dc7d5b9 100644 --- a/SebWindowsConfig/packages.config +++ b/SebWindowsConfig/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file