Commit Graph

69 Commits

Author SHA1 Message Date
Joe Kirchoff
89698ba820 UnrealBuildTool: Suppress duplicate key exception when generating vs code projects
#rnx
#rb trivial
#preflight skipped

[CL 20815980 by Joe Kirchoff in ue5-main branch]
2022-06-24 16:02:55 -04:00
dapetcu21
99b68fe7f2 PR #9076: Fix invalid JSON keys in VSCode project generation (Contributed by dapetcu21)
#preflight 62a7d10567522b9df0130f53

[CL 20638603 by dapetcu21 in ue5-main branch]
2022-06-13 20:12:07 -04:00
Ben Marsh
cbb950c578 UBT: Use ILogger throughout UBT, rather than legacy EpicGames.Core.Log methods. All output going forwards should use structured logging rather than String.Format style logging.
#preflight 628e9dc6e746de4961f60032

[CL 20373777 by Ben Marsh in ue5-main branch]
2022-05-25 19:55:37 -04:00
Joe Kirchoff
c512a89ace Rename UnrealBuildTool.EngineSourceDirectory -> Unreal.EngineSourceDirectory
#rnx
#rb trivial
#preflight 628e9fdaf622d972b59ebe85

[CL 20372061 by Joe Kirchoff in ue5-main branch]
2022-05-25 17:54:39 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -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
Joe Kirchoff
6c78f8ae7e UnrealBuildTool: vscode project generation fixes
#jira UE-129894
#jira UE-133193
#jira UE-133199
#rb trivial
#rnx
#preflight 61fd730ab145346c9e89ee26

[CL 18868837 by Joe Kirchoff in ue5-main branch]
2022-02-04 13:55:56 -05:00
jeff fisher
c1958b0acd UE-136919 //UE5/Main - Compile UnrealGame HoloLens - No required compiler toolchain found
-The build machine was trying to use a locally installed toolchain that did not have the arm64 toolchain installed.
-We now identify toolchains with arm64 support and select from only those for arm64 builds.
#rb Joe.Kirchoff, Josh.Adams
#jira UE-136919
#preflight

#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 18665835 in //UE5/Release-5.0/... via CL 18665840 via CL 18665864
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v901-18665521)

[CL 18665888 by jeff fisher in ue5-main branch]
2022-01-19 16:20:07 -05:00
jonathan adamczewski
5c48869c86 UnrealBuildTool: rename MasterProject settings as PrimaryProject, and some other uses of 'master'
Variable, function and class renames only. XML-facing variables included deprecated support for the old names.

Renaming of the MasterProjectName.txt file will be handled in a subsequent change.

#jira none
#preflight 61d8a162ec35d1b940f74818

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18550269 in //UE5/Release-5.0/... via CL 18550308
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18550325 by jonathan adamczewski in ue5-release-engine-test branch]
2022-01-07 15:40:01 -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
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -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
joe kirchoff
73856b7e60 [Backout] - CL17543621
[FYI] Joe.Kirchoff
Original CL Desc
-----------------------------------------------------------------
ProjectGeneration: Don't filter out engine by default for -game

#jira UE-122365
#rb none
#rnx

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

[CL 17543756 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 16:05:14 -04:00
joe kirchoff
639beb2725 ProjectGeneration: Don't filter out engine by default for -game
#jira UE-122365
#rb none
#rnx

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

[CL 17543624 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 15:52:48 -04:00
joe kirchoff
ec90df19ec Don't add all DotNet and Engine programs to -game specific generated projects by default
#jira UE-122365
#rb none

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

[CL 17542171 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 14:14:17 -04:00
joe kirchoff
c70a4812aa VsCodeProjectGen: Remove references to UE4 and fix some old references that weren't updated
#rb trivial
#rnx

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

[CL 17127089 by joe kirchoff in ue5-release-engine-test branch]
2021-08-10 19:00:34 -04:00
joe kirchoff
efcc4cc23e Add sourceFileMap to generated vs code launch.json for installed builds, so the debugger can load source files correctly when debugging the editor
#jira UE-116120
#rb none

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

[CL 17122338 by joe kirchoff in ue5-release-engine-test branch]
2021-08-10 15:31:15 -04:00
joe kirchoff
b8b683acbe UnrealBuildTool: Distinguish Internal from Public API
Support "Internal" include directory that will only be added to a Referencing module if the referenced module has the same scope. Intent is to to "hide" APIs from external modules that do not need to include headers that are intended for internal module use only.

#jira UE-112188
#rb Ben.Marsh
#preflight 610085314cd79300016e7269

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

[CL 16976411 by joe kirchoff in ue5-release-engine-test branch]
2021-07-27 19:39:41 -04:00
james singer
945061f8a4 Modify vscode project file generation for linux so that UE types are visualized properly
PR #4509

#rb brandon.schaefer
#jira UE-55373

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

[CL 16928663 by james singer in ue5-release-engine-test branch]
2021-07-22 14:43:32 -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
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
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
james singer
2bd6138302 Add launch options to VSCodeProjectFileGenerator that allow attaching to a running process or debugging a core file
#jira UE-92630
#rb Joakim.Lindqvist
#fyi brandon.schaefer

[CL 16403824 by james singer in ue5-main branch]
2021-05-20 11:16:49 -04:00
jonathan adamczewski
6ea321339f VSCodeProjectFileGenerator.cs:
IsRunningOnMono -> !IsRunningOnWindows

#trivial
#jira none

[CL 16175242 by jonathan adamczewski in ue5-main branch]
2021-04-30 21:02:50 -04:00