Commit Graph

214 Commits

Author SHA1 Message Date
UnrealBot
73409369c0 Branch snapshot for CL 21319338
[CL 21319338 in ue5-main branch]
2022-08-10 16:03:37 +00:00
Ben Marsh
cbb950c578 UBT: Use ILogger throughout UBT, rather than legacy EpicGames.Core.Log methods. All output going forwards should use structured logging rather than String.Format style logging.
#preflight 628e9dc6e746de4961f60032

[CL 20373777 by Ben Marsh in ue5-main branch]
2022-05-25 19:55:37 -04:00
Chris Babcock
7e03d99b02 Fix overflow obb file installs for Android
#jira UE-151295
#android
#review @Jack.Porter
#rb Jack.Porter

#preflight https://horde.devtools.epicgames.com/job/6279d6d51217b3a23d17ab0a

[CL 20117619 by Chris Babcock in ue5-main branch]
2022-05-09 23:20:43 -04:00
PJ Kack
65391545db UAT: Restrict the COTF -filehostip list to ip v4 host addresses and only include 127.0.0.1 on host platforms or platforms that support port redirection.
Makes connecting to cotf faster on some platforms.
Removes warnings like: LogSockets: Warning: Could not serialize fe80::edc3:3284:5b1b:1f32%7, got error code SE_NO_ERROR [0]
Makes the string shorter and more readable.

Test:
RunUAT.bat BuildCookRun -project=Samples\Games\ShooterGame\ShooterGame.uproject -platform=XYZ -config=development -build -cookonthefly -stage -run

FileHostIp example on PC & android:
Before: -filehostip=127.0.0.1+fe80::edc3:3284:5b1b:1f32%7+10.24.101.44+::1+127.0.0.1+fe80::58d4:b8b3:ff7a:4974%9+172.18.240.1
After : -filehostip=127.0.0.1+10.24.101.44+172.18.240.1

FileHostIp example on console:
Before: -filehostip=127.0.0.1+fe80::edc3:3284:5b1b:1f32%7+10.24.101.44+::1+127.0.0.1+fe80::58d4:b8b3:ff7a:4974%9+172.18.240.1
After : -filehostip=10.24.101.44+172.18.240.1

#jira none
#rb carlmagnus.nordin, per.larsson
#rnx
#preflight 62722ddafe45c124493258a8

[CL 20038819 by PJ Kack in ue5-main branch]
2022-05-04 04:18:17 -04:00
chris babcock
32da3a5e18 Clean up leftover OBB files which may override new data deployment for Android quick launch
#jira UE-147124
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter
#preflight 626610b2f3533b5fe26f04dc
#lockdown Jack.Porter

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19898474 in //UE5/Release-5.0/... via CL 19898535
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v940-19807014)

[CL 19901857 by chris babcock in ue5-main branch]
2022-04-25 10:03:17 -04:00
PJ Kack
aaaf1a0961 UAT: Fix non-zero UAT exit code when closing game launched on Android.
Restore the behavior as it was before cl 19621549.

#jira UE-149217
#rb chris.babcock
#rnx
#preflight 62663c2e926e1f8b58a07f48

[CL 19898849 by PJ Kack in ue5-main branch]
2022-04-25 02:26:16 -04:00
chris babcock
a83b231a9b Fix case of DotNET path for archiving UnrealAndroidFileTool
#jira UE-148051
#android
[REVIEW] Jack.Porter
#rb Jack.Porter
#preflight 625f4ae4fd255ad9e2f77f89

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19826273 in //UE5/Release-5.0/... via CL 19826358
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v940-19807014)

[CL 19834857 by chris babcock in ue5-main branch]
2022-04-20 14:30:19 -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
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
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
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
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
chris babcock
47d7a07ab0 Fix issue with packaging with data inside APK with AFS for Android
#jira UE-146815
#android
[REVIEW] [at]Brandon.Schaefer
#rb Brandon.Schaefer

#preflight https://horde.devtools.epicgames.com/job/623a159e10251d53d57654cb
#lockdown Mitchell.Wilson

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19470051 in //UE5/Release-5.0/... via CL 19470729
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v935-19464907)

[CL 19472001 by chris babcock in ue5-main branch]
2022-03-22 16:46:22 -04:00
chris babcock
ef6b377abb Clean up unused source files when AFS disabled
#jira UE-146087
#android
[REVIEW] [at]Robert.Srinivasiah
#rb Allan.Bentham

#preflight https://horde.devtools.epicgames.com/job/6230db54262232d86f6767fb
#lockdown Mitchell.Wilson

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19396651 in //UE5/Release-5.0/... via CL 19397868
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19403112 by chris babcock in ue5-main branch]
2022-03-16 03:28:24 -04:00
chris babcock
14af0e81aa Fall back to netstat if ss utility present but not showing connections during StartServer for Android File Server
#jira UE-144923
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

