Commit Graph

3632 Commits

Author SHA1 Message Date
Josh Adams
604aec8368 - Allow for multiple full sdks for a platform (uses a new SDKCollection class to gather sdk versions and their validityt, etc)
- Windows will be first to use it, but in a future CL, with toolchain separate from Windows SDK
- Cleaned up some of the PlatformSDK API to have fewer public members (mainly so the functions that receive multiple versions can be automatically populated with the current single version functions in the subclasses)
- Updated the Turnkey menu to handle multiple versions

#jira none
#rb david.harvey
#preflight 62508cd8f10bcc0f4fa8b5d1

[CL 19692492 by Josh Adams in ue5-main branch]
2022-04-08 15:34:51 -04:00
andrew grant
f88a63cd54 Changed Gauntlet so editor artifacts are archived if there's a crash on a build machine.
[REVIEW] [at]eric.knapik
#preflight 624f5058f10bcc0f4f84a6ba

#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 19680155 via CL 19681068 via CL 19681084 via CL 19681091
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19681818 by andrew grant in ue5-main branch]
2022-04-07 20:06:37 -04:00
jonathan adamczewski
c12d99d854 .net6.0 is not supported in VS2019. Suppress warnings about that when using that IDE (with this change, when building UnrealBuildTool & AutomationTool)
#jira none
#rnx
#rb joe.kirchoff
#preflight 624f2c163c2aff69c54ff9eb

[CL 19675097 by jonathan adamczewski in ue5-main branch]
2022-04-07 15:06:02 -04:00
jonathan adamczewski
196e422d10 CsCompile: Fix argument order (and use msbuild rather than build, consistent with elsewhere)
#jira none
#rnx
#preflight 624f15f9933134aa0538dbe3

[CL 19672505 by jonathan adamczewski in ue5-main branch]
2022-04-07 13:09:10 -04:00
jonathan adamczewski
7cf9663b93 CsCompile: Include project in command line
#jira none
#fyi ben.marsh
#rnx
#preflight 624ef817f94f766ffaad7d57

[CL 19669311 by jonathan adamczewski in ue5-main branch]
2022-04-07 10:56:47 -04:00
mitchell fisher
f039ee7b30 [FORT-465286] McpConfigHelper::Find() surfaces nested exception details if instance activation throws
#rb trivial
#preflight skip

#ROBOMERGE-OWNER: mitchell.fisher
#ROBOMERGE-AUTHOR: mitchell.fisher
#ROBOMERGE-SOURCE: CL 19653682 via CL 19654984 via CL 19655731 via CL 19655738
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19657590 by mitchell fisher in ue5-main branch]
2022-04-06 18:24:32 -04:00
Ben Marsh
2c879673ff BuildGraph: Fix compilation of C# projects with the bundled NET runtime.
#preflight 624dec312c73c3b0c045a51a

[CL 19654182 by Ben Marsh in ue5-main branch]
2022-04-06 15:56:36 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -04:00
PJ Kack
5f6c6d5beb UAT: Add BuildCookRun support for running both a dedicated server and cotf server.
Merge RunClientWithServer() and RunStandAloneClient() functions into one RunClient() function to resolve numerous inconsistencies between them and between unattended/non-unattended mode.
Always use SC.StageTargetPlatform.RunClient() to launch clients so that the logic works on all platforms.
When either the client, dedicated server or cook server exits, then all other processes exits too.
Hitting Ctrl-c in UAT kills all processes.

ShooterGame testing on Win64, consoles and android:
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cook -stage -pak -deploy -run
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -skipcook -skipstage -skipdeploy -run
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -skipcook -skipstage -skipdeploy -run -unattended
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cookonthefly -stage -deploy -run
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cookonthefly -stage -deploy -run -unattended
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cookonthefly -zenstore -stage -deploy -run
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cookonthefly -zenstore -stage -deploy -run -unattended

