From a3c9271faf4fc58c4690f0277da16deaab5a5443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Tue, 25 Jun 2024 17:21:33 +0200 Subject: [PATCH] SEBWIN-742: Improved build log for server environment. --- .../DataResources/NetworkResourceLoader.cs | 2 +- Setup/Setup.wixproj | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/SafeExamBrowser.Configuration/DataResources/NetworkResourceLoader.cs b/SafeExamBrowser.Configuration/DataResources/NetworkResourceLoader.cs index 8d306ef3..e268c6b3 100644 --- a/SafeExamBrowser.Configuration/DataResources/NetworkResourceLoader.cs +++ b/SafeExamBrowser.Configuration/DataResources/NetworkResourceLoader.cs @@ -149,7 +149,7 @@ namespace SafeExamBrowser.Configuration.DataResources { data = default; - logger.Debug($"The {(IsUnauthorized(response) ? "resource needs authentication" : " response data is HTML")}."); + logger.Debug($"The {(IsUnauthorized(response) ? "resource needs authentication" : "response data is HTML")}."); return LoadStatus.LoadWithBrowser; } diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj index 81303df9..9b7cf3f3 100644 --- a/Setup/Setup.wixproj +++ b/Setup/Setup.wixproj @@ -141,7 +141,11 @@ git -C $(SolutionDir) checkout -- Setup/Components/Service.wxs setlocal enabledelayedexpansion set executable="$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)\SafeExamBrowser.exe" -set parameters=/shareconsole /protect "C:\SEB\SafeExamBrowser.tmd" /inputfile %25executable%25 /outputfile %25executable%25 +set parameters=/protect "C:\SEB\SafeExamBrowser.tmd" /inputfile %25executable%25 /outputfile %25executable%25 + +if not defined APPVEYOR ( + set parameters=/shareconsole %25parameters%25 +) if exist "C:\SEB\Themida" ( if $(PlatformName) == x86 ( @@ -149,6 +153,15 @@ if exist "C:\SEB\Themida" ( ) else ( C:\SEB\Themida\Themida64.exe %25parameters%25 ) + + if defined APPVEYOR ( + if %25ERRORLEVEL%25 equ 0 ( + echo Themida successfully executed. + ) else ( + echo ERROR: Themida failed with error code %25ERRORLEVEL%25! + ) + ) + DEL %25executable%25.bak ) else ( echo WARNING: Themida not executed!