Commit Graph

38 Commits

Author SHA1 Message Date
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
joe kirchoff
c46a4af3c5 UnrealBuildTool: Remove support for VS2017
#jira UE-126521
#rb Jonathan.Adamczewski
#preflight 6144ffdb11925a000119cac6

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 17559611 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17559616 by joe kirchoff in ue5-release-engine-test branch]
2021-09-17 18:25:11 -04:00
jonathan adamczewski
2b7b866f45 Move DotNETCommon/BuildUtilities to Shared/EpicGames.Build
Also moves DotNETCommon/Metadata.cs to Shared/Metadata.cs

#jira none
#rb tim.smith

#ROBOMERGE-SOURCE: CL 17116964 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17116977 by jonathan adamczewski in ue5-release-engine-test branch]
2021-08-10 11:09:18 -04:00
jonathan adamczewski
f72e6cce86 AutomationTool:
Move Project class into a namespace (rather than global class), and consequent using changes to consumers of the class.

#jira none
#trivial

#ROBOMERGE-SOURCE: CL 16933076 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16933088 by jonathan adamczewski in ue5-release-engine-test branch]
2021-07-22 20:27:40 -04:00
jonathan adamczewski
55f53bcc8b ExitCode:
Move enum from AutomationUtils.Automation to BuildUtilities

#jira none
#trivial
#preflight 60ca8a3d78c3b00001f86b24

#ROBOMERGE-SOURCE: CL 16701095 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16701097 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-17 01:49:34 -04:00
jonathan adamczewski
3d5833e02f Add a common C# method for detecting the current host platform to EpicGames.Core, and move many a test to use that code.
#jira none
#rb joe.kirchoff

#ROBOMERGE-SOURCE: CL 16593582 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16593589 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-08 17:01:47 -04:00
joe kirchoff
154b8e9741 Remove build support for Visual Studio 2015
#rb Jonathan.Adamczewski
#preflight 60ad7f3b8194e700015e1d77

#ROBOMERGE-SOURCE: CL 16459038 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v818-16446889)

[CL 16459043 by joe kirchoff in ue5-release-engine-test branch]
2021-05-25 20:10:55 -04:00
Joe Kirchoff
75edf837e1 Remove build support for Visual Studio 2015
#rb Jonathan.Adamczewski
#preflight 60ad7f3b8194e700015e1d77

[CL 16459038 by Joe Kirchoff in ue5-main branch]
2021-05-25 20:10:26 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
AndreyChistyakov
f74cfba4b3 Unshelved from pending changelist '15218728':
PR #7717: HL2 asset bundling (Contributed by AndreyChistyakov)

#jira UE-107323
#rb steve.smith

#ROBOMERGE-SOURCE: CL 16406067 in //UE4/Release-4.27/... via CL 16406090
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)

[CL 16407508 by AndreyChistyakov in ue5-release-engine-staging branch]
2021-05-20 15:00:02 -04:00
AndreyChistyakov
a8b41fce62 PR #7683: putting all information to the editor from device (Contributed by AndreyChistyakov)
#jira UE-106422
#rb steve.smith

#ROBOMERGE-SOURCE: CL 16307374 in //UE4/Release-4.27/... via CL 16307383
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)

[CL 16312783 by AndreyChistyakov in ue5-release-engine-staging branch]
2021-05-13 10:34:48 -04:00
jonathan adamczewski
7796bc81bb UnrealBuildTool:
Remove IsRunningOnMono

For remaining references, IsRunningOnMono -> !IsRunningOnWindows

#jira none
#trivial

[CL 16175552 by jonathan adamczewski in ue5-main branch]
2021-04-30 22:11:47 -04:00
jonathan adamczewski
61b793626e revert 16173499
[CL 16173666 by jonathan adamczewski in ue5-main branch]
2021-04-30 17:49:02 -04:00
jonathan adamczewski
c1b2fd7955 HoloLensPlatform.Automation:
Remove some references to Mono

#jira none
#trivial

[CL 16173499 by jonathan adamczewski in ue5-main branch]
2021-04-30 17:32:56 -04:00
jeff newquist
5ea7789d60 Rename UE4CommandLine.txt to UECommandLine.txt and deal with all the related changes
#rb TBD
#jira UE-113713

[CL 16093056 by jeff newquist in ue5-main branch]
2021-04-22 10:29:26 -04:00
robert srinivasiah
dad92ed5fd Hololens: Package missing IoStore files
Plus a little cleanup. Technically, IoStore can run w/o pak.

#rb Jeff.Fisher Ben.Marsh
#jira UE-99878

#ROBOMERGE-SOURCE: CL 15878917 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15878951 by robert srinivasiah in ue5-main branch]
2021-03-31 14:27:57 -04:00
martin ridgers
ca3b5923d6 A few GetCookPlatform() implementations were not checking bIsClientOnly correctly. As a result they were staging Client and Game versions to the same output location.
#rb josh.adams
#rnx

#ROBOMERGE-SOURCE: CL 15526995 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15527031 by martin ridgers in ue5-main branch]
2021-02-25 05:41:14 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Joakim Lindqvist
017048f505 Changed pdb format to not use portable pdbs (which is the default in net core) and instead back to our old pdb configuration.
This resolves a issue with PCBs were pdbcopy failed to run because it does not support portable pdbs.

#rb none

[CL 14837521 by Joakim Lindqvist in ue5-main branch]
2020-12-02 14:54:53 -04:00
Joakim Lindqvist
e7039d3d35 UBT and UAT now use .NET Core instead of Framework and Mono. This means that we use the same runtime on Windows, Linux and Mac. Further benefits including newer C# features and a lot of intresting features for the future around AOT and Tiered compilation.
Some behavior changes:
Output paths - Both tools are now output to a subdirectory of Binaries/Dotnet, I believe most hardcoded paths have been fixed up but there may be tools that will fail because of this.
UAT Plugin Building - As .NET Core does not support AppDomain unloading, how we build the plugins has changed quite a bit, these are now built before UAT is started rather then by UAT itself. If you just start UAT via RunUAT.bat/sh this should just continue to work.

#rb ben.marsh

[CL 14834347 by Joakim Lindqvist in ue5-main branch]
2020-12-02 06:57:13 -04:00
Joakim Lindqvist
1b4f6b3ac9 Changed output directory for UAT projects under netcore, now outputting to a seperate directory for each addin. This avoids the risk of output stomping each other breaking incremental builds. Furthermore it makes it easier to understand who adds what dependency to the output.
Also cleaned up some output assemblies, preventing all transative references from being outputed (as we assume they build directly to the output directory instead). Unfortunatley the UBT references still cause tranastive dependencies to be copied as this is also a executable that needs to work outside of UAT as well, we should eventually move all UBT referenced code into BuildUtilities.

#rb none
#fyi ben.marsh

[CL 14775171 by Joakim Lindqvist in ue5-main branch]
2020-11-18 10:18:50 -04:00
Joakim Lindqvist
4aa9d3dddf Hololens fixes in UBT and UAT under netcore
This was using net framework specific apis, found corresponding apis under net core and switched to them.

#jira UE-103000

[CL 14763785 by Joakim Lindqvist in ue5-main branch]
2020-11-17 11:43:58 -04:00