From baa4abeee7df3efc645fca7a27dec8112edef406 Mon Sep 17 00:00:00 2001 From: Lennard Fonteijn Date: Mon, 14 Aug 2023 20:14:04 +0200 Subject: [PATCH 1/5] Converted all projects to .NET 6 --- .gitignore | 3 + ConverterApp/App.config | 6 - ConverterApp/ConverterApp.csproj | 236 +--------------- ConverterApp/MainForm.cs | 1 - ConverterApp/PackagePane.cs | 1 - ConverterApp/Properties/AssemblyInfo.cs | 35 --- ConverterApp/Properties/Resources.Designer.cs | 63 ----- ConverterApp/Properties/Resources.resx | 117 -------- ConverterApp/Properties/Settings.Designer.cs | 26 -- ConverterApp/Properties/Settings.settings | 7 - ConverterApp/VirtualTexturesPane.cs | 5 +- ConverterApp/packages.config | 5 - DebuggerFrontend/App.config | 6 - DebuggerFrontend/DebuggerFrontend.csproj | 143 +++------- DebuggerFrontend/Properties/AssemblyInfo.cs | 36 --- DebuggerFrontend/packages.config | 6 - Divine/App.config | 6 - Divine/CLI/CommandLineActions.cs | 1 - Divine/Divine.csproj | 80 +----- Divine/Properties/AssemblyInfo.cs | 36 --- Divine/packages.config | 5 - LSLib/Granny/GR2/Format.cs | 2 +- LSLib/Granny/GR2/Writer.cs | 2 +- LSLib/Granny/GR2Utils.cs | 3 - LSLib/Granny/Model/ColladaExporter.cs | 1 - LSLib/Granny/Model/ColladaImporter.cs | 1 - LSLib/Granny/Model/Exporter.cs | 2 - LSLib/Granny/Model/VertexSerialization.cs | 2 +- LSLib/LS/BinUtils.cs | 23 +- LSLib/LS/FileManager.cs | 1 - LSLib/LS/Localization.cs | 1 - LSLib/LS/PackageCommon.cs | 5 - LSLib/LS/PackageReader.cs | 1 - LSLib/LS/PackageWriter.cs | 2 - LSLib/LS/ResourceUtils.cs | 4 - LSLib/LSLib.csproj | 266 ++---------------- LSLib/Properties/AssemblyInfo.cs | 35 --- LSLib/packages.config | 7 - LSTools.sln | 4 +- OpenTK/OpenTK.csproj | 109 +------ OpenTK/Properties/AssemblyInfo.cs | 36 --- RconClient/Properties/AssemblyInfo.cs | 36 --- RconClient/RconClient.csproj | 75 +---- RconClient/app.config | 3 - StatParser/App.config | 6 - StatParser/Properties/AssemblyInfo.cs | 36 --- StatParser/StatParser.csproj | 90 ++---- StatParser/packages.config | 4 - StoryCompiler/App.config | 6 - StoryCompiler/Properties/AssemblyInfo.cs | 36 --- StoryCompiler/StoryCompiler.csproj | 139 ++------- StoryCompiler/packages.config | 6 - StoryDecompiler/App.config | 6 - StoryDecompiler/Properties/AssemblyInfo.cs | 36 --- StoryDecompiler/StoryDecompiler.csproj | 92 ++---- StoryDecompiler/packages.config | 4 - TerrainFixup/TerrainFixup.csproj | 6 +- UnpackGrid/UnpackGrid.csproj | 6 +- 58 files changed, 211 insertions(+), 1707 deletions(-) delete mode 100644 ConverterApp/App.config delete mode 100644 ConverterApp/Properties/AssemblyInfo.cs delete mode 100644 ConverterApp/Properties/Resources.Designer.cs delete mode 100644 ConverterApp/Properties/Resources.resx delete mode 100644 ConverterApp/Properties/Settings.Designer.cs delete mode 100644 ConverterApp/Properties/Settings.settings delete mode 100644 ConverterApp/packages.config delete mode 100644 DebuggerFrontend/App.config delete mode 100644 DebuggerFrontend/Properties/AssemblyInfo.cs delete mode 100644 DebuggerFrontend/packages.config delete mode 100644 Divine/App.config delete mode 100644 Divine/Properties/AssemblyInfo.cs delete mode 100644 Divine/packages.config delete mode 100644 LSLib/Properties/AssemblyInfo.cs delete mode 100644 LSLib/packages.config delete mode 100644 OpenTK/Properties/AssemblyInfo.cs delete mode 100644 RconClient/Properties/AssemblyInfo.cs delete mode 100644 RconClient/app.config delete mode 100644 StatParser/App.config delete mode 100644 StatParser/Properties/AssemblyInfo.cs delete mode 100644 StatParser/packages.config delete mode 100644 StoryCompiler/App.config delete mode 100644 StoryCompiler/Properties/AssemblyInfo.cs delete mode 100644 StoryCompiler/packages.config delete mode 100644 StoryDecompiler/App.config delete mode 100644 StoryDecompiler/Properties/AssemblyInfo.cs delete mode 100644 StoryDecompiler/packages.config diff --git a/.gitignore b/.gitignore index e7ef7ad2..07e2c89c 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,6 @@ DebuggerFrontend/DbgProtocol.cs WwiseTool UnpackGrid/Properties/launchSettings.json TerrainFixup/Properties/launchSettings.json + +# Other +/LSLib/StatProperty.lst diff --git a/ConverterApp/App.config b/ConverterApp/App.config deleted file mode 100644 index d0f8440b..00000000 --- a/ConverterApp/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ConverterApp/ConverterApp.csproj b/ConverterApp/ConverterApp.csproj index 64948aed..f5bd909f 100644 --- a/ConverterApp/ConverterApp.csproj +++ b/ConverterApp/ConverterApp.csproj @@ -1,197 +1,21 @@ - - - + - Debug - AnyCPU - {FAD67294-6223-47E0-8838-E4E7FBC53ED2} - WinExe - Properties - ConverterApp - ConverterApp - v4.7.2 - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - + Exe + net6.0-windows + enable + disable + true + LSLib Toolkit - Main Application + LSLib + Copyright © Norbyte 2012-2023 - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x64 - pdbonly - true - bin\Release\ - - - prompt - 4 - false - - - Always - - - bin\Editor Debug\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll - - - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - + - - - - - UserControl - - - DebugPane.cs - - - Component - - - ExportItemSelection.cs - - - UserControl - - - GR2Pane.cs - - - UserControl - - - LocalizationPane.cs - - - Form - - - MainForm.cs - - - UserControl - - - OsirisPane.cs - - - UserControl - - - PackagePane.cs - - - - - UserControl - - - ResourcePane.cs - - - - UserControl - - - VirtualTexturesPane.cs - - - DebugPane.cs - - - ExportItemSelection.cs - - - GR2Pane.cs - - - LocalizationPane.cs - - - MainForm.cs - - - OsirisPane.cs - - - PackagePane.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - ResourcePane.cs - - - VirtualTexturesPane.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - + + 13.0.1 + + {46372c50-4288-4b8e-af21-c934560600e0} @@ -202,36 +26,4 @@ OpenTK - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - \ No newline at end of file diff --git a/ConverterApp/MainForm.cs b/ConverterApp/MainForm.cs index 3117fd03..516084ca 100644 --- a/ConverterApp/MainForm.cs +++ b/ConverterApp/MainForm.cs @@ -1,5 +1,4 @@ using System; -using Alphaleonis.Win32.Filesystem; using System.Windows.Forms; using LSLib.LS; using LSLib.LS.Enums; diff --git a/ConverterApp/PackagePane.cs b/ConverterApp/PackagePane.cs index defd2034..bdc43c55 100644 --- a/ConverterApp/PackagePane.cs +++ b/ConverterApp/PackagePane.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics; using System.Windows.Forms; -using Alphaleonis.Win32.Filesystem; using LSLib.LS; using LSLib.LS.Enums; diff --git a/ConverterApp/Properties/AssemblyInfo.cs b/ConverterApp/Properties/AssemblyInfo.cs deleted file mode 100644 index 7dfb1673..00000000 --- a/ConverterApp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LSLib Toolkit - Main Application")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("Copyright © Norbyte 2012-2023")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("565dd5e7-6720-469d-b9f4-a922a7014747")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.15.14.0")] -[assembly: AssemblyFileVersion("1.15.14.0")] diff --git a/ConverterApp/Properties/Resources.Designer.cs b/ConverterApp/Properties/Resources.Designer.cs deleted file mode 100644 index 92f12ef7..00000000 --- a/ConverterApp/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ConverterApp.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ConverterApp.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/ConverterApp/Properties/Resources.resx b/ConverterApp/Properties/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/ConverterApp/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ConverterApp/Properties/Settings.Designer.cs b/ConverterApp/Properties/Settings.Designer.cs deleted file mode 100644 index 90c9b3a3..00000000 --- a/ConverterApp/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ConverterApp.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/ConverterApp/Properties/Settings.settings b/ConverterApp/Properties/Settings.settings deleted file mode 100644 index 39645652..00000000 --- a/ConverterApp/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ConverterApp/VirtualTexturesPane.cs b/ConverterApp/VirtualTexturesPane.cs index 88343c86..ce99b198 100644 --- a/ConverterApp/VirtualTexturesPane.cs +++ b/ConverterApp/VirtualTexturesPane.cs @@ -1,5 +1,4 @@ -using Alphaleonis.Win32.Filesystem; -using LSLib.LS; +using LSLib.LS; using LSLib.VirtualTextures; using System; using System.Collections.Generic; @@ -65,7 +64,7 @@ private void extractTileSetBtn_Click(object sender, EventArgs e) if (tex != null) { - var outputPath = destinationPath.Text + Path.DirectorySeparator + Path.GetFileNameWithoutExtension(fileInfo.Name) + $"_{layer}.dds"; + var outputPath = destinationPath.Text + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(fileInfo.Name) + $"_{layer}.dds"; tex.SaveDDS(outputPath); } } diff --git a/ConverterApp/packages.config b/ConverterApp/packages.config deleted file mode 100644 index 1a84d93a..00000000 --- a/ConverterApp/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/DebuggerFrontend/App.config b/DebuggerFrontend/App.config deleted file mode 100644 index ecdcf8a5..00000000 --- a/DebuggerFrontend/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/DebuggerFrontend/DebuggerFrontend.csproj b/DebuggerFrontend/DebuggerFrontend.csproj index 1edc4e61..7b554b0d 100644 --- a/DebuggerFrontend/DebuggerFrontend.csproj +++ b/DebuggerFrontend/DebuggerFrontend.csproj @@ -1,105 +1,40 @@ - - - - - Debug - AnyCPU - {31E71543-CBCF-43BB-AF77-D210D548118E} - Exe - LSTools.DebuggerFrontend - DebuggerFrontend - v4.7.2 - 512 - true - - - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\CommandLineArgumentsParser.3.0.19\lib\net452\CommandLineArgumentsParser.dll - - - ..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll - - - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\External\gppg\binaries\QUT.ShiftReduceParser.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {46372c50-4288-4b8e-af21-c934560600e0} - LSLib - - - - - $(SolutionDir)\External\protoc\bin\protoc.exe --proto_path=$(ProjectDir) --csharp_out=$(ProjectDir) DbgProtocol.proto -$(SolutionDir)\External\protoc\bin\protoc.exe --proto_path=$(ProjectDir)..\StoryCompiler\ --csharp_out=$(ProjectDir) debuginfo.proto -"$(SolutionDir)\external\gppg\binaries\GpLex" /out:"$(ProjectDir)\ExpressionParser\Expression.lex.cs" "$(ProjectDir)\ExpressionParser\Expression.lex" -"$(SolutionDir)\external\gppg\binaries\Gppg" /out:"$(ProjectDir)\ExpressionParser\Expression.yy.cs" "$(ProjectDir)\ExpressionParser\Expression.yy" - + + + Exe + net6.0 + enable + disable + Osiris VS Code Debugger Frontend + LSLib + Copyright © Norbyte 2012-2018 + + + + + 3.0.19 + + + 3.15.0 + + + 13.0.1 + + + + + + {46372c50-4288-4b8e-af21-c934560600e0} + LSLib + + + + + + ..\External\gppg\binaries\QUT.ShiftReduceParser.dll + + + + + + \ No newline at end of file diff --git a/DebuggerFrontend/Properties/AssemblyInfo.cs b/DebuggerFrontend/Properties/AssemblyInfo.cs deleted file mode 100644 index 3499587c..00000000 --- a/DebuggerFrontend/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Osiris VS Code Debugger Frontend")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("Copyright © Norbyte 2012-2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("31e71543-cbcf-43bb-af77-d210d548118e")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/DebuggerFrontend/packages.config b/DebuggerFrontend/packages.config deleted file mode 100644 index 23b37023..00000000 --- a/DebuggerFrontend/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Divine/App.config b/Divine/App.config deleted file mode 100644 index 92d30f9f..00000000 --- a/Divine/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Divine/CLI/CommandLineActions.cs b/Divine/CLI/CommandLineActions.cs index 53d20617..2a59ed66 100644 --- a/Divine/CLI/CommandLineActions.cs +++ b/Divine/CLI/CommandLineActions.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using Alphaleonis.Win32.Filesystem; using LSLib.LS; using LSLib.LS.Enums; diff --git a/Divine/Divine.csproj b/Divine/Divine.csproj index f2e2e89c..6f4fa2b7 100644 --- a/Divine/Divine.csproj +++ b/Divine/Divine.csproj @@ -1,81 +1,23 @@ - - - + - Debug - AnyCPU - {CBFEE38F-5F12-4D6F-B4FB-267FB68A6BEA} Exe - Properties - Divine - divine - v4.7.2 - 512 - true - + net6.0 + enable + disable + LSLib - Divine Commandline Tool + LSLib - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll - - - ..\packages\CommandLineArgumentsParser.3.0.19\lib\net452\CommandLineArgumentsParser.dll - - - - - - - - - - - - - - - - - - - - + - - + + 3.0.19 + + {46372c50-4288-4b8e-af21-c934560600e0} LSLib - - \ No newline at end of file diff --git a/Divine/Properties/AssemblyInfo.cs b/Divine/Properties/AssemblyInfo.cs deleted file mode 100644 index 2f7fd57d..00000000 --- a/Divine/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LSLib - Divine Commandline Tool")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cbfee38f-5f12-4d6f-b4fb-267fb68a6bea")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.15.14.0")] -[assembly: AssemblyFileVersion("1.15.14.0")] diff --git a/Divine/packages.config b/Divine/packages.config deleted file mode 100644 index 60c919ae..00000000 --- a/Divine/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/LSLib/Granny/GR2/Format.cs b/LSLib/Granny/GR2/Format.cs index 80bc7903..b6d0c63c 100644 --- a/LSLib/Granny/GR2/Format.cs +++ b/LSLib/Granny/GR2/Format.cs @@ -1055,7 +1055,7 @@ public static MemberDefinition CreateFromFieldInfo(FieldInfo info, GR2Writer wri member.Type = MemberType.Int32; else if (type == typeof(UInt32)) member.Type = MemberType.UInt32; - else if (type == typeof(Half)) + else if (type == typeof(System.Half)) member.Type = MemberType.Real16; else if (type == typeof(Single)) member.Type = MemberType.Real32; diff --git a/LSLib/Granny/GR2/Writer.cs b/LSLib/Granny/GR2/Writer.cs index 4dd1d039..68b94549 100644 --- a/LSLib/Granny/GR2/Writer.cs +++ b/LSLib/Granny/GR2/Writer.cs @@ -523,7 +523,7 @@ private void WriteElement(MemberDefinition definition, Type propertyType, object break; case MemberType.Real16: - Writer.Write((Half)node); + Writer.Write((System.Half)node); break; case MemberType.Real32: diff --git a/LSLib/Granny/GR2Utils.cs b/LSLib/Granny/GR2Utils.cs index 41a2b793..a23c623e 100644 --- a/LSLib/Granny/GR2Utils.cs +++ b/LSLib/Granny/GR2Utils.cs @@ -5,9 +5,6 @@ using LSLib.Granny.GR2; using LSLib.Granny.Model; using LSLib.LS; -using Directory = Alphaleonis.Win32.Filesystem.Directory; -using Path = Alphaleonis.Win32.Filesystem.Path; -using File = Alphaleonis.Win32.Filesystem.File; namespace LSLib.Granny { diff --git a/LSLib/Granny/Model/ColladaExporter.cs b/LSLib/Granny/Model/ColladaExporter.cs index 2231ff20..2e784a4b 100644 --- a/LSLib/Granny/Model/ColladaExporter.cs +++ b/LSLib/Granny/Model/ColladaExporter.cs @@ -3,7 +3,6 @@ using System.Linq; using LSLib.Granny.GR2; using LSLib.LS; -using Alphaleonis.Win32.Filesystem; using System.Xml; using System.Xml.Linq; using LSLib.LS.Enums; diff --git a/LSLib/Granny/Model/ColladaImporter.cs b/LSLib/Granny/Model/ColladaImporter.cs index d20ef062..0f54178a 100644 --- a/LSLib/Granny/Model/ColladaImporter.cs +++ b/LSLib/Granny/Model/ColladaImporter.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Alphaleonis.Win32.Filesystem; using LSLib.Granny.GR2; using LSLib.LS; using OpenTK; diff --git a/LSLib/Granny/Model/Exporter.cs b/LSLib/Granny/Model/Exporter.cs index 00091e97..54fd8cd9 100644 --- a/LSLib/Granny/Model/Exporter.cs +++ b/LSLib/Granny/Model/Exporter.cs @@ -5,8 +5,6 @@ using System.Linq; using LSLib.LS; using OpenTK; -using Alphaleonis.Win32.Filesystem; -using File = Alphaleonis.Win32.Filesystem.File; using LSLib.LS.Enums; using System.Numerics; diff --git a/LSLib/Granny/Model/VertexSerialization.cs b/LSLib/Granny/Model/VertexSerialization.cs index bba43d3e..215cfd2a 100644 --- a/LSLib/Granny/Model/VertexSerialization.cs +++ b/LSLib/Granny/Model/VertexSerialization.cs @@ -486,7 +486,7 @@ private static ModuleBuilder GetModuleBuilder() } var an = new AssemblyName("VertexFactoryAssembly"); - AssemblyBuilder assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run); + AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run); ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule("VertexFactoryClasses"); ModBuilder = moduleBuilder; return ModBuilder; diff --git a/LSLib/LS/BinUtils.cs b/LSLib/LS/BinUtils.cs index 9cfd04db..788303f2 100644 --- a/LSLib/LS/BinUtils.cs +++ b/LSLib/LS/BinUtils.cs @@ -1,9 +1,10 @@ -using zlib; -using LZ4; +using LZ4; using System; using System.IO; +using System.IO.Compression; using System.Runtime.InteropServices; using LSLib.LS.Enums; +using CompressionLevel = LSLib.LS.Enums.CompressionLevel; namespace LSLib.LS { @@ -338,11 +339,11 @@ public static byte[] Decompress(byte[] compressed, int decompressedSize, byte co { using (var compressedStream = new MemoryStream(compressed)) using (var decompressedStream = new MemoryStream()) - using (var stream = new ZInputStream(compressedStream)) + using (var stream = new ZLibStream(compressedStream, CompressionMode.Decompress)) { byte[] buf = new byte[0x10000]; int length = 0; - while ((length = stream.read(buf, 0, buf.Length)) > 0) + while ((length = stream.Read(buf, 0, buf.Length)) > 0) { decompressedStream.Write(buf, 0, length); } @@ -397,27 +398,29 @@ public static byte[] Compress(byte[] uncompressed, CompressionMethod method, Com public static byte[] CompressZlib(byte[] uncompressed, CompressionLevel compressionLevel) { - int level = zlib.zlibConst.Z_DEFAULT_COMPRESSION; + System.IO.Compression.CompressionLevel level = System.IO.Compression.CompressionLevel.Optimal; + switch (compressionLevel) { case CompressionLevel.FastCompression: - level = zlib.zlibConst.Z_BEST_SPEED; + level = System.IO.Compression.CompressionLevel.Fastest; break; case CompressionLevel.DefaultCompression: - level = zlib.zlibConst.Z_DEFAULT_COMPRESSION; + level = System.IO.Compression.CompressionLevel.Optimal; break; case CompressionLevel.MaxCompression: - level = zlib.zlibConst.Z_BEST_COMPRESSION; + level = System.IO.Compression.CompressionLevel.SmallestSize; break; } using (var outputStream = new MemoryStream()) - using (var compressor = new ZOutputStream(outputStream, level)) + using (var compressor = new ZLibStream(outputStream, level)) { compressor.Write(uncompressed, 0, uncompressed.Length); - compressor.finish(); + compressor.Flush(); + return outputStream.ToArray(); } } diff --git a/LSLib/LS/FileManager.cs b/LSLib/LS/FileManager.cs index d5877e39..073965b0 100644 --- a/LSLib/LS/FileManager.cs +++ b/LSLib/LS/FileManager.cs @@ -1,5 +1,4 @@ using System; -using Alphaleonis.Win32.Filesystem; namespace LSLib.LS { diff --git a/LSLib/LS/Localization.cs b/LSLib/LS/Localization.cs index cdcccec1..c5120c16 100644 --- a/LSLib/LS/Localization.cs +++ b/LSLib/LS/Localization.cs @@ -4,7 +4,6 @@ using System.Runtime.InteropServices; using System.Text; using LZ4; -using File = Alphaleonis.Win32.Filesystem.File; using LSLib.LS.Enums; using System.Collections.Generic; using LSLib.Granny; diff --git a/LSLib/LS/PackageCommon.cs b/LSLib/LS/PackageCommon.cs index 56308ceb..6f51e5bf 100644 --- a/LSLib/LS/PackageCommon.cs +++ b/LSLib/LS/PackageCommon.cs @@ -6,11 +6,6 @@ using System.Text; using LSLib.LS.Enums; using LSLib.Native; -using Alphaleonis.Win32.Filesystem; -using Path = Alphaleonis.Win32.Filesystem.Path; -using FileInfo = Alphaleonis.Win32.Filesystem.FileInfo; -using Directory = Alphaleonis.Win32.Filesystem.Directory; -using File = Alphaleonis.Win32.Filesystem.File; namespace LSLib.LS { diff --git a/LSLib/LS/PackageReader.cs b/LSLib/LS/PackageReader.cs index d30fcd1b..98d1ae33 100644 --- a/LSLib/LS/PackageReader.cs +++ b/LSLib/LS/PackageReader.cs @@ -4,7 +4,6 @@ using System.Runtime.InteropServices; using System.Text; using LZ4; -using File = Alphaleonis.Win32.Filesystem.File; using LSLib.LS.Enums; namespace LSLib.LS diff --git a/LSLib/LS/PackageWriter.cs b/LSLib/LS/PackageWriter.cs index 82db1c09..669d9582 100644 --- a/LSLib/LS/PackageWriter.cs +++ b/LSLib/LS/PackageWriter.cs @@ -8,8 +8,6 @@ using LSLib.LS.Enums; using LSLib.Native; using LZ4; -using Alphaleonis.Win32.Filesystem; -using File = Alphaleonis.Win32.Filesystem.File; namespace LSLib.LS { diff --git a/LSLib/LS/ResourceUtils.cs b/LSLib/LS/ResourceUtils.cs index 90aa5832..89037d93 100644 --- a/LSLib/LS/ResourceUtils.cs +++ b/LSLib/LS/ResourceUtils.cs @@ -2,10 +2,6 @@ using System.Collections.Generic; using System.IO; using LSLib.LS.Enums; -using Alphaleonis.Win32.Filesystem; -using Path = Alphaleonis.Win32.Filesystem.Path; -using Directory = Alphaleonis.Win32.Filesystem.Directory; -using File = Alphaleonis.Win32.Filesystem.File; namespace LSLib.LS { diff --git a/LSLib/LSLib.csproj b/LSLib/LSLib.csproj index f0233113..a2c354a1 100644 --- a/LSLib/LSLib.csproj +++ b/LSLib/LSLib.csproj @@ -1,251 +1,35 @@ - - - + - Debug - AnyCPU - {46372C50-4288-4B8E-AF21-C934560600E0} - Library - Properties - LSLib - LSLib - v4.7.2 - 512 - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;EXPORT_GPPG - prompt - 4 - false - x64 - true - - - pdbonly - true - bin\Release\ - EXPORT_GPPG - prompt - 4 - false - x64 + net6.0 + enable + disable true + LSLib + LSLib + Copyright © Norbyte 2012-2023 - - bin\Editor Debug\ - TRACE;EXPORT_GPPG - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - + - - ..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll - - - ..\packages\lz4net.1.0.15.93\lib\net4-client\LZ4.dll - - - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\external\gppg\binaries\QUT.ShiftReduceParser.dll - - - - - - - - - - - False - ..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll - + + 1.0.15.93 + + + 13.0.1 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - {d8b26b12-e45c-47ea-88f7-56628eb2ccd1} - LSLibNative - - - {abb9db44-14f2-46e0-a4b8-b46c300ca982} - OpenTK - + + ..\External\gppg\binaries\QUT.ShiftReduceParser.dll + - - - - - - - - "$(SolutionDir)\external\gppg\binaries\GpLex" /out:"$(ProjectDir)\LS\Story\GoalParser\Goal.lex.cs" "$(ProjectDir)\LS\Story\GoalParser\Goal.lex" -"$(SolutionDir)\external\gppg\binaries\Gppg" /out:"$(ProjectDir)\LS\Story\GoalParser\Goal.yy.cs" "$(ProjectDir)\LS\Story\GoalParser\Goal.yy" - -"$(SolutionDir)\external\gppg\binaries\GpLex" /out:"$(ProjectDir)\LS\Story\HeaderParser\StoryHeader.lex.cs" "$(ProjectDir)\LS\Story\HeaderParser\StoryHeader.lex" -"$(SolutionDir)\external\gppg\binaries\Gppg" /out:"$(ProjectDir)\LS\Story\HeaderParser\StoryHeader.yy.cs" "$(ProjectDir)\LS\Story\HeaderParser\StoryHeader.yy" -"$(SolutionDir)\external\gppg\binaries\GpLex" /out:"$(ProjectDir)\LS\Stats\Parser\Stat.lex.cs" "$(ProjectDir)\LS\Stats\Parser\Stat.lex" -"$(SolutionDir)\external\gppg\binaries\Gppg" /out:"$(ProjectDir)\LS\Stats\Parser\Stat.yy.cs" "$(ProjectDir)\LS\Stats\Parser\Stat.yy" - -"$(SolutionDir)\external\gppg\binaries\GpLex" /out:"$(ProjectDir)\LS\Stats\Parser\StatProperty.lex.cs" "$(ProjectDir)\LS\Stats\Parser\StatProperty.lex" -"$(SolutionDir)\external\gppg\binaries\Gppg" /out:"$(ProjectDir)\LS\Stats\Parser\StatProperty.yy.cs" "$(ProjectDir)\LS\Stats\Parser\StatProperty.yy" - - - - \ No newline at end of file + + + + diff --git a/LSLib/Properties/AssemblyInfo.cs b/LSLib/Properties/AssemblyInfo.cs deleted file mode 100644 index b2be3572..00000000 --- a/LSLib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LSLib")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("Copyright © Norbyte 2012-2023")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cfb98b54-f577-4855-86a3-0c3988b5df8f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.18.5.0")] -[assembly: AssemblyFileVersion("1.18.5.0")] diff --git a/LSLib/packages.config b/LSLib/packages.config deleted file mode 100644 index 1ccf9bc1..00000000 --- a/LSLib/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/LSTools.sln b/LSTools.sln index 40a847bd..fd18bf18 100644 --- a/LSTools.sln +++ b/LSTools.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30330.147 +# Visual Studio Version 17 +VisualStudioVersion = 17.6.33815.320 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LSLib", "LSLib\LSLib.csproj", "{46372C50-4288-4B8E-AF21-C934560600E0}" EndProject diff --git a/OpenTK/OpenTK.csproj b/OpenTK/OpenTK.csproj index 3334c66a..4d9d81df 100644 --- a/OpenTK/OpenTK.csproj +++ b/OpenTK/OpenTK.csproj @@ -1,107 +1,12 @@ - - - + - Debug - AnyCPU - {ABB9DB44-14F2-46E0-A4B8-B46C300CA982} - Library - Properties - OpenTK - OpenTK - v4.7.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net6.0 + enable + disable true x64 - false - - - bin\Editor Debug\ - TRACE - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset + OpenTK + OpenTK + Copyright © 2014 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenTK/Properties/AssemblyInfo.cs b/OpenTK/Properties/AssemblyInfo.cs deleted file mode 100644 index a9b6bba5..00000000 --- a/OpenTK/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OpenTK")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OpenTK")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("dddb367c-9590-4d8a-8bb1-a32446164876")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/RconClient/Properties/AssemblyInfo.cs b/RconClient/Properties/AssemblyInfo.cs deleted file mode 100644 index 3031906d..00000000 --- a/RconClient/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("RCON Client")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("Copyright © Norbyte 2012-2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ef82c289-53d6-41c8-b5c3-72b37655c7f3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/RconClient/RconClient.csproj b/RconClient/RconClient.csproj index df482ba7..b7d4dbe1 100644 --- a/RconClient/RconClient.csproj +++ b/RconClient/RconClient.csproj @@ -1,65 +1,12 @@ - - - - - Debug - AnyCPU - {EF82C289-53D6-41C8-B5C3-72B37655C7F3} - Exe - Properties - LSLib.Rcon - RconClient - v4.7.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Exe + net6.0 + enable + disable + LSLib.Rcon + RCON Client + LSLib + Copyright © Norbyte 2012-2018 + \ No newline at end of file diff --git a/RconClient/app.config b/RconClient/app.config deleted file mode 100644 index 312bb3f2..00000000 --- a/RconClient/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/StatParser/App.config b/StatParser/App.config deleted file mode 100644 index 56efbc7b..00000000 --- a/StatParser/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/StatParser/Properties/AssemblyInfo.cs b/StatParser/Properties/AssemblyInfo.cs deleted file mode 100644 index 3e731079..00000000 --- a/StatParser/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("StatParser")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("StatParser")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("94d900d1-ec77-4170-8942-56e3736e44de")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/StatParser/StatParser.csproj b/StatParser/StatParser.csproj index 8e6833af..ffca1e4a 100644 --- a/StatParser/StatParser.csproj +++ b/StatParser/StatParser.csproj @@ -1,67 +1,25 @@ - - - - - Debug - AnyCPU - {94D900D1-EC77-4170-8942-56E3736E44DE} - Exe - StatParser - StatParser - v4.7.2 - 512 - true - true - - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\CommandLineArgumentsParser.3.0.20\lib\net452\CommandLineArgumentsParser.dll - - - - - - - - - - - - - - - - - - - - - - - {46372C50-4288-4B8E-AF21-C934560600E0} - LSLib - - - + + + Exe + net6.0 + enable + disable + StatParser + StatParser + StatParser + Copyright © 2019 + + + + + 3.0.20 + + + + + + {46372C50-4288-4B8E-AF21-C934560600E0} + LSLib + + \ No newline at end of file diff --git a/StatParser/packages.config b/StatParser/packages.config deleted file mode 100644 index e9cd0fb2..00000000 --- a/StatParser/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/StoryCompiler/App.config b/StoryCompiler/App.config deleted file mode 100644 index ecdcf8a5..00000000 --- a/StoryCompiler/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/StoryCompiler/Properties/AssemblyInfo.cs b/StoryCompiler/Properties/AssemblyInfo.cs deleted file mode 100644 index 1a14f3f6..00000000 --- a/StoryCompiler/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Osiris Story Compiler")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("Copyright © Norbyte 2012-2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("32f08b9a-f50b-4c2e-ab56-533fed066dde")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/StoryCompiler/StoryCompiler.csproj b/StoryCompiler/StoryCompiler.csproj index e525bcc6..29b9fb51 100644 --- a/StoryCompiler/StoryCompiler.csproj +++ b/StoryCompiler/StoryCompiler.csproj @@ -1,111 +1,28 @@ - - - - - Debug - AnyCPU - {32F08B9A-F50B-4C2E-AB56-533FED066DDE} - Exe - LSTools.StoryCompiler - StoryCompiler - v4.7.2 - 512 - true - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\CommandLineArgumentsParser.3.0.19\lib\net452\CommandLineArgumentsParser.dll - - - ..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll - - - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {46372c50-4288-4b8e-af21-c934560600e0} - LSLib - - - - - False - Microsoft .NET Framework 4.6.2 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - $(SolutionDir)\External\protoc\bin\protoc.exe --proto_path=$(ProjectDir) --csharp_out=$(ProjectDir) debuginfo.proto - - \ No newline at end of file + + + Exe + net6.0 + enable + disable + LSTools.StoryCompiler + Osiris Story Compiler + LSLib + Copyright © Norbyte 2012-2018 + + + + + 3.0.19 + + + 3.15.0 + + + 13.0.1 + + + + + + + diff --git a/StoryCompiler/packages.config b/StoryCompiler/packages.config deleted file mode 100644 index 623d717c..00000000 --- a/StoryCompiler/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/StoryDecompiler/App.config b/StoryDecompiler/App.config deleted file mode 100644 index ecdcf8a5..00000000 --- a/StoryDecompiler/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/StoryDecompiler/Properties/AssemblyInfo.cs b/StoryDecompiler/Properties/AssemblyInfo.cs deleted file mode 100644 index 44a53ac6..00000000 --- a/StoryDecompiler/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Osiris Story Decompiler")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LSLib")] -[assembly: AssemblyCopyright("Copyright © Norbyte 2012-2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e4b4f95e-f027-44d7-ab93-b96ef2e661b6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/StoryDecompiler/StoryDecompiler.csproj b/StoryDecompiler/StoryDecompiler.csproj index 266960fa..66b4beaf 100644 --- a/StoryDecompiler/StoryDecompiler.csproj +++ b/StoryDecompiler/StoryDecompiler.csproj @@ -1,70 +1,24 @@ - - - - - Debug - AnyCPU - {E4B4F95E-F027-44D7-AB93-B96EF2E661B6} - Exe - StoryDecompiler - StoryDecompiler - v4.7.2 - 512 - true - - - - x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\CommandLineArgumentsParser.3.0.19\lib\net452\CommandLineArgumentsParser.dll - - - - - - - - - - - - - - - - - - - - - - - - - - {46372c50-4288-4b8e-af21-c934560600e0} - LSLib - - - + + + Exe + net6.0 + enable + disable + Osiris Story Decompiler + LSLib + Copyright © Norbyte 2012-2018 + + + + + 3.0.19 + + + + + + {46372c50-4288-4b8e-af21-c934560600e0} + LSLib + + \ No newline at end of file diff --git a/StoryDecompiler/packages.config b/StoryDecompiler/packages.config deleted file mode 100644 index 312644b4..00000000 --- a/StoryDecompiler/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/TerrainFixup/TerrainFixup.csproj b/TerrainFixup/TerrainFixup.csproj index 75c276b7..c7b18a89 100644 --- a/TerrainFixup/TerrainFixup.csproj +++ b/TerrainFixup/TerrainFixup.csproj @@ -1,13 +1,13 @@ - Exe - net5.0 + net6.0 + enable + disable - diff --git a/UnpackGrid/UnpackGrid.csproj b/UnpackGrid/UnpackGrid.csproj index 5a506c33..dc048fca 100644 --- a/UnpackGrid/UnpackGrid.csproj +++ b/UnpackGrid/UnpackGrid.csproj @@ -1,12 +1,12 @@ - Exe - net5.0 + net6.0 + enable + disable - From eb8a6bebac1563b4da018846e8f27eb7911eaf84 Mon Sep 17 00:00:00 2001 From: Lennard Fonteijn Date: Thu, 24 Aug 2023 21:41:44 +0200 Subject: [PATCH 2/5] Converted everything to x64, because LSLibNative is. --- ConverterApp/ConverterApp.csproj | 3 +- DebuggerFrontend/DebuggerFrontend.csproj | 1 + Divine/Divine.csproj | 1 + LSLib/LSLib.csproj | 1 + LSLibNative/LSLibNative.vcxproj | 307 +++++++++++------------ OpenTK/Globals.cs | 1 + OpenTK/OpenTK.csproj | 2 +- RconClient/RakNetClient.cs | 2 +- RconClient/RconClient.csproj | 1 + StatParser/StatParser.csproj | 1 + StoryCompiler/StoryCompiler.csproj | 1 + StoryDecompiler/StoryDecompiler.csproj | 1 + TerrainFixup/TerrainFixup.csproj | 1 + UnpackGrid/UnpackGrid.csproj | 1 + 14 files changed, 165 insertions(+), 159 deletions(-) create mode 100644 OpenTK/Globals.cs diff --git a/ConverterApp/ConverterApp.csproj b/ConverterApp/ConverterApp.csproj index f5bd909f..87f04c43 100644 --- a/ConverterApp/ConverterApp.csproj +++ b/ConverterApp/ConverterApp.csproj @@ -1,4 +1,4 @@ - + Exe net6.0-windows @@ -8,6 +8,7 @@ LSLib Toolkit - Main Application LSLib Copyright © Norbyte 2012-2023 + x64 diff --git a/DebuggerFrontend/DebuggerFrontend.csproj b/DebuggerFrontend/DebuggerFrontend.csproj index 7b554b0d..885e8506 100644 --- a/DebuggerFrontend/DebuggerFrontend.csproj +++ b/DebuggerFrontend/DebuggerFrontend.csproj @@ -7,6 +7,7 @@ Osiris VS Code Debugger Frontend LSLib Copyright © Norbyte 2012-2018 + x64 diff --git a/Divine/Divine.csproj b/Divine/Divine.csproj index 6f4fa2b7..7ae150b4 100644 --- a/Divine/Divine.csproj +++ b/Divine/Divine.csproj @@ -6,6 +6,7 @@ disable LSLib - Divine Commandline Tool LSLib + x64 diff --git a/LSLib/LSLib.csproj b/LSLib/LSLib.csproj index a2c354a1..f1cf3ceb 100644 --- a/LSLib/LSLib.csproj +++ b/LSLib/LSLib.csproj @@ -7,6 +7,7 @@ LSLib LSLib Copyright © Norbyte 2012-2023 + x64 diff --git a/LSLibNative/LSLibNative.vcxproj b/LSLibNative/LSLibNative.vcxproj index ed2b3870..2d902f38 100644 --- a/LSLibNative/LSLibNative.vcxproj +++ b/LSLibNative/LSLibNative.vcxproj @@ -1,157 +1,152 @@ - - - - - Debug - x64 - - - Editor Debug - x64 - - - Release - x64 - - - - {D8B26B12-E45C-47EA-88F7-56628EB2CCD1} - v4.7.2 - ManagedCProj - LSLibNative - 10.0 - - - - DynamicLibrary - true - v143 - true - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - true - - - false - - - false - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - ../external/bullet-2.77/src;../external/bullet-2.77/Extras/Serialize - - - true - - - ..\external\bullet-2.77\msvc\2008\lib\x64\Debug;%(AdditionalLibraryDirectories) - - - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - NotUsing - ../external/bullet-2.77/src;../external/bullet-2.77/Extras/Serialize - - - true - - - ..\external\bullet-2.77\msvc\2008\lib\x64\Release;%(AdditionalLibraryDirectories) - - - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - NotUsing - ../external/bullet-2.77/src;../external/bullet-2.77/Extras/Serialize - - - true - - - ..\external\bullet-2.77\msvc\2008\lib\x64\Release;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - - - - + + + + + Debug + x64 + + + Editor Debug + x64 + + + Release + x64 + + + + {D8B26B12-E45C-47EA-88F7-56628EB2CCD1} + net6.0 + ManagedCProj + LSLibNative + 10.0 + + + + DynamicLibrary + true + v143 + NetCore + Unicode + + + DynamicLibrary + false + v143 + NetCore + Unicode + + + DynamicLibrary + false + v143 + NetCore + Unicode + + + + + + + + + + + + + + + + true + + + false + + + false + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ../external/bullet-2.77/src;../external/bullet-2.77/Extras/Serialize + + + true + + + ..\external\bullet-2.77\msvc\2008\lib\x64\Debug;%(AdditionalLibraryDirectories) + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ../external/bullet-2.77/src;../external/bullet-2.77/Extras/Serialize + + + true + + + ..\external\bullet-2.77\msvc\2008\lib\x64\Release;%(AdditionalLibraryDirectories) + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ../external/bullet-2.77/src;../external/bullet-2.77/Extras/Serialize + + + true + + + ..\external\bullet-2.77\msvc\2008\lib\x64\Release;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + + false + false + false + + + false + false + false + + + false + false + false + + + false + false + false + + + + + + \ No newline at end of file diff --git a/OpenTK/Globals.cs b/OpenTK/Globals.cs new file mode 100644 index 00000000..f68c2a8b --- /dev/null +++ b/OpenTK/Globals.cs @@ -0,0 +1 @@ +[assembly: CLSCompliant(false)] \ No newline at end of file diff --git a/OpenTK/OpenTK.csproj b/OpenTK/OpenTK.csproj index 4d9d81df..cb20de0b 100644 --- a/OpenTK/OpenTK.csproj +++ b/OpenTK/OpenTK.csproj @@ -4,9 +4,9 @@ enable disable true - x64 OpenTK OpenTK Copyright © 2014 + x64 \ No newline at end of file diff --git a/RconClient/RakNetClient.cs b/RconClient/RakNetClient.cs index db2dfeae..24075eeb 100644 --- a/RconClient/RakNetClient.cs +++ b/RconClient/RakNetClient.cs @@ -103,7 +103,7 @@ private void HandleConnectionResponse1(IPEndPoint address, OpenConnectionRespons ClientId = ClientId, Address = new RakAddress { - Address = (UInt32)IPAddress.Parse("127.0.0.1").Address, + Address = BitConverter.ToUInt32(IPAddress.Parse("127.0.0.1").GetAddressBytes()), Port = Socket.Port }, MTU = 1200 diff --git a/RconClient/RconClient.csproj b/RconClient/RconClient.csproj index b7d4dbe1..810b6bed 100644 --- a/RconClient/RconClient.csproj +++ b/RconClient/RconClient.csproj @@ -8,5 +8,6 @@ RCON Client LSLib Copyright © Norbyte 2012-2018 + x64 \ No newline at end of file diff --git a/StatParser/StatParser.csproj b/StatParser/StatParser.csproj index ffca1e4a..7bd84621 100644 --- a/StatParser/StatParser.csproj +++ b/StatParser/StatParser.csproj @@ -8,6 +8,7 @@ StatParser StatParser Copyright © 2019 + x64 diff --git a/StoryCompiler/StoryCompiler.csproj b/StoryCompiler/StoryCompiler.csproj index 29b9fb51..f39e0fb6 100644 --- a/StoryCompiler/StoryCompiler.csproj +++ b/StoryCompiler/StoryCompiler.csproj @@ -8,6 +8,7 @@ Osiris Story Compiler LSLib Copyright © Norbyte 2012-2018 + x64 diff --git a/StoryDecompiler/StoryDecompiler.csproj b/StoryDecompiler/StoryDecompiler.csproj index 66b4beaf..c622dfd6 100644 --- a/StoryDecompiler/StoryDecompiler.csproj +++ b/StoryDecompiler/StoryDecompiler.csproj @@ -7,6 +7,7 @@ Osiris Story Decompiler LSLib Copyright © Norbyte 2012-2018 + x64 diff --git a/TerrainFixup/TerrainFixup.csproj b/TerrainFixup/TerrainFixup.csproj index c7b18a89..f037f68d 100644 --- a/TerrainFixup/TerrainFixup.csproj +++ b/TerrainFixup/TerrainFixup.csproj @@ -4,6 +4,7 @@ net6.0 enable disable + x64 diff --git a/UnpackGrid/UnpackGrid.csproj b/UnpackGrid/UnpackGrid.csproj index dc048fca..ad6271a9 100644 --- a/UnpackGrid/UnpackGrid.csproj +++ b/UnpackGrid/UnpackGrid.csproj @@ -4,6 +4,7 @@ net6.0 enable disable + x64 From 083837fc663ebfe93d5376adec6ab7a28480b978 Mon Sep 17 00:00:00 2001 From: Lennard Fonteijn Date: Thu, 24 Aug 2023 22:02:12 +0200 Subject: [PATCH 3/5] Updated all NuGet packages Make sure LSLibNative can be used in a self-contained application --- ConverterApp/ConverterApp.csproj | 2 +- DebuggerFrontend/DebuggerFrontend.csproj | 6 +++--- Divine/Divine.csproj | 2 +- LSLib/LSLib.csproj | 2 +- LSLibNative/LSLibNative.vcxproj | 2 ++ StatParser/StatParser.csproj | 2 +- StoryCompiler/StoryCompiler.csproj | 6 +++--- StoryDecompiler/StoryDecompiler.csproj | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ConverterApp/ConverterApp.csproj b/ConverterApp/ConverterApp.csproj index 87f04c43..bcbae5c9 100644 --- a/ConverterApp/ConverterApp.csproj +++ b/ConverterApp/ConverterApp.csproj @@ -13,7 +13,7 @@ - 13.0.1 + 13.0.3 diff --git a/DebuggerFrontend/DebuggerFrontend.csproj b/DebuggerFrontend/DebuggerFrontend.csproj index 885e8506..9eafb43b 100644 --- a/DebuggerFrontend/DebuggerFrontend.csproj +++ b/DebuggerFrontend/DebuggerFrontend.csproj @@ -12,13 +12,13 @@ - 3.0.19 + 3.0.23 - 3.15.0 + 3.24.1 - 13.0.1 + 13.0.3 diff --git a/Divine/Divine.csproj b/Divine/Divine.csproj index 7ae150b4..4a221b46 100644 --- a/Divine/Divine.csproj +++ b/Divine/Divine.csproj @@ -11,7 +11,7 @@ - 3.0.19 + 3.0.23 diff --git a/LSLib/LSLib.csproj b/LSLib/LSLib.csproj index f1cf3ceb..54d8082d 100644 --- a/LSLib/LSLib.csproj +++ b/LSLib/LSLib.csproj @@ -15,7 +15,7 @@ 1.0.15.93 - 13.0.1 + 13.0.3 diff --git a/LSLibNative/LSLibNative.vcxproj b/LSLibNative/LSLibNative.vcxproj index 2d902f38..cd333cf2 100644 --- a/LSLibNative/LSLibNative.vcxproj +++ b/LSLibNative/LSLibNative.vcxproj @@ -147,6 +147,8 @@ + + \ No newline at end of file diff --git a/StatParser/StatParser.csproj b/StatParser/StatParser.csproj index 7bd84621..2f333cae 100644 --- a/StatParser/StatParser.csproj +++ b/StatParser/StatParser.csproj @@ -13,7 +13,7 @@ - 3.0.20 + 3.0.23 diff --git a/StoryCompiler/StoryCompiler.csproj b/StoryCompiler/StoryCompiler.csproj index f39e0fb6..fa8f178d 100644 --- a/StoryCompiler/StoryCompiler.csproj +++ b/StoryCompiler/StoryCompiler.csproj @@ -13,13 +13,13 @@ - 3.0.19 + 3.0.23 - 3.15.0 + 3.24.1 - 13.0.1 + 13.0.3 diff --git a/StoryDecompiler/StoryDecompiler.csproj b/StoryDecompiler/StoryDecompiler.csproj index c622dfd6..5b9a643c 100644 --- a/StoryDecompiler/StoryDecompiler.csproj +++ b/StoryDecompiler/StoryDecompiler.csproj @@ -12,7 +12,7 @@ - 3.0.19 + 3.0.23 From fedc48109d9c48088fa12bce87691c4dcffcaca3 Mon Sep 17 00:00:00 2001 From: Lennard Fonteijn Date: Thu, 24 Aug 2023 22:47:24 +0200 Subject: [PATCH 4/5] Add support for generating a proper NuGet package --- LSLib/LSLib.csproj | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/LSLib/LSLib.csproj b/LSLib/LSLib.csproj index 54d8082d..4f075e35 100644 --- a/LSLib/LSLib.csproj +++ b/LSLib/LSLib.csproj @@ -20,8 +20,8 @@ - - + + @@ -33,4 +33,28 @@ + + + + + true + lib\$(TargetFramework) + + + true + lib\$(TargetFramework) + + + + + $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage + True + + + + + <_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))" /> + + + From 3e073e2cf9f898acf3df1af9ad6871101633df1d Mon Sep 17 00:00:00 2001 From: Lennard Fonteijn Date: Fri, 22 Sep 2023 21:39:36 +0200 Subject: [PATCH 5/5] Updated NuGet package version --- LSLib/LSLib.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LSLib/LSLib.csproj b/LSLib/LSLib.csproj index 4f075e35..5c16c001 100644 --- a/LSLib/LSLib.csproj +++ b/LSLib/LSLib.csproj @@ -8,6 +8,9 @@ LSLib Copyright © Norbyte 2012-2023 x64 + Norbyte + Tools for manipulating Divinity Original Sin and Baldur's Gate 3 files + 1.18.6-nightly-1