From 24266b64da611e8c6f429a628d1d3f42fbe82656 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 11 Dec 2024 14:24:06 +0100 Subject: [PATCH] Fix Continuous Deployment --- Source/ThirdParty/rapidjson/reader.h | 2 +- Source/Tools/Flax.Build/Deploy/Deployer.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/ThirdParty/rapidjson/reader.h b/Source/ThirdParty/rapidjson/reader.h index a61a94ec5..84dcf5b5c 100644 --- a/Source/ThirdParty/rapidjson/reader.h +++ b/Source/ThirdParty/rapidjson/reader.h @@ -1189,7 +1189,7 @@ private: d = NAN; } else if (RAPIDJSON_LIKELY(Consume(s, 'I') && Consume(s, 'n') && Consume(s, 'f'))) { - d = (minus ? -INFINITY : INFINITY); + d = (double)(minus ? -INFINITY : INFINITY); if (RAPIDJSON_UNLIKELY(s.Peek() == 'i' && !(Consume(s, 'i') && Consume(s, 'n') && Consume(s, 'i') && Consume(s, 't') && Consume(s, 'y')))) RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell()); diff --git a/Source/Tools/Flax.Build/Deploy/Deployer.cs b/Source/Tools/Flax.Build/Deploy/Deployer.cs index c9809a97d..6b68a41c4 100644 --- a/Source/Tools/Flax.Build/Deploy/Deployer.cs +++ b/Source/Tools/Flax.Build/Deploy/Deployer.cs @@ -1,5 +1,7 @@ // Copyright (c) 2012-2024 Flax Engine. All rights reserved. +#define USE_STD + using System; using System.IO; using System.Text; @@ -99,6 +101,9 @@ namespace Flax.Deploy Log.Info("Compressing game debug symbols files..."); var gamePackageZipPath = Path.Combine(Deployer.PackageOutputPath, "GameDebugSymbols.zip"); Utilities.FileDelete(gamePackageZipPath); +#if USE_STD + System.IO.Compression.ZipFile.CreateFromDirectory(Path.Combine(Deployer.PackageOutputPath, "GameDebugSymbols"), gamePackageZipPath, System.IO.Compression.CompressionLevel.Optimal, false); +#else using (var zip = new Ionic.Zip.ZipFile()) { zip.AddDirectory(Path.Combine(Deployer.PackageOutputPath, "GameDebugSymbols")); @@ -106,6 +111,7 @@ namespace Flax.Deploy zip.Comment = string.Format("Flax Game {0}.{1}.{2}\nDate: {3}", Deployer.VersionMajor, Deployer.VersionMinor, Deployer.VersionBuild, DateTime.UtcNow); zip.Save(gamePackageZipPath); } +#endif Log.Info("Compressed game debug symbols package size: " + Utilities.GetFileSize(gamePackageZipPath)); } Utilities.DirectoryDelete(Path.Combine(Deployer.PackageOutputPath, "GameDebugSymbols"));