Commit Graph

459 Commits

Author SHA1 Message Date
Tim Smith
36421e5c91 Minor refactor to UBT plugins.
Added support for props file for UBT plugins.  Needed for packaging of plugins having a ubt plugin

#rnx
#rb trivial
#preflight 62694f6a7f6900cdefa9431c

[CL 19939499 by Tim Smith in ue5-main branch]
2022-04-27 10:30:21 -04:00
DecoyRS
3aec2651f8 PR #9096: Fix missing includes rider (Contributed by DecoyRS)
#tests Tested in Rider
[REVIEW] michael.galetzka

#ROBOMERGE-AUTHOR: charles.lefebvre
#ROBOMERGE-SOURCE: CL 19827801 via CL 19827806 via CL 19827811
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v940-19807014)

[CL 19835115 by DecoyRS in ue5-main branch]
2022-04-20 14:39:08 -04:00
chris constantinescu
28111d40fc Redundancy cleanup in UBT Low Level Tests:
- test-specific targets and modules are constructed by RulesAssembly which removes a lot of spaghetti code
- no more excluding the Tests folder by default which is guaranteed to mislead users #fyi Jon.Nabozny
- test compilation in Tests is controlled through WITH_LOW_LEVEL_TESTS
- preparation code for switching tests between Catch2 / TestAutomation Fmwk

Nightly LLT PF 6260431391376845adeb4c40

#rnx
#preflight 62602d50dd47b4ad2173c30b

[CL 19834665 by chris constantinescu in ue5-main branch]
2022-04-20 14:24:59 -04:00
Tim Smith
ee9ae5c66a Adding UBT plugin support currently only used by UHT
#rb jonathan.adamczewski ben.marsh
#preflight 625ff59ace2ef75d47707e74

[CL 19828042 by Tim Smith in ue5-main branch]
2022-04-20 08:27:26 -04:00
jonathan adamczewski
d4f03243e3 Remove various obsolete (deprecated) items in C# code
#jira none
#trivial
#rnx
#preflight 625a32bbde3638cefa4106cb

[CL 19786027 by jonathan adamczewski in ue5-main branch]
2022-04-18 11:27:53 -04:00
Josh Adams
a5ae97e75e - Look in Restricted directories for Shared projects
#rb ryan.durand
#jira none
#preflight 6258429a7a394d0082a8aa06

