diff --git a/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.cpp b/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.cpp index ad8697ecd..d493c5b0b 100644 --- a/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.cpp +++ b/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.cpp @@ -42,21 +42,6 @@ DotNetAOTModes UWPPlatformTools::UseAOT() const return DotNetAOTModes::MonoAOTDynamic; } -bool UWPPlatformTools::OnScriptsStepDone(CookingData& data) -{ - // Override Newtonsoft.Json.dll for some platforms (that don't support runtime code generation) - const String customBinPath = data.GetPlatformBinariesRoot() / TEXT("Newtonsoft.Json.dll"); - const String assembliesPath = data.ManagedCodeOutputPath; - if (FileSystem::CopyFile(assembliesPath / TEXT("Newtonsoft.Json.dll"), customBinPath)) - { - data.Error(TEXT("Failed to copy deploy custom assembly.")); - return true; - } - FileSystem::DeleteFile(assembliesPath / TEXT("Newtonsoft.Json.pdb")); - - return false; -} - bool UWPPlatformTools::OnDeployBinaries(CookingData& data) { const auto platformDataPath = Globals::StartupFolder / TEXT("Source/Platforms"); @@ -417,7 +402,7 @@ bool UWPPlatformTools::OnDeployBinaries(CookingData& data) bool UWPPlatformTools::OnPostProcess(CookingData& data) { - LOG(Error, "UWP (Windows Store) platform has been deprecated and soon will be removed!"); + LOG(Error, "UWP (Windows Store) platform has been deprecated and is no longer supported"); // Special case for UWP // FlaxEngine.dll cannot be added to the solution as `Content` item (due to conflicts with C++ /CX FlaxEngine.dll) diff --git a/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.h b/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.h index 54c88305c..d9b6673d6 100644 --- a/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.h +++ b/Source/Editor/Cooker/Platform/UWP/UWPPlatformTools.h @@ -30,7 +30,6 @@ public: PlatformType GetPlatform() const override; ArchitectureType GetArchitecture() const override; DotNetAOTModes UseAOT() const override; - bool OnScriptsStepDone(CookingData& data) override; bool OnDeployBinaries(CookingData& data) override; bool OnPostProcess(CookingData& data) override; }; diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs index d80e2d0d8..f3fd753d1 100644 --- a/Source/Editor/Windows/GameCookerWindow.cs +++ b/Source/Editor/Windows/GameCookerWindow.cs @@ -280,7 +280,7 @@ namespace FlaxEditor.Windows break; case PlatformType.UWP: name = "Windows Store"; - layout.Label("UWP (Windows Store) platform has been deprecated and soon will be removed!", TextAlignment.Center).Label.TextColor = Color.Red; + layout.Label("UWP (Windows Store) platform has been deprecated and is no longer supported", TextAlignment.Center).Label.TextColor = Color.Red; break; case PlatformType.Linux: name = "Linux"; diff --git a/Source/Tools/Flax.Build/Platforms/UWP/UWPToolchain.cs b/Source/Tools/Flax.Build/Platforms/UWP/UWPToolchain.cs index d35805dfb..912994ab3 100644 --- a/Source/Tools/Flax.Build/Platforms/UWP/UWPToolchain.cs +++ b/Source/Tools/Flax.Build/Platforms/UWP/UWPToolchain.cs @@ -50,7 +50,7 @@ namespace Flax.Build.Platforms { base.LogInfo(); - Log.Error("UWP (Windows Store) platform has been deprecated and soon will be removed!"); + Log.Error("UWP (Windows Store) platform has been deprecated and is no longer supported!"); } ///