From 857964aced96c722d3ece679dd47f393b78a323e Mon Sep 17 00:00:00 2001 From: rfuzzo Date: Thu, 9 Feb 2023 15:01:53 +0100 Subject: [PATCH 1/2] fix: remove manager caching, it loads fast enough --- WolvenKit.App/Controllers/Configuration.cs | 6 +- WolvenKit.App/Controllers/MainController.cs | 218 ++------------------ WolvenKit.App/Enums.cs | 15 +- WolvenKit.Bundles/Bundle.cs | 7 +- WolvenKit.Bundles/BundleManager.cs | 4 +- WolvenKit.CR2W/WolvenKit.CR2W.csproj | 2 +- WolvenKit.sln | 140 ------------- 7 files changed, 22 insertions(+), 370 deletions(-) diff --git a/WolvenKit.App/Controllers/Configuration.cs b/WolvenKit.App/Controllers/Configuration.cs index 30749a40a..fa42858ff 100644 --- a/WolvenKit.App/Controllers/Configuration.cs +++ b/WolvenKit.App/Controllers/Configuration.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Xml.Serialization; @@ -40,7 +40,7 @@ public static string ConfigurationPath public bool IsWelcomeFormDisabled { get; set; } public bool IsAutoInstallModsDisabled { get; set; } - public string[] ManagerVersions { get; set; } = new string[(int)EManagerType.Max]; + //public string[] ManagerVersions { get; set; } = new string[(int)EManagerType.Max]; public string GameModDir { get; set; } public string GameDlcDir { get; set; } @@ -94,4 +94,4 @@ public static Configuration Load() }; } } -} \ No newline at end of file +} diff --git a/WolvenKit.App/Controllers/MainController.cs b/WolvenKit.App/Controllers/MainController.cs index 82cbefb4c..5f0756267 100644 --- a/WolvenKit.App/Controllers/MainController.cs +++ b/WolvenKit.App/Controllers/MainController.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.IO; @@ -225,36 +225,7 @@ public static void LogProgress(int value) #endregion #region Methods - private static string GetManagerPath(EManagerType type) - { - switch (type) - { - case EManagerType.BundleManager: return Path.Combine(ManagerCacheDir, "bundle_cache.json"); - case EManagerType.CollisionManager: return Path.Combine(ManagerCacheDir, "collision_cache.json"); - case EManagerType.SoundManager: return Path.Combine(ManagerCacheDir, "sound_cache.json"); - case EManagerType.W3StringManager: return Path.Combine(ManagerCacheDir, "string_cache.bin"); - case EManagerType.TextureManager: return Path.Combine(ManagerCacheDir, "texture_cache.json"); - case EManagerType.Max: - default: - throw new ArgumentOutOfRangeException(nameof(type), type, null); - } - } - private static string GetManagerVersion(EManagerType type) - { - switch (type) - { - case EManagerType.BundleManager: return BundleManager.SerializationVersion; - case EManagerType.CollisionManager: return WolvenKit.Cache.CollisionManager.SerializationVersion; - case EManagerType.SoundManager: return WolvenKit.Cache.SoundManager.SerializationVersion; - case EManagerType.W3StringManager: return W3Strings.W3StringManager.SerializationVersion; - case EManagerType.TextureManager: return WolvenKit.Cache.TextureManager.SerializationVersion; - case EManagerType.Max: - default: - throw new ArgumentOutOfRangeException(nameof(type), type, null); - } - } - - + /// /// Initializes the archive managers in an async thread /// @@ -263,20 +234,6 @@ public async Task Initialize() { try { - // add a mechanism to update individual cache managers - for (var j = 0; j < Configuration.ManagerVersions.Length; j++) - { - var savedversions = Configuration.ManagerVersions[j]; - var e = (EManagerType)j; - var curversion = GetManagerVersion(e); - - if (savedversions != curversion) - { - if (File.Exists(GetManagerPath(e))) - File.Delete(GetManagerPath(e)); - } - } - //multithread these var loadStringsManagerTask = LoadStringsManager(); var loadBundleManagerTask = LoadBundleManager(); @@ -362,35 +319,8 @@ private async Task LoadStringsManager() sw.Start(); if (W3StringManager == null) { - try - { - if (File.Exists(GetManagerPath(EManagerType.W3StringManager)) && new FileInfo(GetManagerPath(EManagerType.W3StringManager)).Length > 0) - { - using (var file = File.Open(GetManagerPath(EManagerType.W3StringManager), FileMode.Open)) - { - W3StringManager = ProtoBuf.Serializer.Deserialize(file); - } - } - else - { - W3StringManager = new W3StringManager(); - W3StringManager.Load(Configuration.TextLanguage, Path.GetDirectoryName(Configuration.ExecutablePath)); - Directory.CreateDirectory(ManagerCacheDir); - using (var file = File.Open(GetManagerPath(EManagerType.W3StringManager), FileMode.Create)) - { - ProtoBuf.Serializer.Serialize(file, W3StringManager); - } - - Configuration.ManagerVersions[(int)EManagerType.W3StringManager] = W3StringManager.SerializationVersion; - } - } - catch (System.Exception) - { - if (File.Exists(GetManagerPath(EManagerType.W3StringManager))) - File.Delete(GetManagerPath(EManagerType.W3StringManager)); - W3StringManager = new W3StringManager(); - W3StringManager.Load(Configuration.TextLanguage, Path.GetDirectoryName(Configuration.ExecutablePath)); - } + W3StringManager = new W3StringManager(); + W3StringManager.Load(Configuration.TextLanguage, Path.GetDirectoryName(Configuration.ExecutablePath)); } var i = sw.ElapsedMilliseconds; @@ -404,39 +334,8 @@ private async Task LoadBundleManager() #region Load bundle manager if (BundleManager == null) { - try - { - if (File.Exists(GetManagerPath(EManagerType.BundleManager))) - { - using (StreamReader file = File.OpenText(GetManagerPath(EManagerType.BundleManager))) - { - JsonSerializer serializer = new JsonSerializer(); - serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - serializer.PreserveReferencesHandling = PreserveReferencesHandling.Objects; - serializer.TypeNameHandling = TypeNameHandling.Auto; - BundleManager = (BundleManager)serializer.Deserialize(file, typeof(BundleManager)); - } - } - else - { - BundleManager = new BundleManager(); - BundleManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - File.WriteAllText(GetManagerPath(EManagerType.BundleManager), JsonConvert.SerializeObject(BundleManager, Formatting.None, new JsonSerializerSettings() - { - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - PreserveReferencesHandling = PreserveReferencesHandling.Objects, - TypeNameHandling = TypeNameHandling.Auto - })); - Configuration.ManagerVersions[(int)EManagerType.BundleManager] = BundleManager.SerializationVersion; - } - } - catch (System.Exception ex) - { - if (File.Exists(GetManagerPath(EManagerType.BundleManager))) - File.Delete(GetManagerPath(EManagerType.BundleManager)); - BundleManager = new BundleManager(); - BundleManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - } + BundleManager = new BundleManager(); + BundleManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); } #endregion } @@ -447,39 +346,8 @@ private async Task LoadTextureManager() #region Load texture manager if (TextureManager == null) { - try - { - if (File.Exists(GetManagerPath(EManagerType.TextureManager))) - { - using (StreamReader file = File.OpenText(GetManagerPath(EManagerType.TextureManager))) - { - JsonSerializer serializer = new JsonSerializer(); - serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - serializer.PreserveReferencesHandling = PreserveReferencesHandling.Objects; - serializer.TypeNameHandling = TypeNameHandling.Auto; - TextureManager = (TextureManager)serializer.Deserialize(file, typeof(TextureManager)); - } - } - else - { - TextureManager = new TextureManager(); - TextureManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - File.WriteAllText(GetManagerPath(EManagerType.TextureManager), JsonConvert.SerializeObject(TextureManager, Formatting.None, new JsonSerializerSettings() - { - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - PreserveReferencesHandling = PreserveReferencesHandling.Objects, - TypeNameHandling = TypeNameHandling.Auto - })); - Configuration.ManagerVersions[(int)EManagerType.TextureManager] = TextureManager.SerializationVersion; - } - } - catch (System.Exception) - { - if (File.Exists(GetManagerPath(EManagerType.TextureManager))) - File.Delete(GetManagerPath(EManagerType.TextureManager)); - TextureManager = new TextureManager(); - TextureManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - } + TextureManager = new TextureManager(); + TextureManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); } #endregion } @@ -490,39 +358,8 @@ private async Task LoadCollisionManager() #region Load collision manager if (CollisionManager == null) { - try - { - if (File.Exists(GetManagerPath(EManagerType.CollisionManager))) - { - using (StreamReader file = File.OpenText(GetManagerPath(EManagerType.CollisionManager))) - { - JsonSerializer serializer = new JsonSerializer(); - serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - serializer.PreserveReferencesHandling = PreserveReferencesHandling.Objects; - serializer.TypeNameHandling = TypeNameHandling.Auto; - CollisionManager = (CollisionManager)serializer.Deserialize(file, typeof(CollisionManager)); - } - } - else - { - CollisionManager = new CollisionManager(); - CollisionManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - File.WriteAllText(GetManagerPath(EManagerType.CollisionManager), JsonConvert.SerializeObject(CollisionManager, Formatting.None, new JsonSerializerSettings() - { - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - PreserveReferencesHandling = PreserveReferencesHandling.Objects, - TypeNameHandling = TypeNameHandling.Auto - })); - Configuration.ManagerVersions[(int)EManagerType.CollisionManager] = CollisionManager.SerializationVersion; - } - } - catch (System.Exception) - { - if (File.Exists(GetManagerPath(EManagerType.CollisionManager))) - File.Delete(GetManagerPath(EManagerType.CollisionManager)); - CollisionManager = new CollisionManager(); - CollisionManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - } + CollisionManager = new CollisionManager(); + CollisionManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); } #endregion } @@ -533,39 +370,8 @@ private async Task LoadSoundManager() #region Load sound manager if (SoundManager == null) { - try - { - if (File.Exists(GetManagerPath(EManagerType.SoundManager))) - { - using (StreamReader file = File.OpenText(GetManagerPath(EManagerType.SoundManager))) - { - JsonSerializer serializer = new JsonSerializer(); - serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; - serializer.PreserveReferencesHandling = PreserveReferencesHandling.Objects; - serializer.TypeNameHandling = TypeNameHandling.Auto; - SoundManager = (SoundManager)serializer.Deserialize(file, typeof(SoundManager)); - } - } - else - { - SoundManager = new SoundManager(); - SoundManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - File.WriteAllText(GetManagerPath(EManagerType.SoundManager), JsonConvert.SerializeObject(SoundManager, Formatting.None, new JsonSerializerSettings() - { - ReferenceLoopHandling = ReferenceLoopHandling.Ignore, - PreserveReferencesHandling = PreserveReferencesHandling.Objects, - TypeNameHandling = TypeNameHandling.Auto - })); - Configuration.ManagerVersions[(int)EManagerType.SoundManager] = SoundManager.SerializationVersion; - } - } - catch (System.Exception ex) - { - if (File.Exists(GetManagerPath(EManagerType.SoundManager))) - File.Delete(GetManagerPath(EManagerType.SoundManager)); - SoundManager = new SoundManager(); - SoundManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); - } + SoundManager = new SoundManager(); + SoundManager.LoadAll(Path.GetDirectoryName(Configuration.ExecutablePath)); } #endregion } diff --git a/WolvenKit.App/Enums.cs b/WolvenKit.App/Enums.cs index c7b58ab4c..341e024ba 100644 --- a/WolvenKit.App/Enums.cs +++ b/WolvenKit.App/Enums.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,18 +6,7 @@ namespace WolvenKit.App { - /// - /// Enumeration of serialized Managers - /// - public enum EManagerType - { - BundleManager = 0, - CollisionManager = 1, - SoundManager = 2, - W3StringManager = 3, - TextureManager = 4, - Max = 5, - } + diff --git a/WolvenKit.Bundles/Bundle.cs b/WolvenKit.Bundles/Bundle.cs index a4254070e..162915aea 100644 --- a/WolvenKit.Bundles/Bundle.cs +++ b/WolvenKit.Bundles/Bundle.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -107,9 +107,6 @@ private void Read() Console.WriteLine("Warning: Bundle '" + ArchiveAbsolutePath + "' could not be fully loaded as resource '" + item.Name + "' is defined more than once. Thus, only the first definition was loaded."); } } - - - reader.Close(); } } @@ -238,4 +235,4 @@ public static string GetRelativePath(string filespec, string folder) return Uri.UnescapeDataString(folderUri.MakeRelativeUri(pathUri).ToString().Replace('/', Path.DirectorySeparatorChar)); } } -} \ No newline at end of file +} diff --git a/WolvenKit.Bundles/BundleManager.cs b/WolvenKit.Bundles/BundleManager.cs index 22e3fd783..5eda256b5 100644 --- a/WolvenKit.Bundles/BundleManager.cs +++ b/WolvenKit.Bundles/BundleManager.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Linq.Expressions; @@ -69,7 +69,7 @@ public override void LoadBundle(string filename, bool ispatch = false) // if file is already in another bundle if (ispatch && Items[item.Key].Count > 0) { - // check if file is already in contentN directory (content0, content1 etc) + // check if file is already in content directory (content0, content1 etc) List filesInBundles = Items[item.Key]; var splits = filesInBundles.First().Bundle.ArchiveAbsolutePath.Split(Path.DirectorySeparatorChar); var contentdir = splits[splits.Length - 3]; diff --git a/WolvenKit.CR2W/WolvenKit.CR2W.csproj b/WolvenKit.CR2W/WolvenKit.CR2W.csproj index 967c8d7d8..8c1168fe3 100644 --- a/WolvenKit.CR2W/WolvenKit.CR2W.csproj +++ b/WolvenKit.CR2W/WolvenKit.CR2W.csproj @@ -13,7 +13,7 @@ CS1591 TRACE;NGE_VERSION x64 - true + pdbonly diff --git a/WolvenKit.sln b/WolvenKit.sln index 6b8b199d0..70cf1f03f 100644 --- a/WolvenKit.sln +++ b/WolvenKit.sln @@ -56,217 +56,77 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WolvenKit.CLI", "WolvenKit. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {12FD792B-EC76-4969-8B42-9671025D5108}.Debug|Any CPU.ActiveCfg = Debug|x64 - {12FD792B-EC76-4969-8B42-9671025D5108}.Debug|Any CPU.Build.0 = Debug|x64 {12FD792B-EC76-4969-8B42-9671025D5108}.Debug|x64.ActiveCfg = Debug|x64 {12FD792B-EC76-4969-8B42-9671025D5108}.Debug|x64.Build.0 = Debug|x64 - {12FD792B-EC76-4969-8B42-9671025D5108}.Debug|x86.ActiveCfg = Debug|x64 - {12FD792B-EC76-4969-8B42-9671025D5108}.Debug|x86.Build.0 = Debug|x64 - {12FD792B-EC76-4969-8B42-9671025D5108}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12FD792B-EC76-4969-8B42-9671025D5108}.Release|Any CPU.Build.0 = Release|Any CPU {12FD792B-EC76-4969-8B42-9671025D5108}.Release|x64.ActiveCfg = Release|Any CPU {12FD792B-EC76-4969-8B42-9671025D5108}.Release|x64.Build.0 = Release|Any CPU - {12FD792B-EC76-4969-8B42-9671025D5108}.Release|x86.ActiveCfg = Release|Any CPU - {12FD792B-EC76-4969-8B42-9671025D5108}.Release|x86.Build.0 = Release|Any CPU - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Debug|Any CPU.ActiveCfg = Debug|x64 - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Debug|Any CPU.Build.0 = Debug|x64 {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Debug|x64.ActiveCfg = Debug|x64 {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Debug|x64.Build.0 = Debug|x64 - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Debug|x86.ActiveCfg = Debug|x64 - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Debug|x86.Build.0 = Debug|x64 - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Release|Any CPU.Build.0 = Release|Any CPU {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Release|x64.ActiveCfg = Release|Any CPU {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Release|x64.Build.0 = Release|Any CPU - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Release|x86.ActiveCfg = Release|Any CPU - {F3129E02-31AD-4327-A9EF-7C52D777C71F}.Release|x86.Build.0 = Release|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Debug|x64.ActiveCfg = Debug|x64 {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Debug|x64.Build.0 = Debug|x64 - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Debug|x86.ActiveCfg = Debug|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Debug|x86.Build.0 = Debug|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Release|Any CPU.Build.0 = Release|Any CPU {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Release|x64.ActiveCfg = Release|Any CPU {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Release|x64.Build.0 = Release|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Release|x86.ActiveCfg = Release|Any CPU - {32D40D10-D6C3-48F0-AEB6-0F41C7E75CFD}.Release|x86.Build.0 = Release|Any CPU - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Debug|Any CPU.ActiveCfg = Debug|x64 - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Debug|Any CPU.Build.0 = Debug|x64 {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Debug|x64.ActiveCfg = Debug|x64 {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Debug|x64.Build.0 = Debug|x64 - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Debug|x86.ActiveCfg = Debug|x64 - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Debug|x86.Build.0 = Debug|x64 - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Release|Any CPU.Build.0 = Release|Any CPU {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Release|x64.ActiveCfg = Release|Any CPU {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Release|x64.Build.0 = Release|Any CPU - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Release|x86.ActiveCfg = Release|Any CPU - {5BD2292A-24DB-4B4A-A5B1-5D435769C289}.Release|x86.Build.0 = Release|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Debug|Any CPU.Build.0 = Debug|Any CPU {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Debug|x64.ActiveCfg = Debug|x64 {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Debug|x64.Build.0 = Debug|x64 - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Debug|x86.ActiveCfg = Debug|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Debug|x86.Build.0 = Debug|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Release|Any CPU.Build.0 = Release|Any CPU {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Release|x64.ActiveCfg = Release|Any CPU {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Release|x64.Build.0 = Release|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Release|x86.ActiveCfg = Release|Any CPU - {C025F253-C78B-4A3B-87E7-1B2A1A453B97}.Release|x86.Build.0 = Release|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C026DA7-481D-43C6-8C18-635D69FDB423}.Debug|x64.ActiveCfg = Debug|x64 {9C026DA7-481D-43C6-8C18-635D69FDB423}.Debug|x64.Build.0 = Debug|x64 - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Debug|x86.ActiveCfg = Debug|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Debug|x86.Build.0 = Debug|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Release|Any CPU.Build.0 = Release|Any CPU {9C026DA7-481D-43C6-8C18-635D69FDB423}.Release|x64.ActiveCfg = Release|Any CPU {9C026DA7-481D-43C6-8C18-635D69FDB423}.Release|x64.Build.0 = Release|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Release|x86.ActiveCfg = Release|Any CPU - {9C026DA7-481D-43C6-8C18-635D69FDB423}.Release|x86.Build.0 = Release|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Debug|x64.ActiveCfg = Debug|x64 {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Debug|x64.Build.0 = Debug|x64 - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Debug|x86.ActiveCfg = Debug|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Debug|x86.Build.0 = Debug|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Release|Any CPU.Build.0 = Release|Any CPU {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Release|x64.ActiveCfg = Release|Any CPU {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Release|x64.Build.0 = Release|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Release|x86.ActiveCfg = Release|Any CPU - {031DD6DA-B643-4C2A-A30D-A2E2212724C2}.Release|x86.Build.0 = Release|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Debug|Any CPU.Build.0 = Debug|Any CPU {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Debug|x64.ActiveCfg = Debug|x64 {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Debug|x64.Build.0 = Debug|x64 - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Debug|x86.ActiveCfg = Debug|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Debug|x86.Build.0 = Debug|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Release|Any CPU.Build.0 = Release|Any CPU {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Release|x64.ActiveCfg = Release|Any CPU {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Release|x64.Build.0 = Release|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Release|x86.ActiveCfg = Release|Any CPU - {17CF5901-6E1F-467F-AFE0-3CC04DC9688A}.Release|x86.Build.0 = Release|Any CPU - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Debug|Any CPU.ActiveCfg = Debug|x64 - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Debug|Any CPU.Build.0 = Debug|x64 {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Debug|x64.ActiveCfg = Debug|x64 {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Debug|x64.Build.0 = Debug|x64 - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Debug|x86.ActiveCfg = Debug|x64 - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Debug|x86.Build.0 = Debug|x64 - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Release|Any CPU.Build.0 = Release|Any CPU {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Release|x64.ActiveCfg = Release|Any CPU {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Release|x64.Build.0 = Release|Any CPU - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Release|x86.ActiveCfg = Release|Any CPU - {F60B8974-617D-45B5-BD33-68A9F739DE4F}.Release|x86.Build.0 = Release|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Debug|x64.ActiveCfg = Debug|x64 {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Debug|x64.Build.0 = Debug|x64 - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Debug|x86.ActiveCfg = Debug|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Debug|x86.Build.0 = Debug|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Release|Any CPU.Build.0 = Release|Any CPU {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Release|x64.ActiveCfg = Release|Any CPU {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Release|x64.Build.0 = Release|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Release|x86.ActiveCfg = Release|Any CPU - {DCBBE807-CD6E-493E-8C04-DB976A1591EA}.Release|x86.Build.0 = Release|Any CPU - {4D1019F1-F099-450F-85B8-697E0332A94F}.Debug|Any CPU.ActiveCfg = Debug|x64 - {4D1019F1-F099-450F-85B8-697E0332A94F}.Debug|Any CPU.Build.0 = Debug|x64 {4D1019F1-F099-450F-85B8-697E0332A94F}.Debug|x64.ActiveCfg = Debug|x64 {4D1019F1-F099-450F-85B8-697E0332A94F}.Debug|x64.Build.0 = Debug|x64 - {4D1019F1-F099-450F-85B8-697E0332A94F}.Debug|x86.ActiveCfg = Debug|x64 - {4D1019F1-F099-450F-85B8-697E0332A94F}.Debug|x86.Build.0 = Debug|x64 - {4D1019F1-F099-450F-85B8-697E0332A94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D1019F1-F099-450F-85B8-697E0332A94F}.Release|Any CPU.Build.0 = Release|Any CPU {4D1019F1-F099-450F-85B8-697E0332A94F}.Release|x64.ActiveCfg = Release|Any CPU {4D1019F1-F099-450F-85B8-697E0332A94F}.Release|x64.Build.0 = Release|Any CPU - {4D1019F1-F099-450F-85B8-697E0332A94F}.Release|x86.ActiveCfg = Release|Any CPU - {4D1019F1-F099-450F-85B8-697E0332A94F}.Release|x86.Build.0 = Release|Any CPU - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Debug|Any CPU.ActiveCfg = Debug|x64 - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Debug|Any CPU.Build.0 = Debug|x64 {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Debug|x64.ActiveCfg = Debug|x64 {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Debug|x64.Build.0 = Debug|x64 - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Debug|x86.ActiveCfg = Debug|x64 - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Debug|x86.Build.0 = Debug|x64 - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Release|Any CPU.Build.0 = Release|Any CPU {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Release|x64.ActiveCfg = Release|Any CPU {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Release|x64.Build.0 = Release|Any CPU - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Release|x86.ActiveCfg = Release|Any CPU - {761C5A00-52E7-49D5-9F4F-7BE7FAF30AC6}.Release|x86.Build.0 = Release|Any CPU - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Debug|Any CPU.ActiveCfg = Debug|x64 - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Debug|Any CPU.Build.0 = Debug|x64 {D4D390BB-C14D-423A-861A-470BED6D40A9}.Debug|x64.ActiveCfg = Debug|x64 {D4D390BB-C14D-423A-861A-470BED6D40A9}.Debug|x64.Build.0 = Debug|x64 - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Debug|x86.ActiveCfg = Debug|x64 - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Debug|x86.Build.0 = Debug|x64 - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Release|Any CPU.Build.0 = Release|Any CPU {D4D390BB-C14D-423A-861A-470BED6D40A9}.Release|x64.ActiveCfg = Release|Any CPU {D4D390BB-C14D-423A-861A-470BED6D40A9}.Release|x64.Build.0 = Release|Any CPU - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Release|x86.ActiveCfg = Release|Any CPU - {D4D390BB-C14D-423A-861A-470BED6D40A9}.Release|x86.Build.0 = Release|Any CPU - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Debug|Any CPU.ActiveCfg = Debug|x64 - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Debug|Any CPU.Build.0 = Debug|x64 {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Debug|x64.ActiveCfg = Debug|x64 {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Debug|x64.Build.0 = Debug|x64 - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Debug|x86.ActiveCfg = Debug|x64 - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Debug|x86.Build.0 = Debug|x64 - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Release|Any CPU.Build.0 = Release|Any CPU {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Release|x64.ActiveCfg = Release|Any CPU - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Release|x86.ActiveCfg = Release|Any CPU - {2E565B66-D038-46B9-B5A5-0EB46F77B47E}.Release|x86.Build.0 = Release|Any CPU - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Debug|Any CPU.ActiveCfg = Debug|x64 - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Debug|Any CPU.Build.0 = Debug|x64 {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Debug|x64.ActiveCfg = Debug|x64 {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Debug|x64.Build.0 = Debug|x64 - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Debug|x86.ActiveCfg = Debug|x64 - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Debug|x86.Build.0 = Debug|x64 - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Release|Any CPU.Build.0 = Release|Any CPU {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Release|x64.ActiveCfg = Release|Any CPU {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Release|x64.Build.0 = Release|Any CPU - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Release|x86.ActiveCfg = Release|Any CPU - {B4343A73-9BF6-4F82-9CCE-F2D5F6BCC9E8}.Release|x86.Build.0 = Release|Any CPU - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Debug|Any CPU.ActiveCfg = Debug|x64 - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Debug|Any CPU.Build.0 = Debug|x64 {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Debug|x64.ActiveCfg = Debug|x64 {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Debug|x64.Build.0 = Debug|x64 - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Debug|x86.ActiveCfg = Debug|x64 - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Debug|x86.Build.0 = Debug|x64 - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Release|Any CPU.Build.0 = Release|Any CPU {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Release|x64.ActiveCfg = Release|Any CPU {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Release|x64.Build.0 = Release|Any CPU - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Release|x86.ActiveCfg = Release|Any CPU - {6C5EE693-7F88-4259-90D5-9B247E61A15A}.Release|x86.Build.0 = Release|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Debug|x64.ActiveCfg = Debug|x64 {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Debug|x64.Build.0 = Debug|x64 - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Debug|x86.ActiveCfg = Debug|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Debug|x86.Build.0 = Debug|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Release|Any CPU.Build.0 = Release|Any CPU {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Release|x64.ActiveCfg = Release|Any CPU {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Release|x64.Build.0 = Release|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Release|x86.ActiveCfg = Release|Any CPU - {D8CAE4E1-8115-4B1A-9EA2-16451EC08242}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 4ad3c2c0b075e27757d345703898e49decdd567c Mon Sep 17 00:00:00 2001 From: rfuzzo Date: Thu, 9 Feb 2023 15:06:30 +0100 Subject: [PATCH 2/2] renmove protobuf --- WolvenKit.App/Enums.cs | 13 ---- WolvenKit.App/WolvenKit.App.csproj | 2 - WolvenKit.Bundles/WolvenKit.Bundles.csproj | 2 - WolvenKit.Common/Tools/ProtoList.cs | 16 ----- WolvenKit.Common/WolvenKit.Common.csproj | 2 - .../packages.config.new.20210615081347 | 6 +- WolvenKit.W3Strings/W3StringBlock1.cs | 15 ++--- WolvenKit.W3Strings/W3StringManager.cs | 64 ------------------- .../WolvenKit.W3Strings.csproj | 2 - WolvenKit/WolvenKit.csproj | 2 - 10 files changed, 8 insertions(+), 116 deletions(-) delete mode 100644 WolvenKit.App/Enums.cs delete mode 100644 WolvenKit.Common/Tools/ProtoList.cs diff --git a/WolvenKit.App/Enums.cs b/WolvenKit.App/Enums.cs deleted file mode 100644 index 341e024ba..000000000 --- a/WolvenKit.App/Enums.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace WolvenKit.App -{ - - - - -} diff --git a/WolvenKit.App/WolvenKit.App.csproj b/WolvenKit.App/WolvenKit.App.csproj index 675ce61cf..7ad8c5f49 100644 --- a/WolvenKit.App/WolvenKit.App.csproj +++ b/WolvenKit.App/WolvenKit.App.csproj @@ -37,8 +37,6 @@ - - diff --git a/WolvenKit.Bundles/WolvenKit.Bundles.csproj b/WolvenKit.Bundles/WolvenKit.Bundles.csproj index baa61ef64..b5a2faf05 100644 --- a/WolvenKit.Bundles/WolvenKit.Bundles.csproj +++ b/WolvenKit.Bundles/WolvenKit.Bundles.csproj @@ -70,8 +70,6 @@ - - diff --git a/WolvenKit.Common/Tools/ProtoList.cs b/WolvenKit.Common/Tools/ProtoList.cs deleted file mode 100644 index 6e5a16ba8..000000000 --- a/WolvenKit.Common/Tools/ProtoList.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using ProtoBuf; - -namespace WolvenKit.Common -{ - [ProtoContract] - public class ProtoList - { - [ProtoMember(1)] - public List innerlist; - } -} diff --git a/WolvenKit.Common/WolvenKit.Common.csproj b/WolvenKit.Common/WolvenKit.Common.csproj index 3c75a6c41..045ca4619 100644 --- a/WolvenKit.Common/WolvenKit.Common.csproj +++ b/WolvenKit.Common/WolvenKit.Common.csproj @@ -45,8 +45,6 @@ - - diff --git a/WolvenKit.Common/packages.config.new.20210615081347 b/WolvenKit.Common/packages.config.new.20210615081347 index 50da954a2..76e8d5ad8 100644 --- a/WolvenKit.Common/packages.config.new.20210615081347 +++ b/WolvenKit.Common/packages.config.new.20210615081347 @@ -1,4 +1,4 @@ - + @@ -9,8 +9,6 @@ - - @@ -19,4 +17,4 @@ - \ No newline at end of file + diff --git a/WolvenKit.W3Strings/W3StringBlock1.cs b/WolvenKit.W3Strings/W3StringBlock1.cs index 774b7f9c9..9801e2ada 100644 --- a/WolvenKit.W3Strings/W3StringBlock1.cs +++ b/WolvenKit.W3Strings/W3StringBlock1.cs @@ -1,22 +1,19 @@ -using System.IO; +using System.IO; using System.Collections.Generic; using System; -using ProtoBuf; namespace WolvenKit.W3Strings { - [ProtoContract] public class W3StringBlock1 { - [ProtoMember(1)] public uint offset; - [ProtoMember(2)] + public string str; - [ProtoMember(3)] + public uint str_id; - [ProtoMember(4)] + public uint str_id_hashed; - [ProtoMember(5)] + public uint strlen; public W3StringBlock1() @@ -61,4 +58,4 @@ public void Write(BinaryWriter stream, uint magic) stream.Write(strlen); } } -} \ No newline at end of file +} diff --git a/WolvenKit.W3Strings/W3StringManager.cs b/WolvenKit.W3Strings/W3StringManager.cs index 393f1b5a2..42421b324 100644 --- a/WolvenKit.W3Strings/W3StringManager.cs +++ b/WolvenKit.W3Strings/W3StringManager.cs @@ -1,78 +1,14 @@ using System; using System.Collections.Generic; using System.IO; -using ProtoBuf; using WolvenKit.Common; namespace WolvenKit.W3Strings { - [ProtoContract] public class W3StringManager { - #region Proto - [ProtoMember(1)] - public Dictionary> ProtoLines - { - get - { - var ret = new Dictionary>(); - if (Lines != null) - { - foreach (var line in Lines) - { - var bloc = new ProtoList(); - bloc.innerlist = line.Value; - ret.Add(line.Key,bloc); - } - } - return ret; - } - set - { - if(Lines == null) - Lines = new Dictionary>(); - Lines.Clear(); - foreach (var protoLine in ProtoLines) - { - Lines.Add(protoLine.Key,protoLine.Value.innerlist); - } - } - } - [ProtoMember(2)] - private List> ProtiomportedStrings - { - get - { - var ret = new List>(); - if (importedStrings != null) - { - foreach (var protostring in importedStrings) - { - var bloc = new ProtoList(); - bloc.innerlist = protostring; - ret.Add(bloc); - } - } - return ret; - } - set - { - if(importedStrings == null) - importedStrings = new List>(); - importedStrings.Clear(); - foreach (var protostring in ProtiomportedStrings) - { - importedStrings.Add(protostring.innerlist); - } - } - } - #endregion - - [ProtoMember(3)] public Dictionary> Lines { get; private set; } - [ProtoMember(4)] public Dictionary Keys { get; private set; } - [ProtoMember(5)] public string Language { get; private set; } private List> importedStrings = new List>(); diff --git a/WolvenKit.W3Strings/WolvenKit.W3Strings.csproj b/WolvenKit.W3Strings/WolvenKit.W3Strings.csproj index bcdff3703..bdc2f3510 100644 --- a/WolvenKit.W3Strings/WolvenKit.W3Strings.csproj +++ b/WolvenKit.W3Strings/WolvenKit.W3Strings.csproj @@ -34,8 +34,6 @@ MinimumRecommendedRules.ruleset - - diff --git a/WolvenKit/WolvenKit.csproj b/WolvenKit/WolvenKit.csproj index 2a33c22b4..b606979b5 100644 --- a/WolvenKit/WolvenKit.csproj +++ b/WolvenKit/WolvenKit.csproj @@ -156,8 +156,6 @@ - -