Commit Graph

2952 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
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
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
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
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
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
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
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
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Joakim Lindqvist
fd8cfb9fce UAT - Minor fixes (spelling, removing extra semicolons)
#rb none

[CL 14532231 by Joakim Lindqvist in ue5-main branch]
2020-10-21 06:16:27 -04:00
Joakim Lindqvist
a626769a0f Deleted unused source files in UAT
While these were present no csproj actually referenced them and built them, thus these files do not actually compile.

#rb none

[CL 14532228 by Joakim Lindqvist in ue5-main branch]
2020-10-21 06:15:33 -04:00
Andrew Davidson
85e98afa93 Correct calculation of OBB per file cost
#jira FORT-321990
#ue4
#android
#rb Brandon.Schaefer

#ushell-cherrypick of 14518496 by chris.babcock

[CL 14518566 by Andrew Davidson in ue5-main branch]
2020-10-19 16:57:54 -04:00
Ryan Durand
894ba25ab1 Fix P4Verbose being required on SubmitTask.
#rnx
#rb none
#jira none

[CL 14502236 by Ryan Durand in ue5-main branch]
2020-10-15 12:12:20 -04:00
Ryan Durand
e72ad24fed Adding the ability to allow verbose P4 output for SubmitTask.
#rnx
#rb none
#jira none

[CL 14502067 by Ryan Durand in ue5-main branch]
2020-10-15 11:51:57 -04:00
Ben Marsh
9f510f861f Attempt to silence warning about COM references when building c# projects.
#rb none

[CL 14473264 by Ben Marsh in ue5-main branch]
2020-10-12 13:43:47 -04:00
Josh Adams
0f3de44fbd - Added Turnkey Studio setting for GoogleDrive app name, and added a log to show user that they may need to check their web browser for Google authentication
[CL 14472507 by Josh Adams in ue5-main branch]
2020-10-12 11:57:22 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Josh Adams
788aad5cb0 - Updated UEBuildPlatform[SDK] to look in DDPI.ini and not bother setting up SDKs for platforms that aren't enabled (no need to print out errors for missing platform SDKs for platforms that aren't valid, like consoles on Mac)
- Streamlined the logs for bad SDK versions, especially when multiple platforms have bad SDKs
- Skip over non-enabled platforms in some Turnkey commands

[CL 14462457 by Josh Adams in ue5-main branch]
2020-10-09 13:20:15 -04:00