ShooterGame Win64 Desktop specific testing with lan server and multiple clients:
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cookonthefly -zenstore -server -stage -run -map=Highrise -numclients=3
BuildCookRun -project=ShooterGame -platform=Win64 -config=development -skipbuild -cookonthefly -zenstore -server -stage -run -map=Highrise -numclients=3 -unattended

EngineTest testing on Win64 and console:
BuildCookRun -project=EngineTest -platform=Win64 -config=development -skipbuild -cook -stage -pak -deploy -run -runautomationtest=Project.System
BuildCookRun -project=EngineTest -platform=Win64 -config=development -skipbuild -cookonthefly -stage -deploy -run -runautomationtest=Project.System
BuildCookRun -project=EngineTest -platform=Win64 -config=development -skipbuild -cookonthefly -zenstore -stage -deploy -run -runautomationtest=Project.System

#jira none
#rb carlmagnus.nordin
#rnx
#preflight 624d79fdbf5b974989964f4c

[CL 19645492 by PJ Kack in ue5-main branch]
2022-04-06 08:03:43 -04:00
markus breyer
fff228a79e Removed obsolete staging code
#rb andrew.rodham
#rnx
#author andrew.rodham
#author markus.breyer
#preflight 624b4a93dc6183e3f547efa6

#ROBOMERGE-AUTHOR: markus.breyer
#ROBOMERGE-SOURCE: CL 19631454 via CL 19632493 via CL 19636186 via CL 19636668
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v938-19570697)

[CL 19638184 by markus breyer in ue5-main branch]
2022-04-05 21:02:04 -04:00
matt johnson
25c86ecac1 UBT: recognize shared libraries with version number suffixes as allowed duplicate build products
Shared libraries on Linux commonly use a scheme of version number suffixes
and/or symlinks to help ensure that client applications can link against the
appropriate version of a library (e.g. "libfoo.so.1.70.0"). This change updates
IsDuplicateBuildProduct() with an additional case to cover these libraries so
that they are not flagged as an error by the build system if multiple steps
produce them.

#jira UE-148232
#rb brandon.schaefer
#preflight 624c76a8712e7c09a6a15d69

[CL 19627733 by matt johnson in ue5-main branch]
2022-04-05 13:17:02 -04:00
PJ Kack
91d645a0a8 Android editor integration improvements.
UAT RunClient: Continuously redirect output to uat stdout while client is running.
UAT RunClient: Add a process wrapper to kill client process when uat exits and to write the adb device log file to the host pc directories.
UAT RunClient: Push the ClientCmdLine args as a UECommandLine.txt file to the device to the correct location (different for adb deploy and android file server) to override the stage/apk command line.
UAT MakeApk: Add a UECommandLine.txt cache file to the intermediate directory to invalidate the apk when the stage/apk command line changes (e.g. when switching between CBTB or COTF or cooking with/without Zen).
LaunchAndroid.cpp: Add debug output for which override command line file that is being used.
LaunchAndroid.cpp: Implement missing -waitforattach/-waitfordebugger feature.
DataDrivenPlatformInfo.ini: set bUATClosesAfterLaunch=false to stop the editor from passing -nokill to uat to let it stop all processes when the client exits..

#jira none
#rb chris.babcock
#rnx
#preflight 6245849873665f7d5e4f0a18
#preflight 624be1f3dc6183e3f5518801

[CL 19621549 by PJ Kack in ue5-main branch]
2022-04-05 02:48:11 -04:00
Brandon Schaefer
47456601a7 Re-enable Audio Tests now that we have a Null Audio device working for SDL
#jira none
#rb none
#preflight none

[CL 19616551 by Brandon Schaefer in ue5-main branch]
2022-04-04 18:40:39 -04:00
Ryan Hummer
e4945b7f53 Clarify error message when scanning temp storage for cleanup
#rnx
#jira none
#rb none
#preflight skip

[CL 19579046 by Ryan Hummer in ue5-main branch]
2022-03-31 17:23:08 -04:00
Jerome Delattre
93a0f48bd8 Using System.Text.Json for Device reservation instead of fastJSON and making the deserialization not case sensitive
#rb Josh.Engebretson, Chris.Constantinescu
#preflight 62434b28292f228e09e53f10
#rnx
#jira none

