#rb Ben.Marsh
#ROBOMERGE-OWNER: james.hopkin
#ROBOMERGE-AUTHOR: james.hopkin
#ROBOMERGE-SOURCE: CL 12779149 via CL 12779152 via CL 12779160
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)
[CL 12782243 by James Hopkin in Main branch]
#rb none
#jira
#ROBOMERGE-SOURCE: CL 12356705 in //UE4/Release-4.25/... via CL 12356713
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)
[CL 12356726 by ben marsh in Main branch]
#rb CopyUp
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 12149088 via CL 12150247
#ROBOMERGE-BOT: (v659-12123632)
[CL 12150618 by ryan vance in Main branch]
#rb none
#jira UE-88824, UE-89676
#ROBOMERGE-SOURCE: CL 11658206 in //UE4/Release-4.25/... via CL 11658244
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)
[CL 11658322 by ben marsh in Main branch]
#rb none
#jira UE-88824
#ROBOMERGE-SOURCE: CL 11637884 in //UE4/Release-4.25/... via CL 11637925
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)
[CL 11637942 by ben marsh in Main branch]
#rb none
#jira UE-89548
#ROBOMERGE-SOURCE: CL 11631033 in //UE4/Release-4.25/... via CL 11631036
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)
[CL 11631049 by ben marsh in Main branch]
#rb none
#jira UE-82398
#ROBOMERGE-SOURCE: CL 11630897 in //UE4/Release-4.25/... via CL 11630908
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)
[CL 11630926 by ben marsh in Main branch]
#rb none
#jira UE-88446
[FYI] Martin.Sevigny
#ROBOMERGE-SOURCE: CL 11625250 in //UE4/Release-4.25/... via CL 11625255
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)
[CL 11625268 by ben marsh in Main branch]
#rb none
#jira UE-88446
#ROBOMERGE-SOURCE: CL 11624846 in //UE4/Release-4.25/... via CL 11624849
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)
[CL 11624868 by ben marsh in Main branch]
#rb none
#jira
UE-87654
#ROBOMERGE-SOURCE: CL 11592464 in //UE4/Release-4.25/... via CL 11592465
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)
[CL 11592466 by ben marsh in Main branch]
Look for a candidate file either based on the -project argument or if there is an argument that ends in .uproject. Then check if the candidate exists (e.g if it's a full path), if not use the ueprojectdirs entries to see if it exists in one of those directories.
(Note - it would be good to reconcile this code with some things in the Automation csproj that do the same thing, but there wasn't an obvious project for that to live in...).
[at]ben.marsh
#rb swarm
#ROBOMERGE-SOURCE: CL 11195074 via CL 11195078
#ROBOMERGE-BOT: (v640-11091645)
[CL 11195320 by andrew grant in Main branch]
#rb Ben.Marsh
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10727300 via CL 10727303 via CL 10727314 via CL 10727316 via CL 10727317
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)
[CL 10822710 by michael lentine in Dev-Build branch]
#rb Ben.Marsh
#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10727300 via CL 10727303 via CL 10727314 via CL 10727316
#ROBOMERGE-BOT: (v610-10636431)
[CL 10727317 by michael lentine in Main branch]
Reported in UDN:
https://udn.unrealengine.com/questions/528859/view.html
Also fixed so that HololensTarget is actually getting configured from setting sources, including command line and BuildConfiguration.xml which I added attributes for to match how Windows targets can be configured.
#rb ben.marsh
[CL 9866335 by Joakim Lindqvist in Dev-Build branch]