[CL 19758221 by Josh Adams in ue5-main branch]
2022-04-14 12:01:29 -04:00
Josh Adams
fa845ed9b9 - VSMac project generation now takes into account projects that are windows only, and doesn't attempt to put them into the solution
- Don't make solution folders if there are no projects anywhere in them
- Fixed MemProfiler2.csproj to open on VSMac (although now with the above it is skipped anyway because it requires windows - but if we make it not require windows, we'd need this fix to match what UBT does)
#jira none
#rb tim.smith
#preflight 6255a8bfcd5ed4dd091a8ece

[CL 19725910 by Josh Adams in ue5-main branch]
2022-04-12 14:29:41 -04:00
Tim Smith
d87a922dfb UBT will now find "Shared" C# project files in the Restricted directories.
#rb joe.kirchoff
#rnx
#preflight 6255ab7b3f5641db59f99e0b

[CL 19724399 by Tim Smith in ue5-main branch]
2022-04-12 13:15:41 -04:00
Josh Adams
604aec8368 - Allow for multiple full sdks for a platform (uses a new SDKCollection class to gather sdk versions and their validityt, etc)
- Windows will be first to use it, but in a future CL, with toolchain separate from Windows SDK
- Cleaned up some of the PlatformSDK API to have fewer public members (mainly so the functions that receive multiple versions can be automatically populated with the current single version functions in the subclasses)
- Updated the Turnkey menu to handle multiple versions

#jira none
#rb david.harvey
#preflight 62508cd8f10bcc0f4fa8b5d1

[CL 19692492 by Josh Adams in ue5-main branch]
2022-04-08 15:34:51 -04:00
jonathan adamczewski
c12d99d854 .net6.0 is not supported in VS2019. Suppress warnings about that when using that IDE (with this change, when building UnrealBuildTool & AutomationTool)
#jira none
#rnx
#rb joe.kirchoff
#preflight 624f2c163c2aff69c54ff9eb

[CL 19675097 by jonathan adamczewski in ue5-main branch]
2022-04-07 15:06:02 -04:00
Devin Doucette
00c5ef381d UBT: Added VSTestRunSettingsFile to TargetRules
#preflight 624e09ca14634fba5c9563f6
#rb Jonathan.Adamczewski
#fyi Chris.Constantinescu

[CL 19661383 by Devin Doucette in ue5-main branch]
2022-04-06 20:50:46 -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
20f2f20862 UnrealBuildTool: Use dotnet UnrealBuildTool.dll (with correct path) for Make and QMake generated files
#jira UE-147258
#fyi Brandon.Schaefer
#rnx
#preflight none

[CL 19613090 by jonathan adamczewski in ue5-main branch]
2022-04-04 14:46:09 -04:00
Josh Adams
3a60b1efab - Moved most of the remaining SDK discovery/versioning from UEBuildWindows.cs to MicrosoftPlatformSDK.cs
#preflight 62476ac7f73c316f680e9ad3
#rb joe.kirchoff
#jira none

[CL 19604020 by Josh Adams in ue5-main branch]
2022-04-03 15:04:38 -04:00
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
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
David Harvey
a3e5c385b5 Debugger arguments are set up correctly for Windows-based platform extensions
#jira UE-146417, UE-131865
#rnx
#preflight 6239e2dadb0f61c7925d2989
#rb Eric.McDaniel

[CL 19492929 by David Harvey in ue5-main branch]
2022-03-24 05:42:08 -04:00
Joe Kirchoff
82466ed8be UnrealBuildTool: Fix engine modules being filtered out of generated projects when programs should not be added
#jira UE-146426
#rnx
#rb trivial
#preflight 62338ddd0820efd0945ea479

[CL 19427071 by Joe Kirchoff in ue5-main branch]
2022-03-17 17:05:06 -04:00
dave hunter
25be456263 Engine targets for Mac installed builds
This forces UBT to always include an engine target for Mac installed builds

#jira UE-142717
#rnx
[REVIEW] [at]will.damon
#preflight none

#ROBOMERGE-AUTHOR: dave.hunter
#ROBOMERGE-SOURCE: CL 19247899 in //UE5/Release-5.0/... via CL 19251731
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19263217 by dave hunter in ue5-main branch]
2022-03-04 03:24:38 -05:00
Tim Smith
2bf67af6e7 UHT in UBT initial version. Currently disabled.
Tested against UnrealEditor, ShooterGame, QAGame, FortniteGame, Lyra, CitySample, and a local project

Ciode review was a preliminary review for a coding style.

#rnx
#rb jonathan.adamczewski, joe.kirchoff
#preflight 6220cfb76f26901529b6514e

[CL 19243710 by Tim Smith in ue5-main branch]
2022-03-03 09:59:05 -05: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
jonathan adamczewski
2c3a702a8c Upgrade to nuget package Microsoft.Win32.Registry 5.0.0
#trivial
#jira none
#rnx
#preflight 62149c809e2201e214fe1a6c

[CL 19076594 by jonathan adamczewski in ue5-main branch]
2022-02-22 13:52:23 -05:00
jack porter
ba5e2d8634 Always include a UE5 target when generating an Xcode project file for a blueprint project for codesigning
#jira UE-132318
#rb Carl.Lloyd
[REVIEW]
#preflight NoneForApplePlatforms
[FYI] jonathan.adamczewski, will.damon

#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 18901387 in //UE5/Release-5.0/... via CL 18901434 via CL 18901520
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v912-18901109)

[CL 18901521 by jack porter in ue5-main branch]
2022-02-08 09:13:59 -05:00