Commit Graph

323 Commits

Author SHA1 Message Date
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -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
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -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
mark lintott
53511dcacd #jira UE-104748
#rb Ben.Marsh

Renamed UE4.natvis to Unreal.natvis
Fixed up Project File Generator within the Unreal Build Tool

[CL 15009828 by mark lintott in ue5-main branch]
2021-01-07 10:21:33 -04:00
will damon
4dd3568c5f Rename UE4EditorServices to UnrealEditorServices
- Rename files/folders.
- Rename output targets.
- Fixup icon reference in Info.plist

#rb brandon.schaefer rolando.caloca
#review-15004124 @rolando.caloca @brandon.schaefer
#jira UE-104770
#rnx

[CL 15004464 by will damon in ue5-main branch]
2021-01-06 18:21:17 -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
d841d84ddb Missing files.
#rb none
#rnx

[CL 14962041 by Ben Marsh in ue5-main branch]
2020-12-21 22:17:17 -04:00
Ben Marsh
f86c977d59 Forking DotNETUtilities into EpicGames.Common, to allow unification with Horde. Uses Core-style hierarchical naming, and excludes classes that have counterparts in NET Core. DotNETUtilities will be deprecated/made as a wrapper around EpicGames.Common.
#rb none
#rnx

[CL 14961221 by Ben Marsh in ue5-main branch]
2020-12-21 11:50:46 -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
Joakim Lindqvist
d8d0d66650 Fixed issues in generated VSCode project that wasnt correctly generating dotnet build commands to build UBT.
#rb none

[CL 14954317 by Joakim Lindqvist in ue5-main branch]
2020-12-18 07:55:13 -04:00
Phillip Kavan
11c00323ea Remove exposed parts of the Blueprint nativization feature (deprecated), and decouple it from the editor/cooking phase.
#jira UE-103261
#rb Michael.Noland

[CL 14882147 by Phillip Kavan in ue5-main branch]
2020-12-08 16:28:03 -04:00
Joakim Lindqvist
302f1f8ddd UBT can now filter out any project which requires dotnet support from the solution, which we do for VS2017 as it does not support Dotnet Core 3+
#rb ben.marsh

[CL 14855498 by Joakim Lindqvist in ue5-main branch]
2020-12-04 12:20:48 -04:00
Josh Adams
b2e578ee68 - Fixed debugging AutomationTool in Visual Studio with netCore changes
#rb joakim.lindqvist

[CL 14836195 by Josh Adams in ue5-main branch]
2020-12-02 12:57:17 -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
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Joakim Lindqvist
b4d3e129ca Moved logic for finding automation tool projects into msbuild, making the generated .reference file from UBT redundant.
This makes it possible to build UAT with these references without having to run UBT first. Thus also fixes net core building of the project.

This adds about 5 seconds to the build time of automation tool but eliminates the need to run UBT and should avoid the need to implement -compile in UAT (in the end saving more then these 5 seconds)

This essentially does the same as UBT did before, create a .reference file on disk that can then be read by msbuild, it just does this in msbuild as well so we have fewer components involved.

#rb ben.marsh

[CL 14640899 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:00:07 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Joakim Lindqvist
394b90b098 UBT changes required for netcore projects.
* Added support for more complex Msbuild conditions (using static property methods) as we use this to do per platform checks in the csprojs.
* Tweaks to the parsing of csprojs as expecations are different for netcore (mostly for how configurations are defined)
* Lastly if -dotnetcore flag is present when generating projects, use the netcore project files instead.

#rb ben.marsh

[CL 14572331 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:08:01 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Joakim Lindqvist
28a2dc4fe7 Unreal VS 1.57
* Improved detection of UE solution by using a special section outputted to the solution, this replaces the need to add a special comment into the solution (or relying on naming convention as was the fallback). This still works with the old conventions to support being used in a UE4 solution.
* Inverted Quickbuild menu to dynamically populate the platforms instead - this allows UnrealVS to data drive the platform list. Unfortunatley due to how visual studio UI handles dynamic lists we can not have a menu that is dynamic and has children. Thus configurations are now hard coded instead - these are still only visible when they are actually supported, but it means UnrealVS needs to be updated when new configurations are added.
* Fixed issue setting debug arguments to net core projects (due to the change to launchSettings.json to store the debug arguments)

#rb ben.marsh
#jira UE-100134, UE-95503

[CL 14444525 by Joakim Lindqvist in ue5-main branch]
2020-10-08 04:19:43 -04:00
Joakim Lindqvist
4aa09904f2 UnrealBuildTool now supports running as a net core project.
Added a set of netcore csprojs to BuildUtilities and DotnetUtilities that build to a seperate output folder. This allows other tools to still target .net framework (like UAT for instance).
UBT is still by default targeted as .net framework.

Note that UBT built for net core has a different output directory Engine/Binaries/DotNet/UnrealBuildTool/UnrealBuildTool.exe - this is due to how a netcore project output looks with signficantly more files that are related to that application (that would be overwritten if using a shared directory).

To opt in to this set UE_USE_DOTNET=1 environment variable.
Please note that due to the changed output directory a lot of tooling will likely break at this point.

#rb ben.marsh

[CL 14419918 by Joakim Lindqvist in ue5-main branch]
2020-10-05 08:13:04 -04:00
Joakim Lindqvist
eebb43e444 Added UnrealEngineGeneratedSolutionVersion tag to generated solution file which is used by UnrealVS to detect that this is a unreal solution. Should fix failure to detect renamed solution in UnrealVS.
#rb none
#jira UE-100134

[CL 14394956 by Joakim Lindqvist in ue5-main branch]
2020-09-25 07:23:43 -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