#preflight 6222bc780e2d25b12b3f7317

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19280229 in //UE5/Release-5.0/... via CL 19280304
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19280584 by chris babcock in ue5-main branch]
2022-03-04 21:38:41 -05:00
chris babcock
6c3a261ec9 Change adb shell communication (another StartServer improvement for AndroidFileServer)
#jira UE-144105
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

#preflight https://horde.devtools.epicgames.com/job/62216380c57f5f14ed1f8013

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19260949 in //UE5/Release-5.0/... via CL 19261965
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19269178 by chris babcock in ue5-main branch]
2022-03-04 13:04:55 -05:00
chris babcock
8b93736b79 Fallbacks for missing cmd on older Android and more timing adjustments for StartServer
#jira UE-144105
#android
[REVIEW] [at]Rolando.Caloca
#rb Rolando.Caloca

#preflight https://horde.devtools.epicgames.com/job/622123a62c722ee170d47ce6

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19252805 in //UE5/Release-5.0/... via CL 19253407
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19263472 by chris babcock in ue5-main branch]
2022-03-04 03:43:57 -05:00
chris babcock
08d7a81f74 More adjustments to deal with slower Android devices in StartServer
#jira UE-144105
#android
[REVIEW] [at]Rolando.Caloca
#rb Rolando.Caloca

#preflight 621feac2410576ef87254dfa


#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19231116 via CL 19231484 via CL 19231910 via CL 19231923 via CL 19231955
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19232853 by chris babcock in ue5-main branch]
2022-03-02 18:31:26 -05:00
chris babcock
c75b8d4d48 Added server failure reasons and increased retries on StartServer
#jira UE-144105
#android
[REVIEW] [at]Rolando.Caloca
#rb Rolando.Caloca

#preflight https://horde.devtools.epicgames.com/job/621e63e93e14f0c7e54981d0

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19202647 in //UE5/Release-5.0/... via CL 19208910
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19215035 by chris babcock in ue5-main branch]
2022-03-01 21:13:17 -05:00
chris babcock
b410d21429 Fix handling of AndroidFileServer startup checks (receiver may not be ready immediately after install)
#jira UE-144105
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

#preflight https://horde.devtools.epicgames.com/job/621d6eb8157472be9391789a

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19190446 in //UE5/Release-5.0/... via CL 19190633
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19208669 by chris babcock in ue5-main branch]
2022-03-01 17:41:49 -05:00
chris babcock
a33308a5c5 Fix copyright headers
#jira UE-143690
#ue5
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

#preflight https://horde.devtools.epicgames.com/job/621850651d1c50179932ca21

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19140974 in //UE5/Release-5.0/... via CL 19141099
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19156092 by chris babcock in ue5-main branch]
2022-02-25 15:59:42 -05:00
chris babcock
9c4a0b5605 Android file server for deployment and installs
#jira UE-120581
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter
#preflight https://horde.devtools.epicgames.com/job/6216bf01476ef5d8a211663b


#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19106332 via CL 19106499 via CL 19106550 via CL 19106616 via CL 19110163
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19151499 by chris babcock in ue5-main branch]
2022-02-25 13:24:48 -05:00
dmitriy dyomin
9504e87efa Fixed: Missing GPUDumpViewer files from a packaged builds on Android and iOS
#rb chris.babcock
#jira UE-142459
#preflight 620a4b7e015ab8f37a438558

#ROBOMERGE-AUTHOR: dmitriy.dyomin
#ROBOMERGE-SOURCE: CL 18978060 in //UE5/Release-5.0/... via CL 18978139 via CL 18978195
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18978200 by dmitriy dyomin in ue5-main branch]
2022-02-14 08:18:25 -05:00
AlexThiv
12ab579941 Unshelved from pending changelist '18515746':
PR #8762: Iterative Deploy: Change the filename of the retrieved manifest so they don't override the already generated manifest. (Contributed by AlexThiv)

#preflight trivial
#jira UE-138339
#rb chris.babcock

#ROBOMERGE-AUTHOR: steve.smith
#ROBOMERGE-SOURCE: CL 18684811 in //UE5/Release-5.0/... via CL 18684824 via CL 18684838
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v902-18672795)

[CL 18684843 by AlexThiv in ue5-main branch]
2022-01-20 19:51:16 -05:00
jonathan adamczewski
5765f4595e AutomationTool: Remove UE4 references
#jira UE-111740
#preflight none
#trivial

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18576039 in //UE5/Release-5.0/... via CL 18576055
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18576072 by jonathan adamczewski in ue5-release-engine-test branch]
2022-01-11 15:15:59 -05:00