renmove protobuf

WolvenKit · Feb 9, 2023 · 4ad3c2c · 4ad3c2c
1 parent 857964a
commit 4ad3c2c
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 116 deletions.
diff --git a/WolvenKit.App/Enums.cs b/WolvenKit.App/Enums.cs
diff --git a/WolvenKit.App/WolvenKit.App.csproj b/WolvenKit.App/WolvenKit.App.csproj
@@ -37,8 +37,6 @@
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Pfim" Version="0.11.1" />
-    <PackageReference Include="protobuf-net" Version="3.1.26" />
-    <PackageReference Include="protobuf-net.Core" Version="3.1.26" />
     <PackageReference Include="SharpZipLib" Version="1.4.1" />
     <PackageReference Include="SymbolicLinkSupport" Version="1.2.0" />
     <PackageReference Include="System.AppContext" Version="4.3.0" />

diff --git a/WolvenKit.Bundles/WolvenKit.Bundles.csproj b/WolvenKit.Bundles/WolvenKit.Bundles.csproj
@@ -70,8 +70,6 @@
     <PackageReference Include="doboz4net" Version="1.0.1" />
     <PackageReference Include="lz4net" Version="1.0.15.93" />
     <PackageReference Include="MarkerMetro.Unity.Ionic.Zlib" Version="2.0.0.14" />
-    <PackageReference Include="protobuf-net" Version="3.1.26" />
-    <PackageReference Include="protobuf-net.Core" Version="3.1.26" />
     <PackageReference Include="Snappy.NET" Version="1.1.1.8" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />

diff --git a/WolvenKit.Common/Tools/ProtoList.cs b/WolvenKit.Common/Tools/ProtoList.cs
diff --git a/WolvenKit.Common/WolvenKit.Common.csproj b/WolvenKit.Common/WolvenKit.Common.csproj
@@ -45,8 +45,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="protobuf-net" Version="3.1.26" />
-    <PackageReference Include="protobuf-net.Core" Version="3.1.26" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />

diff --git a/WolvenKit.Common/packages.config.new.20210615081347 b/WolvenKit.Common/packages.config.new.20210615081347
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CsvHelper" version="27.1.0" targetFramework="net48" />
   <package id="Magick.NET.Core" version="7.0.1" targetFramework="net48" />
@@ -9,8 +9,6 @@
   <package id="Microsoft.CodeAnalysis.Common" version="3.10.0" targetFramework="net48" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="3.10.0" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="protobuf-net" version="3.0.101" targetFramework="net48" />
-  <package id="protobuf-net.Core" version="3.0.101" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections.Immutable" version="5.0.0" targetFramework="net48" />
   <package id="System.Memory" version="4.5.4" targetFramework="net48" />
@@ -19,4 +17,4 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net48" />
   <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
-</packages>
+</packages>
diff --git 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);
         }
     }
-}
+}
diff --git 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<uint, ProtoList<W3StringBlock1>> ProtoLines
-        {
-            get
-            {
-                var ret = new Dictionary<uint, ProtoList<W3StringBlock1>>();
-                if (Lines != null)
-                {
-                    foreach (var line in Lines)
-                    {
-                        var bloc = new ProtoList<W3StringBlock1>();
-                        bloc.innerlist = line.Value;
-                        ret.Add(line.Key,bloc);
-                    }
-                }
-                return ret;
-            }
-            set
-            {
-                if(Lines == null)
-                    Lines = new Dictionary<uint, List<W3StringBlock1>>();
-                Lines.Clear();
-                foreach (var protoLine in ProtoLines)
-                {
-                    Lines.Add(protoLine.Key,protoLine.Value.innerlist);
-                }
-            }
-        }
-        [ProtoMember(2)]
-        private List<ProtoList<string>> ProtiomportedStrings
-        {
-            get
-            {
-                var ret = new List<ProtoList<string>>();
-                if (importedStrings != null)
-                {
-                    foreach (var protostring in importedStrings)
-                    {
-                        var bloc = new ProtoList<string>();
-                        bloc.innerlist = protostring;
-                        ret.Add(bloc);
-                    }
-                }
-                return ret;
-            }
-            set
-            {
-                if(importedStrings == null)
-                    importedStrings = new List<List<string>>();
-                importedStrings.Clear();
-                foreach (var protostring in ProtiomportedStrings)
-                {
-                    importedStrings.Add(protostring.innerlist);
-                }
-            }
-        }
-        #endregion
-
-        [ProtoMember(3)]
         public Dictionary<uint, List<W3StringBlock1>> Lines { get; private set; }
-        [ProtoMember(4)]
         public Dictionary<uint, bool> Keys { get; private set; }
-        [ProtoMember(5)]
         public string Language { get; private set; }
 
         private List<List<string>> importedStrings = new List<List<string>>();

diff --git a/WolvenKit.W3Strings/WolvenKit.W3Strings.csproj b/WolvenKit.W3Strings/WolvenKit.W3Strings.csproj
@@ -34,8 +34,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="3.1.26" />
-    <PackageReference Include="protobuf-net.Core" Version="3.1.26" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />

diff --git a/WolvenKit/WolvenKit.csproj b/WolvenKit/WolvenKit.csproj
@@ -156,8 +156,6 @@
     <PackageReference Include="ObjectListView.Official" Version="2.9.2-alpha2" />
     <PackageReference Include="OpenGL.Net.WinForms" Version="0.8.4" />
     <PackageReference Include="PropertyGridEx" Version="1.0.0" />
-    <PackageReference Include="protobuf-net" Version="3.1.26" />
-    <PackageReference Include="protobuf-net.Core" Version="3.1.26" />
     <PackageReference Include="ScintillaNET_FindReplaceDialog" Version="1.5.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.1" />
     <PackageReference Include="System.AppContext" Version="4.3.0" />