Commit Graph

164 Commits

Author SHA1 Message Date
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
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
4aa09904f2 UnrealBuildTool now supports running as a net core project.
Added a set of netcore csprojs to BuildUtilities and DotnetUtilities that build to a seperate output folder. This allows other tools to still target .net framework (like UAT for instance).
UBT is still by default targeted as .net framework.

Note that UBT built for net core has a different output directory Engine/Binaries/DotNet/UnrealBuildTool/UnrealBuildTool.exe - this is due to how a netcore project output looks with signficantly more files that are related to that application (that would be overwritten if using a shared directory).

To opt in to this set UE_USE_DOTNET=1 environment variable.
Please note that due to the changed output directory a lot of tooling will likely break at this point.

#rb ben.marsh

[CL 14419918 by Joakim Lindqvist in ue5-main branch]
2020-10-05 08:13:04 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Joakim Lindqvist
f6d7bf2fa9 Added UAT commands with helpers in DotNetUtilities for uploading and download trees of content to Jupiter (our new storage service).
#rb ben.marsh

[CL 14266118 by Joakim Lindqvist in ue5-main branch]
2020-09-07 07:28:34 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Josh Adams
860e2f7e4d - Use case insensitive comparisons int he AssemblyLocationCache as some assemblies names don't match the case of their filenames (the cache is generated by parsing the filename, not loading the assembly to get internal name)
#rb ben.marsh

[CL 14219700 by Josh Adams in ue5-main branch]
2020-08-31 11:57:10 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Ben Marsh
6ee8803dd7 Add support for passing properties to the <CsCompile> task, and fix parsing of ShooterGame project files in the BuildEditorAndTools.xml script.
#rb none
#rnx

[CL 14043020 by Ben Marsh in ue5-main branch]
2020-08-05 17:49:47 -04:00
Ben Marsh
32c246b956 Add additional tracing into to UAT/UBT.
#jira

[CL 13875431 by Ben Marsh in ue5-main branch]
2020-07-16 12:26:55 -04:00
Ben Marsh
0a655bd4f3 Add missing copyright notice.
#jira

[CL 13875427 by Ben Marsh in ue5-main branch]
2020-07-16 12:26:18 -04:00
Ben Marsh
b56e35dd18 Rename "Scopes" to "Spans" in exported telemetry data.
#jira

[CL 13875413 by Ben Marsh in ue5-main branch]
2020-07-16 12:24:49 -04:00
Ben Marsh
798e7ce776 Add a TraceSpan class that can be used to record timing information for UAT, and add tracing info for BuildGraph into it. Writes to a file in the directory specified by the UE_TELEMETRY_DIR environment variable.
#jira

[CL 13875408 by Ben Marsh in ue5-main branch]
2020-07-16 12:24:00 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
Josh Adams
2e39adff82 - Fixed paths to known ThirdParty assemblies
#rb ben.marsh

[CL 13721810 by Josh Adams in ue5-main branch]
2020-06-19 17:05:51 -04:00
Josh Adams
12dfa939db - Moving Google Apis to Binaries/ThirdParty with Copy Local set to False in the references in UAT
- Deleted .net version DLLs that we aren't using (.net40 and .netstandard10/13)
#fyi andrew.grant,ben.marsh
#rb ben.marsh

[CL 13534400 by Josh Adams in ue5-main branch]
2020-05-24 15:49:30 -04:00
jack porter
726be3773b Fixed iOS failure to match find profile when packaging for distribution with an ad-hoc provisioning profile
Fixed issue with fix for UE-77351 with Shipping builds
Fixed iOS automation failure enumerating folders where there user does not have permission the read the folder
#jira UE-91526
#jira UE-77351
#rb Allan.Bentham
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12917406 in //UE4/Release-4.25/... via CL 12918163 via CL 12918398
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12918444 by jack porter in Main branch]
2020-04-20 07:22:45 -04:00
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00
steve smith
ef82f1572e Merged from Dev-Build:
Fixed issue with converting UnrealTargetPlatform to string when parsing command line options

Added a TypeConverter for UnrealTargetPlatform
Added check if a typeconverter exists when parsing command line arguments
#rb ben.marsh
#jira none

#ROBOMERGE-SOURCE: CL 12383340 in //UE4/Release-4.25/... via CL 12383343
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12383347 by steve smith in Main branch]
2020-03-23 17:09:31 -04:00
ben marsh
afc9107407 Allow specifying a timespan for ThreadPoolWorkQueue.Wait().
#jira


#ROBOMERGE-SOURCE: CL 12147960 via CL 12147962 via CL 12149504
#ROBOMERGE-BOT: (v659-12123632)

[CL 12149616 by ben marsh in Main branch]
2020-03-12 13:29:29 -04:00
ben marsh
0f201db161 Add support for UAT script projects using foreign engine builds, and for game projects to output binaries under their own project directory.
* UAT will now read each *.Automation.csproj file to determine the output path, and load from there rather than just loading anything under Engine\Binaries\AutomationScripts.
* When compiling *.Automation.csproj files, UAT will set the $(EngineDir) directory to the current engine directory, allowing the project to resolve assembly references to the correct location.
* When generating project files, UBT will create an *.Automation.csproj.props file next to the project containing the path to the engine directory, allowing the assembly to be compiled correctly from Visual Studio.

#rb none
#jira UE-77934

#ROBOMERGE-SOURCE: CL 11601626 in //UE4/Release-4.25/... via CL 11601635
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11601659 by ben marsh in Main branch]
2020-02-25 09:26:12 -05:00
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
2020-01-29 14:48:18 -05:00
ryan durand
282b7051e2 Fixing an edge case crash when trying to word wrap a very long "word" and the current sentence is already full.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10955034 via CL 10972174 via CL 10972336
#ROBOMERGE-BOT: (v632-10940481)

[CL 10972496 by ryan durand in Main branch]
2020-01-13 19:33:59 -05:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00