[CL 19575272 by Jerome Delattre in ue5-main branch]
2022-03-31 13:43:17 -04:00
PJ Kack
640a176fd5 UAT: Ctrl-c exit fixes.
In ProcessManager.KillAll() make a local copy of global ActiveProcesses and to avoid calling any external code while iterating the internal global list.
In ProcessResult.StopProcess() make sure to set the ExitCode member from the killed process, else the information is lost forever since the member Proc has already been nulled out.
In CommandUtils.Run() check Result.ProcessObject for null for the case when WaitForExit() returns after StopProcess() has been called from another thread (ctrl-c handler).

#jira none
#rb carlmagnus.nordin
#rnx
#preflight 62441c4dc667881bf4e70722

[CL 19570185 by PJ Kack in ue5-main branch]
2022-03-31 03:25:13 -04:00
josh adams
25705eb507 - Added cooker option, -DlcReevaluateUncookedAssets, which will allow a cooked editor to attempt to cook assets that the base game had attempted to cook and skipped, but left in the assetregistry.
#rb matt.peters
#p4v-preflight-copy 19482053
#preflight 624326c1f73c316f68cdd1c2

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 19544735 via CL 19547423 via CL 19548168 via CL 19548176
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v937-19513599)

[CL 19560883 by josh adams in ue5-main branch]
2022-03-30 14:16:51 -04:00
jonathan adamczewski
5053cae2d8 Launch UnrealBuildTool via dotnet unrealbuildtool.dll, not unrealbuildtool.exe
#jira none
#rnx
#preflight 624261bdb6084b98321e9251

[CL 19544939 by jonathan adamczewski in ue5-main branch]
2022-03-29 13:20:46 -04:00
jonathan adamczewski
0a6164bbd3 nullability annotations, rethrow fixes, net6.0 warning suppression
#jira none
#trivial
#rnx
#preflight 62425155c61d8a458f230657

[CL 19536049 by jonathan adamczewski in ue5-main branch]
2022-03-28 20:50:06 -04:00
jonathan adamczewski
5665d516b8 Suppress warning in third party code.
#jira none
#trivial
#rnx
#preflight 62424a24470aff98e94815bf

[CL 19535767 by jonathan adamczewski in ue5-main branch]
2022-03-28 20:16:21 -04:00
jonathan adamczewski
82e25a1a02 Gauntlet: Remove call to Thread.Abort(), unsafe & unavailable in later .net versions
#jira none
#rnx
#preflight none

[CL 19535567 by jonathan adamczewski in ue5-main branch]
2022-03-28 19:48:01 -04:00
jonathan adamczewski
01786aed54 GoogleDriveHelper: correct rethrow
#jira none
#trivial
#rnx
#preflight none

[CL 19535531 by jonathan adamczewski in ue5-main branch]
2022-03-28 19:43:45 -04:00
jonathan adamczewski
5c68d1d9ef Revert //UE5/Main/... changelist 19531725 - return to NET Core 3.1
#preflight 62422fd0470aff98e946bfce
#jira UE-119846

[CL 19534572 by jonathan adamczewski in ue5-main branch]
2022-03-28 18:25:19 -04:00
justin marcus
bab21f02ae Add MergeDirectory_NoExceptions which does not delete the contents of the targer directory.
#preflight https://horde.devtools.epicgames.com/job/623e0cb18330d27ee3740f4f

#ROBOMERGE-OWNER: justin.marcus
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 19525960 via CL 19527026 via CL 19527842 via CL 19527853
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v937-19513599)

[CL 19532718 by justin marcus in ue5-main branch]
2022-03-28 16:27:08 -04:00
jonathan adamczewski
18ac15cbb1 Upgrade to .NET 6.0
#jira UE-119846
#preflight 6241fc06470aff98e943c035

[CL 19531725 by jonathan adamczewski in ue5-main branch]
2022-03-28 15:30:56 -04:00