Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts: # Source/Editor/Modules/ContentDatabaseModule.cs # Source/Editor/Surface/SurfaceUtils.cs # Source/Editor/Windows/Assets/MaterialInstanceWindow.cs # Source/Engine/Foliage/Foliage.cpp # Source/Engine/Graphics/Models/MeshBase.h # Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
This commit is contained in:
@@ -289,6 +289,17 @@ bool DeployDataStep::Perform(CookingData& data)
|
||||
}
|
||||
}
|
||||
|
||||
// Remove any leftover files copied from .NET SDK that are not needed by the engine runtime
|
||||
{
|
||||
Array<String> files;
|
||||
FileSystem::DirectoryGetFiles(files, dstDotnet, TEXT("*.exe"));
|
||||
for (const String& file : files)
|
||||
{
|
||||
LOG(Info, "Removing '{}'", FileSystem::ConvertAbsolutePathToRelative(dstDotnet, file));
|
||||
FileSystem::DeleteFile(file);
|
||||
}
|
||||
}
|
||||
|
||||
// Optimize deployed C# class library (remove DLLs unused by scripts)
|
||||
if (aotMode == DotNetAOTModes::None && buildSettings.SkipUnusedDotnetLibsPackaging)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user