Commit Graph

9668 Commits

Author SHA1 Message Date
brian white
d467a8f6d2 [Turnkey] Added null check when AllowedFlashDeviceTypes is unset (and null)
#rb Josh.Adams

[CL 14699848 by brian white in ue5-main branch]
2020-11-10 11:13:16 -04:00
Joakim Lindqvist
f236ff9ae1 Reworked Automation assembly loading in netcore again, using LoadFrom could cause multiple copies of the same assembly to be loaded (once by path and once by identity) causing very confusing errors as the same types were no longer considered the same (ptr difference).
We now always load by identity and hint to our assembly resolver were to expect to find assemblies that are not in our Engine.

#rb ben.marsh

[CL 14689002 by Joakim Lindqvist in ue5-main branch]
2020-11-09 10:57:52 -04:00
Joakim Lindqvist
7e61b4376d Fixed UAT Game specific UAT projects output location
Changed so that automation projects are loaded from their file path (LoadFrom rules) in net core as this is in practise what happened in net fw. Fixes issue were UAT projects not under Engine/Binaries couldnt be loaded.

#rb ben.marsh

[CL 14675418 by Joakim Lindqvist in ue5-main branch]
2020-11-06 06:32:39 -04:00
Josh Adams
61898204da - Worked around p4.exe having a bad interaction with Windows parsing the commandline with a * in it in a server path, by passing commands with a * in the parameters through in a file and the -x global option. (Windows would treat //UE4/Main as \\UE4\Main and take forever to timeout looking for a server named UE4)
#rb brandon.schaefer

[CL 14666987 by Josh Adams in ue5-main branch]
2020-11-05 14:23:24 -04:00
Josh Adams
e90261a073 - Added support for finding Windows SDK on builders that don't have the SDK installed - but might have the SDK bits coming from AutoSDK location
#rb me
#jira UE-102459
#fyi ryan.durand

[CL 14666936 by Josh Adams in ue5-main branch]
2020-11-05 14:16:11 -04:00
Alexis Matte
786b0446b7 Make sure the Fbx parser have the fbx sdk scene loaded all the time the translator is active.
#jira none
#rb richard.talbotwatkin

[CL 14666644 by Alexis Matte in ue5-main branch]
2020-11-05 13:48:16 -04:00
Joakim Lindqvist
4a3312078d -Compile for UAT is now handled by the batchfiles rather then inside UAT itself when running netcore version (as netcore does not support shadow copy so we can not update the assemblies we are running)
Also removed usages of automationtool launcher in netcore as we no longer need it.

#rb ben.marsh
#jira UE-102151

[CL 14663048 by Joakim Lindqvist in ue5-main branch]
2020-11-05 09:07:32 -04:00
Joakim Lindqvist
9a7765b1fb UGS now uses build.bat to run UBT instead of running it directly, this means it can handle our dotnet core location of UBT but also that we can handle things like building UBT automatically if we need to.
#rb none
#fyi ben.marsh

[CL 14662991 by Joakim Lindqvist in ue5-main branch]
2020-11-05 09:00:18 -04:00
Joakim Lindqvist
bd18d9e6e8 Disabled copy local on project references for netcore projects, fixes build warnigns caused by multiple copies trying to write to the same output files.
Also reduces footprint on disk and speedsup builds slightly.

Also took a pass over all projects to fixup their output paths as there were some inconsitencies from my port to netcore.
Lastly I disabled the resource folders for everything but english to reduce some of the noise in the output folder, this just impacts which languages you get code analysis.

#jira UE-102147
#rb none

[CL 14651855 by Joakim Lindqvist in ue5-main branch]
2020-11-04 09:48:49 -04:00
Joakim Lindqvist
4a4909d67d Simplified conditions for per platform checks in net core csprojs to make sure our condition parsing in UBT can handle it.
Should fix precompiled binary builds

#rb none

[CL 14648974 by Joakim Lindqvist in ue5-main branch]
2020-11-03 19:13:58 -04:00
Joakim Lindqvist
8665eecd4d UAT Create a executable on Mac under netcore to avoid needing to boostrap via dotnet run
#rb none

[CL 14641472 by Joakim Lindqvist in ue5-main branch]
2020-11-03 10:02:36 -04:00
Joakim Lindqvist
701b33939e Updated mac shell scripts for UBT in NetCore, opt in by setting UE_USE_DOTNET=1, note that due to output path differences a lot of tooling will break when enabling it.
#rb ben.marsh

[CL 14641121 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:46:05 -04:00
Joakim Lindqvist
2f6056b62b UAT Net-Core now supports running on Linux as well.
Set UE_USE_DOTNET=1 to enable this.

#rb ben.marsh

[CL 14641009 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:30:22 -04:00
Joakim Lindqvist
b4d3e129ca Moved logic for finding automation tool projects into msbuild, making the generated .reference file from UBT redundant.
This makes it possible to build UAT with these references without having to run UBT first. Thus also fixes net core building of the project.

This adds about 5 seconds to the build time of automation tool but eliminates the need to run UBT and should avoid the need to implement -compile in UAT (in the end saving more then these 5 seconds)

This essentially does the same as UBT did before, create a .reference file on disk that can then be read by msbuild, it just does this in msbuild as well so we have fewer components involved.

#rb ben.marsh

[CL 14640899 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:00:07 -04:00
daren cheng
4ec48c9820 Edigrate 14629275.
Capture callstack in widget invalidation for leaf widgets.

#jira UE-101687
#rb Patrick.Boutot Phillip.Kavan

[CL 14631340 by daren cheng in ue5-main branch]
2020-11-02 14:48:49 -04:00
Joakim Lindqvist
451e989870 Reenabled reading Gautlet.target files for netcore projects as the COM references that caused this to fail have been addressed.
#rb none

[CL 14629078 by Joakim Lindqvist in ue5-main branch]
2020-11-02 12:36:41 -04:00
Sebastien Lussier
c634cb4520 Fix include path casing
#fyi marc.audy

[CL 14617887 by Sebastien Lussier in ue5-main branch]
2020-10-29 20:20:41 -04:00
Sebastien Lussier
acfae6c8f8 ThirdParty\OpenEXR - Moved includes to correct location (under "/include/openexr" rather than "/include")
* Fixed all includes of OpenEXR in the engine and plugins
* Will allow building other middlewares that rely on OpenEXR without hassle (ex: OpenVDB)
* Created build scripts (Windows only for now)
* Replicated a few UE specific changes that were made under Deploy/OpenEXR-2.3.0 to the source, so that a rebuild of the lib will not erase them
#rb jeanfrancois.dube, anousack.kitisa

[CL 14613618 by Sebastien Lussier in ue5-main branch]
2020-10-29 14:28:23 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
devin doucette
829c1e154b Fixed UBT DataDrivenPlatformInfo to use case insensitive comparisons
#jira none
#rb Josh.Adams
#rnx

[CL 14600201 by devin doucette in ue5-main branch]
2020-10-28 12:13:30 -04:00
zach bethel
984e70e61a Fix for lightmass assert in debug mode.
#rb none
#jira none
#rnx

[CL 14589909 by zach bethel in ue5-main branch]
2020-10-27 13:47:32 -04:00
Joakim Lindqvist
f90e40ffb0 UAT can now build as a netcore application.
Added a NET_CORE define to allow us to have changes side by side.
The AWS S3 changes are required due to us requiring to upgrade the S3 assembly version to get net core support (which made all methods async).
The ACL checks for files are not available in the system libraries of net core, as such the api is a bit different.

AutomationToolLauncher now just spawns a subprocess when used in netcore, as netcore does not support custom AppDomains and shadow copying. We will generally need to revisit this for netcore as this whole feature of building the source for UAT in UAT is not really possible.

To enable this set environment variable "UE_USE_DOTNET=1", note that with netcore all applications change their output path so this will likely break a bit of tooling when enabled.

#rb ben.marsh

[CL 14572339 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:08:59 -04:00
Joakim Lindqvist
394b90b098 UBT changes required for netcore projects.
* Added support for more complex Msbuild conditions (using static property methods) as we use this to do per platform checks in the csprojs.
* Tweaks to the parsing of csprojs as expecations are different for netcore (mostly for how configurations are defined)
* Lastly if -dotnetcore flag is present when generating projects, use the netcore project files instead.

#rb ben.marsh

[CL 14572331 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:08:01 -04:00
Joakim Lindqvist
8c6c3cd9c2 UAT - Converted from system.web to use our json serialization (fastJson) and removed references to system.web that were not used.
This because we do not need this added dependency and it is not available by default in net core.

#rb ben.marsh

[CL 14572295 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:06:36 -04:00
Joakim Lindqvist
2750553a40 UAT Net Core - Copied project files into net core compatible format
#rb none

[CL 14572287 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:05:41 -04:00