Commit Graph

43 Commits

Author SHA1 Message Date
jonathan adamczewski
5053cae2d8 Launch UnrealBuildTool via dotnet unrealbuildtool.dll, not unrealbuildtool.exe
#jira none
#rnx
#preflight 624261bdb6084b98321e9251

[CL 19544939 by jonathan adamczewski in ue5-main branch]
2022-03-29 13:20:46 -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
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
jonathan adamczewski
8dc68a7f85 AutomationTool: Compile script modules within the application
Add a layer of caching to avoid running msbuild as much as possible.

#jira UE-109181
#rb ben.marsh

[CL 17102399 by jonathan adamczewski in ue5-main branch]
2021-08-09 10:39:09 -04:00
David Harvey
08cc3defb3 some more post-move cleanup.
#jira UECON-532
#rnx

[CL 16672454 by David Harvey in ue5-main branch]
2021-06-15 08:18:45 -04:00
jonathan adamczewski
4ece24e65a AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

[CL 16648181 by jonathan adamczewski in ue5-main branch]
2021-06-11 18:20:44 -04:00
Ben Marsh
44d7a02d1d Add an explicit accessor for getting the path to the DotNet host.
[CL 16312643 by Ben Marsh in ue5-main branch]
2021-05-13 10:24:37 -04:00
jonathan adamczewski
17602ab008 Support two msbuilds, for NET Framework and Core
This is a preparatory change ahead of adding the ability to build NET Core projects to the CsCompile task, and subsequent conversion of NET Framework projects to NET Core. On its own, it should have no substantive visible effect.

#jira none

[CL 16008195 by jonathan adamczewski in ue5-main branch]
2021-04-14 13:24:20 -04:00
Joakim Lindqvist
4477d7c295 Fixed issue were ubt was being spawned with the wrong path and via mono when creating a installed engine build
#jira UE-104425

[CL 15019201 by Joakim Lindqvist in ue5-main branch]
2021-01-08 09:42:20 -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
Josh Adams
61debbf67e - Fixed and added more script modules to not compile on Mac (to work around weird builder-only issue where Mac is enabling code in a console module that should be impossible to be enabled)
#fyi ryan.durand,david.harvey

[CL 14397437 by Josh Adams in ue5-main branch]
2020-09-25 12:53:26 -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
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
andrew grant
9462028d66 Fix for packaging warning on Mac. No longer check mono version, just see if msbuild exists. TraceInfo if not,
#jira UE-78524
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7855006 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7855019 by andrew grant in Main branch]
2019-08-07 21:28:08 -04:00
andrew grant
c9ba372605 Now deal with situation where mono is >= 5.0 but msbuild does not exist. For reference it looks like mono that's bundled with UE was upgraded to 5.16 at some point but msbuild was not added.
#jira UE-78311
#rb na

#ROBOMERGE-SOURCE: CL 7814233 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7814249 by andrew grant in Main branch]
2019-08-06 14:59:16 -04:00
andrew grant
0e3be6e446 Cleaned up some comments (thanks MS!)
[FYI] michael.sartain


#ROBOMERGE-SOURCE: CL 7557895 via CL 7557963 via CL 7584977
#ROBOMERGE-BOT: (v372-7473910)

[CL 7606191 by andrew grant in Main branch]
2019-07-24 11:39:25 -04:00
andrew grant
be529ea063 Removed a piece of test code from previous checkin
#ROBOMERGE-SOURCE: CL 7541501 via CL 7541520 via CL 7556001
#ROBOMERGE-BOT: (v372-7473910)

[CL 7556132 by andrew grant in Main branch]
2019-07-23 13:25:02 -04:00
andrew grant
fb608ba070 Now automatically detect if mono5 is installed on Mac and use msbuild if so, otherwise stick to xbuild
[FYI] arciel.rekman, michael.sartain



#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7541249 via CL 7541252 via CL 7555938
#ROBOMERGE-BOT: (v372-7473910)

[CL 7555946 by andrew grant in Main branch]
2019-07-23 13:23:01 -04:00
andrew grant
92c8c8937f Switched UAT build process on Mac to use msbuild.
Enabled parallel msbuild for Mac
Added HashCollection class that can hold and serialize a collection of content hashes
Added quick dependency checking to UAT build by hashing csproj, input and output files for all modules
Reduced some logging when not running with -verbose

#rb Ben.Marsh
[FYI] Ben.Marsh


#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7290522 via CL 7290525 via CL 7292711 via CL 7292732 via CL 7308901
#ROBOMERGE-BOT: (v371-7306989)

[CL 7315952 by andrew grant in Main branch]
2019-07-15 20:50:01 -04:00
michael trepka
1e22588e86 Temporarily reverted the optimization that makes UAT launch UBT via a shell script, as it's causing issues that are not easy to solve quickly (UE-76351, UE-76600)
#jira UE-76600
#rb none
[FYI] joe.graf, josh.adams, peter.sauerbrei, ben.marsh

#ROBOMERGE-SOURCE: CL 7106768 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7106769 by michael trepka in Main branch]
2019-06-20 13:19:02 -04:00
michael trepka
d5074d310c Properly handle ; character in command line params when launching UBT from UAT scripts
#jira UE-76351
#rb Arciel.Rekman

#ROBOMERGE-SOURCE: CL 7097232 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7097233 by michael trepka in Main branch]
2019-06-19 17:37:56 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
michael trepka
f031f1162d One more fix for Windows paths handling in MacHostPlatform.cs
#ROBOMERGE-SOURCE: CL 6451674 via CL 6451677 via CL 6452836

[CL 6452921 by michael trepka in Main branch]
2019-05-14 16:22:38 -04:00
michael trepka
89482ed658 Restored the change to MacHostPlatform that uses sh to run C# executables
#ROBOMERGE-SOURCE: CL 6448823 via CL 6448839 via CL 6450890

[CL 6450956 by michael trepka in Main branch]
2019-05-14 13:40:27 -04:00