jack porter dcb36dc03d Fix merge error breaking iOS remote build ...

#rb trivial
#jira UE-108593

#ROBOMERGE-SOURCE: CL 15429402 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15429407 by jack porter in ue5-main branch]

2021-02-17 01:00:07 -04:00

..

Linux

Merge Release-Engine-Staging to Main @ CL# 15151250

2021-01-21 16:22:06 -04:00

Mac

Fix merge error breaking iOS remote build

2021-02-17 01:00:07 -04:00

Build.bat

Removed extra call to GetDotnetPath which was caused by a incorrect merge in change 14834347

2021-01-12 08:20:11 -04:00

BuildThirdPartyLibs.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

Clean.bat

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.

2020-12-02 06:57:13 -04:00

DocsPreviewPage.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

FixDependencyFiles.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

GenerateProjectFiles.bat

Switched over to dotnet msbuild from dotnet build (which just calls msbuild anyway).

2020-12-03 07:08:20 -04:00

GetDotnetPath.bat

Improved output of using bundled dotnet sdk

2020-12-02 07:28:29 -04:00

GetMSBuildPath.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

GetVSComnToolsPath.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

MakeAndInstallSSHKey.bat

Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)

2020-06-23 18:40:00 -04:00

MSBuild.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

Rebuild.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

RunUAT_LocalTest.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

RunUAT.bat

Switched over to dotnet msbuild from dotnet build (which just calls msbuild anyway).

2020-12-03 07:08:20 -04:00

RunUAT.command

…

RunUAT.sh

Removed node reuse and shared compilation flags for RunUAT.sh, these were not inteded to be submitted. They would disable the worker nodes which means we will now dotnet process hosting msbuild left after the build, which is annoying but a fairly substantial speed up. This is consistent with how RunUAT works on windows.

2020-12-17 12:39:35 -04:00

RunUATTest.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

RunUBT.bat

Switched over to dotnet msbuild from dotnet build (which just calls msbuild anyway).

2020-12-03 07:08:20 -04:00

RunUBT.sh

Switched over to dotnet msbuild from dotnet build (which just calls msbuild anyway).

2020-12-03 07:08:20 -04:00

SyncToRemotePC.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00

TestCrashes.bat

Merging latest from Private-Starship.

2020-05-05 18:50:52 -04:00