Commit Graph

78 Commits

Author SHA1 Message Date
jonathan adamczewski
0a6164bbd3 nullability annotations, rethrow fixes, net6.0 warning suppression
#jira none
#trivial
#rnx
#preflight 62425155c61d8a458f230657

[CL 19536049 by jonathan adamczewski in ue5-main branch]
2022-03-28 20:50:06 -04:00
jonathan adamczewski
5c68d1d9ef Revert //UE5/Main/... changelist 19531725 - return to NET Core 3.1
#preflight 62422fd0470aff98e946bfce
#jira UE-119846

[CL 19534572 by jonathan adamczewski in ue5-main branch]
2022-03-28 18:25:19 -04:00
jonathan adamczewski
18ac15cbb1 Upgrade to .NET 6.0
#jira UE-119846
#preflight 6241fc06470aff98e943c035

[CL 19531725 by jonathan adamczewski in ue5-main branch]
2022-03-28 15:30:56 -04:00
adam kinge
f2e2089f8f When packaging an iOS app on BigSur/Catalina, it is unable to be installed on an iOS15 device. This fix now sets the "--generate-entitlement-der" flag for 'codesign'.
#jira UE-143619
#rb jack.porter
#preflight 6218eaec1d1c50179942cc17

#ROBOMERGE-AUTHOR: adam.kinge
#ROBOMERGE-SOURCE: CL 19147374 in //UE5/Release-5.0/... via CL 19148519
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19156782 by adam kinge in ue5-main branch]
2022-02-25 16:22:47 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05: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
jack porter
9e39d468e2 Fix assertion when generating Xcode project files for a single game target
#jira UE-129516
#rnx
#rb Dmitriy.Dyomin
[FYI] Will.Damon

#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 17781185 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v881-17767770)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 17781212 by jack porter in ue5-release-engine-test branch]
2021-10-12 02:31:58 -04:00
richard wallis
3cec9abbfc Update Xcode project XCBuildConfiguration to handle unique build environments. Also implement platform process GetModulesDirectory() on macOS which allows re-launching of the correct app to also work.
#jira UE-80706
[at]will.damon,  [at]ben.marsh,  [at]dave.hunter
#rb will.damon,  ben.marsh

#ROBOMERGE-SOURCE: CL 17332770 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17332818 by richard wallis in ue5-release-engine-test branch]
2021-08-27 06:31:40 -04:00
jonathan adamczewski
64c210d294 AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

#ROBOMERGE-SOURCE: CL 16648181 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16648203 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 18:21:35 -04:00
jonathan adamczewski
233b7719a5 <saved by Perforce>
#ROBOMERGE-SOURCE: CL 16642197 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16642206 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 11:37:42 -04:00
jonathan adamczewski
d58996b916 UnrealBuildTool: move some path constants into BuildUtilities
RootDirectory, EngineDirectory, UnrealBuildToolPath are now found in BuildUtilities' UnrealBuild namesapce.

The way these are computed has changed. Previously, it was assumed that the application is UnrealBuildTool, and paths were constructed relative to that assembly.

Now, the assumption is that the process is located under a "Engine/Build/DotNET" sub-path and paths are constructed relative to that.

#jira none

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

[CL 16607455 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-09 12:55:13 -04:00
axel riffard
8082e17223 Refactor iOS Icons
#jira UE-72584
#rb jack.porter
#preflight 60bef2cb0c76f90001d9e9a9

[CL 16583855 by axel riffard in ue5-main branch]
2021-06-08 03:06:05 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
marc audy
081dbcbaa7 Better fix for project file generation trying to generate IOS targets for modular build projects
#jira UE-110893
#rb carl.lloyd
[FYI] Will.Damon

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 16434660 in //UE4/Release-4.27/... via CL 16434671
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v814-16434418)
#ROBOMERGE-CONFLICT from-shelf

[CL 16436427 by marc audy in ue5-release-engine-staging branch]
2021-05-24 12:13:56 -04:00
Marc Audy
9c748a7390 Fix another stray space introduced by VS auto-formatting
[CL 16288803 by Marc Audy in ue5-release-engine-staging branch]
2021-05-11 20:58:50 -04:00
Marc Audy
6e23cf8ab1 Repair bad merge
[CL 16287766 by Marc Audy in ue5-release-engine-staging branch]
2021-05-11 20:27:02 -04:00
marc audy
abffb83188 Do not generate target/platform combinations where the project requires modular builds and the platform requires monolithic
#jira UE-110893
#rb Josh.Adams, Will.Damon

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 16270387 in //UE4/Release-4.27/... via CL 16270389
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v799-16237190)
#ROBOMERGE-CONFLICT from-shelf

[CL 16287302 by marc audy in ue5-release-engine-staging branch]
2021-05-11 20:15:33 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
rolando caloca
bb8b3ac23b UE5EA - Fix UE4 reference
#rb trivial
#jira UE-111419

#ROBOMERGE-SOURCE: CL 15807542 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15813866 by rolando caloca in ue5-main branch]
2021-03-24 20:54:44 -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
d48f3651bb Fix incorrect argument for UE5 project in Xcode project files.
#rb none
#jira UE-104928

[CL 14990888 by Ben Marsh in ue5-main branch]
2021-01-05 09:38:02 -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
Ben Marsh
83f27d27e9 UBT: Mark platforms and project file generation code as not nullable aware.
#rb none
#rnx

[CL 14960496 by Ben Marsh in ue5-main branch]
2020-12-20 17:32:59 -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