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

SEBWIN-742: Improved build log for server environment.

Browse source
This commit is contained in:
Damian Büchel 2024-06-25 17:21:33 +02:00
parent 68d6d47fe6
commit a3c9271faf
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Configuration/DataResources/NetworkResourceLoader.cs
View file

@ -149,7 +149,7 @@ namespace SafeExamBrowser.Configuration.DataResources
{ {
data = default; 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; return LoadStatus.LoadWithBrowser;
} }

15
Setup/Setup.wixproj
View file

@ -141,7 +141,11 @@ git -C $(SolutionDir) checkout -- Setup/Components/Service.wxs</PostBuildEvent>
<PropertyGroup> <PropertyGroup>
<PreBuildEvent>setlocal enabledelayedexpansion <PreBuildEvent>setlocal enabledelayedexpansion
set executable="$(SolutionDir)SafeExamBrowser.Runtime\bin\$(PlatformName)\$(ConfigurationName)\SafeExamBrowser.exe" 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 exist "C:\SEB\Themida" (
if $(PlatformName) == x86 ( if $(PlatformName) == x86 (
@ -149,6 +153,15 @@ if exist "C:\SEB\Themida" (
) else ( ) else (
C:\SEB\Themida\Themida64.exe %25parameters%25 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 DEL %25executable%25.bak
) else ( ) else (
echo WARNING: Themida not executed! echo WARNING: Themida not executed!