From bbffbd14d5ddd8306eee0132d16fafc9e67d18fe Mon Sep 17 00:00:00 2001 From: burninrubber0 Date: Mon, 13 Apr 2026 19:00:45 -0400 Subject: [PATCH] Target .NET 10 --- .editorconfig | 4 ++++ BaseHandlers/BaseHandlers.csproj | 2 +- BaseHandlers/InstanceListEditor.cs | 2 ++ BaseHandlers/StreetDataEditor.cs | 4 +++- BaseHandlers/TriggerDataEditor.cs | 4 +++- BundleFormat/BundleFormat.csproj | 2 +- BundleManager/BundleManager.csproj | 21 ++++++------------- BundleManager/EntryEditor.cs | 4 ++-- BundleManager/MainForm.cs | 1 + BundleManager/VertexSizePicker.cs | 4 +++- BundleUtilities/BundleUtilities.csproj | 2 +- BundleUtilities/LoadingDialog.cs | 5 +++++ BurnoutImage/BurnoutImage.csproj | 3 +-- BurnoutImage/CompressionTools.cs | 2 +- ComponentTester/ComponentTester.csproj | 2 +- HexEditor/HexEditor.csproj | 2 +- HexEditor/HexView.cs | 2 ++ IconLibrary/IconLibrary.csproj | 2 +- LangEditor/LangEdit.cs | 2 ++ LangEditor/LangEditor.csproj | 2 +- LoopModel/LoopModel.csproj | 2 +- LoopModel/LoopModelEditor.cs | 2 ++ LuaList/LuaList.csproj | 2 +- LuaList/LuaListEditor.cs | 4 +++- MathLib/MathLib.csproj | 2 +- ModelViewer/ModelViewer.csproj | 2 +- ModelViewer/SceneRenderControl.cs | 3 ++- PVSFormat/PVSEditControl.cs | 2 ++ PVSFormat/PVSEditor.cs | 6 ++++-- PVSFormat/PVSFormat.csproj | 2 +- PluginAPI/PluginAPI.csproj | 2 +- PluginSystem/PluginSystem.csproj | 2 +- VaultFormat/AttribSysVaultForm.cs | 12 ++++++----- VaultFormat/VaultFormat.csproj | 2 +- VehicleList/VehicleEditor.cs | 2 ++ VehicleList/VehicleList.csproj | 2 +- VehicleList/VehicleListForm.cs | 2 ++ WheelList/WheelEditor.cs | 1 + WheelList/WheelList.csproj | 2 +- WheelList/WheelListForm.cs | 1 + WorldCollisionHandler/WorldColEditor.cs | 6 ++++-- .../WorldCollisionHandler.csproj | 2 +- 42 files changed, 83 insertions(+), 52 deletions(-) diff --git a/.editorconfig b/.editorconfig index c6e6dd4..fe609e3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,3 +7,7 @@ charset = utf-8 indent_style = space indent_size = 4 dotnet_diagnostic.CA1416.severity = none + +[*.csproj] +indent_style = space +indent_size = 2 diff --git a/BaseHandlers/BaseHandlers.csproj b/BaseHandlers/BaseHandlers.csproj index 011fde8..7d5c943 100644 --- a/BaseHandlers/BaseHandlers.csproj +++ b/BaseHandlers/BaseHandlers.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/BaseHandlers/InstanceListEditor.cs b/BaseHandlers/InstanceListEditor.cs index 59d0bbd..d22aefe 100644 --- a/BaseHandlers/InstanceListEditor.cs +++ b/BaseHandlers/InstanceListEditor.cs @@ -6,6 +6,7 @@ using PluginAPI; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Threading; using System.Windows.Forms; @@ -18,6 +19,7 @@ public partial class InstanceListEditor : Form, IEntryEditor private InstanceList _instanceList; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public InstanceList InstanceList { get => _instanceList; diff --git a/BaseHandlers/StreetDataEditor.cs b/BaseHandlers/StreetDataEditor.cs index 2e48fe6..3b79310 100644 --- a/BaseHandlers/StreetDataEditor.cs +++ b/BaseHandlers/StreetDataEditor.cs @@ -1,11 +1,12 @@ +using PluginAPI; using System; using System.Collections; +using System.ComponentModel; using System.Globalization; using System.IO; using System.Text.Json; using System.Text.Json.Serialization; using System.Windows.Forms; -using PluginAPI; namespace BaseHandlers { @@ -14,6 +15,7 @@ public partial class StreetDataEditor : Form, IEntryEditor public event Notify EditEvent; private StreetData _model; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public StreetData Model { get => _model; diff --git a/BaseHandlers/TriggerDataEditor.cs b/BaseHandlers/TriggerDataEditor.cs index f87a6a9..0aa77b4 100644 --- a/BaseHandlers/TriggerDataEditor.cs +++ b/BaseHandlers/TriggerDataEditor.cs @@ -1,6 +1,7 @@ +using PluginAPI; using System; +using System.ComponentModel; using System.Windows.Forms; -using PluginAPI; namespace BaseHandlers { @@ -10,6 +11,7 @@ public partial class TriggerDataEditor : Form, IEntryEditor public event Notify EditEvent; private TriggerData _trigger; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public TriggerData trigger { get => _trigger; diff --git a/BundleFormat/BundleFormat.csproj b/BundleFormat/BundleFormat.csproj index c742b6f..6f2c78d 100644 --- a/BundleFormat/BundleFormat.csproj +++ b/BundleFormat/BundleFormat.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/BundleManager/BundleManager.csproj b/BundleManager/BundleManager.csproj index 54bbc16..8a830b8 100644 --- a/BundleManager/BundleManager.csproj +++ b/BundleManager/BundleManager.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows WinExe publish\ true @@ -18,18 +18,9 @@ false true true - true - - BundleManager.Program - - icon.ico - - App.manifest - - win-x64 @@ -58,7 +49,7 @@ - + - - - - + + + + diff --git a/BundleManager/EntryEditor.cs b/BundleManager/EntryEditor.cs index 27d19c6..16665fb 100644 --- a/BundleManager/EntryEditor.cs +++ b/BundleManager/EntryEditor.cs @@ -21,6 +21,7 @@ public partial class EntryEditor : Form private delegate void SetEntry(BundleEntry entry); private BundleEntry _entry; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public BundleEntry Entry { get @@ -57,8 +58,7 @@ public BundleEntry Entry } } - - + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public bool ForceHex { get; diff --git a/BundleManager/MainForm.cs b/BundleManager/MainForm.cs index 4d2df99..ff79596 100644 --- a/BundleManager/MainForm.cs +++ b/BundleManager/MainForm.cs @@ -18,6 +18,7 @@ public partial class MainForm : Form #region Variables and Properties private bool _subForm; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public bool SubForm { get { return _subForm; } diff --git a/BundleManager/VertexSizePicker.cs b/BundleManager/VertexSizePicker.cs index 834919d..08e1a7c 100644 --- a/BundleManager/VertexSizePicker.cs +++ b/BundleManager/VertexSizePicker.cs @@ -1,5 +1,6 @@ -using System; +using System; using System.Collections.Generic; +using System.ComponentModel; using System.Windows.Forms; namespace BundleManager @@ -20,6 +21,7 @@ public int VertexSize } private List _vertexSizeList; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public List VertexSizeList { get { return _vertexSizeList; } diff --git a/BundleUtilities/BundleUtilities.csproj b/BundleUtilities/BundleUtilities.csproj index a35afc3..88c6006 100644 --- a/BundleUtilities/BundleUtilities.csproj +++ b/BundleUtilities/BundleUtilities.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/BundleUtilities/LoadingDialog.cs b/BundleUtilities/LoadingDialog.cs index 7b47ad4..759f607 100644 --- a/BundleUtilities/LoadingDialog.cs +++ b/BundleUtilities/LoadingDialog.cs @@ -1,5 +1,6 @@ using BundleUtilities; using System; +using System.ComponentModel; using System.Windows.Forms; namespace BundleUtilities @@ -12,6 +13,7 @@ public partial class LoadingDialog : Form, ILoader private delegate object GetObject(); private delegate void SetObject(object obj); private object _value; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public object Value { get @@ -46,14 +48,17 @@ public object Value } } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public bool IsDone { get; set; } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public string Status { get => lblStatus.Text; set => lblStatus.Text = value; } + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public int Progress { get => pboMain.Value; diff --git a/BurnoutImage/BurnoutImage.csproj b/BurnoutImage/BurnoutImage.csproj index dc4bea8..71b7397 100644 --- a/BurnoutImage/BurnoutImage.csproj +++ b/BurnoutImage/BurnoutImage.csproj @@ -1,11 +1,10 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true true - true diff --git a/BurnoutImage/CompressionTools.cs b/BurnoutImage/CompressionTools.cs index 5f0d81b..2287593 100644 --- a/BurnoutImage/CompressionTools.cs +++ b/BurnoutImage/CompressionTools.cs @@ -30,7 +30,7 @@ public static byte[] DecompressTexture(byte[] source, int width, int height, Com { BcDecoder decoder = new BcDecoder(); Image image = decoder.DecodeRawToImageRgba32(source, width, height, compression); - byte[] data = new byte[width * height * Unsafe.SizeOf()]; + byte[] data = new byte[width * height * 4]; image.CopyPixelDataTo(data); return data; } diff --git a/ComponentTester/ComponentTester.csproj b/ComponentTester/ComponentTester.csproj index 78c363c..759d225 100644 --- a/ComponentTester/ComponentTester.csproj +++ b/ComponentTester/ComponentTester.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/HexEditor/HexEditor.csproj b/HexEditor/HexEditor.csproj index 1d46ddd..882dd14 100644 --- a/HexEditor/HexEditor.csproj +++ b/HexEditor/HexEditor.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/HexEditor/HexView.cs b/HexEditor/HexView.cs index 9d1c6eb..4a6e670 100644 --- a/HexEditor/HexView.cs +++ b/HexEditor/HexView.cs @@ -1,4 +1,5 @@ using System; +using System.ComponentModel; using System.Drawing; using System.Text; using System.Windows.Forms; @@ -8,6 +9,7 @@ namespace HexEditor public class HexView : UserControl { private byte[] _hexData; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public byte[] HexData { get diff --git a/IconLibrary/IconLibrary.csproj b/IconLibrary/IconLibrary.csproj index a35afc3..88c6006 100644 --- a/IconLibrary/IconLibrary.csproj +++ b/IconLibrary/IconLibrary.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/LangEditor/LangEdit.cs b/LangEditor/LangEdit.cs index 3f61030..41fea6a 100644 --- a/LangEditor/LangEdit.cs +++ b/LangEditor/LangEdit.cs @@ -1,6 +1,7 @@ using PluginAPI; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Globalization; using System.IO; using System.Text; @@ -18,6 +19,7 @@ public partial class LangEdit : Form, IEntryEditor private string searchVal; private Dictionary dict; private Language _lang; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public Language Lang { get => _lang; diff --git a/LangEditor/LangEditor.csproj b/LangEditor/LangEditor.csproj index 364a13b..4d589cc 100644 --- a/LangEditor/LangEditor.csproj +++ b/LangEditor/LangEditor.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/LoopModel/LoopModel.csproj b/LoopModel/LoopModel.csproj index ca3b317..cd614b8 100644 --- a/LoopModel/LoopModel.csproj +++ b/LoopModel/LoopModel.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows disable disable true diff --git a/LoopModel/LoopModelEditor.cs b/LoopModel/LoopModelEditor.cs index 86ca14f..1b2ec87 100644 --- a/LoopModel/LoopModelEditor.cs +++ b/LoopModel/LoopModelEditor.cs @@ -1,6 +1,7 @@ using PluginAPI; using ScottPlot; using System; +using System.ComponentModel; using System.Windows.Forms; namespace LoopModel @@ -28,6 +29,7 @@ public partial class LoopModelEditor : Form, IEntryEditor private int selectedGraphIndex = 0; private LoopModelData _data; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public LoopModelData Data { get => _data; diff --git a/LuaList/LuaList.csproj b/LuaList/LuaList.csproj index 364a13b..4d589cc 100644 --- a/LuaList/LuaList.csproj +++ b/LuaList/LuaList.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/LuaList/LuaListEditor.cs b/LuaList/LuaListEditor.cs index 7eb1614..3b85173 100644 --- a/LuaList/LuaListEditor.cs +++ b/LuaList/LuaListEditor.cs @@ -1,5 +1,6 @@ -using System.Windows.Forms; using PluginAPI; +using System.ComponentModel; +using System.Windows.Forms; namespace LuaList { @@ -9,6 +10,7 @@ public partial class LuaListEditor : Form, IEntryEditor public event Notify EditEvent; private LuaList _luaList; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public LuaList LuaList { get => _luaList; diff --git a/MathLib/MathLib.csproj b/MathLib/MathLib.csproj index b9c8cab..c2e57ed 100644 --- a/MathLib/MathLib.csproj +++ b/MathLib/MathLib.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/ModelViewer/ModelViewer.csproj b/ModelViewer/ModelViewer.csproj index 19130d6..9473c2d 100644 --- a/ModelViewer/ModelViewer.csproj +++ b/ModelViewer/ModelViewer.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/ModelViewer/SceneRenderControl.cs b/ModelViewer/SceneRenderControl.cs index 255d5d4..ee55d2d 100644 --- a/ModelViewer/SceneRenderControl.cs +++ b/ModelViewer/SceneRenderControl.cs @@ -8,7 +8,8 @@ namespace ModelViewer public partial class SceneRenderControl : UserControl { private GraphicsScene _graphicsScene; - + + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public Scene Scene { get => _graphicsScene?.Scene; diff --git a/PVSFormat/PVSEditControl.cs b/PVSFormat/PVSEditControl.cs index 52a9a99..cd0cdb8 100644 --- a/PVSFormat/PVSEditControl.cs +++ b/PVSFormat/PVSEditControl.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Drawing; using System.Numerics; using System.Windows.Forms; @@ -9,6 +10,7 @@ namespace PVSFormat public class PVSEditControl : Control { private PVS _pvsFile; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public PVS PVS { get => _pvsFile; diff --git a/PVSFormat/PVSEditor.cs b/PVSFormat/PVSEditor.cs index 3c48d49..df69f40 100644 --- a/PVSFormat/PVSEditor.cs +++ b/PVSFormat/PVSEditor.cs @@ -1,11 +1,12 @@ +using DebugHelper; +using PluginAPI; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Drawing; using System.Linq; using System.Numerics; using System.Windows.Forms; -using DebugHelper; -using PluginAPI; namespace PVSFormat { @@ -16,6 +17,7 @@ public partial class PVSEditor : Form, IEntryEditor private PVS _currentPVS; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public Image GameMap { get => pvsMain.GameMap; diff --git a/PVSFormat/PVSFormat.csproj b/PVSFormat/PVSFormat.csproj index 780ec95..fc05b7d 100644 --- a/PVSFormat/PVSFormat.csproj +++ b/PVSFormat/PVSFormat.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/PluginAPI/PluginAPI.csproj b/PluginAPI/PluginAPI.csproj index 9f98e9f..49a3a0b 100644 --- a/PluginAPI/PluginAPI.csproj +++ b/PluginAPI/PluginAPI.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/PluginSystem/PluginSystem.csproj b/PluginSystem/PluginSystem.csproj index e3028d7..f9b89f4 100644 --- a/PluginSystem/PluginSystem.csproj +++ b/PluginSystem/PluginSystem.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false diff --git a/VaultFormat/AttribSysVaultForm.cs b/VaultFormat/AttribSysVaultForm.cs index 81c8599..a89fa55 100644 --- a/VaultFormat/AttribSysVaultForm.cs +++ b/VaultFormat/AttribSysVaultForm.cs @@ -1,12 +1,13 @@ +using BundleUtilities; +using LangEditor; +using Newtonsoft.Json; +using PluginAPI; using System; using System.Collections; +using System.ComponentModel; using System.Globalization; -using System.Windows.Forms; using System.IO; -using Newtonsoft.Json; -using PluginAPI; -using BundleUtilities; -using LangEditor; +using System.Windows.Forms; namespace VaultFormat { @@ -21,6 +22,7 @@ public AttribSysVaultForm() public event Notify EditEvent; private AttribSys _attribSys; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public AttribSys AttribSys { get => _attribSys; diff --git a/VaultFormat/VaultFormat.csproj b/VaultFormat/VaultFormat.csproj index bacf522..79dc988 100644 --- a/VaultFormat/VaultFormat.csproj +++ b/VaultFormat/VaultFormat.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/VehicleList/VehicleEditor.cs b/VehicleList/VehicleEditor.cs index 289f7fb..fe753b0 100644 --- a/VehicleList/VehicleEditor.cs +++ b/VehicleList/VehicleEditor.cs @@ -1,5 +1,6 @@ using BundleUtilities; using System; +using System.ComponentModel; using System.Windows.Forms; namespace VehicleList @@ -9,6 +10,7 @@ public partial class VehicleEditor : Form public delegate void Done(Vehicle vehicle); public event Done OnDone; private Vehicle _vehicle; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public Vehicle Vehicle { get diff --git a/VehicleList/VehicleList.csproj b/VehicleList/VehicleList.csproj index f3d2e65..c303cfc 100644 --- a/VehicleList/VehicleList.csproj +++ b/VehicleList/VehicleList.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true diff --git a/VehicleList/VehicleListForm.cs b/VehicleList/VehicleListForm.cs index 00ef443..dd07343 100644 --- a/VehicleList/VehicleListForm.cs +++ b/VehicleList/VehicleListForm.cs @@ -3,6 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.ComponentModel; using System.Globalization; using System.Linq; using System.Windows.Forms; @@ -17,6 +18,7 @@ public partial class VehicleListForm : Form, IEntryEditor private VehicleListData _list; private System.Windows.Forms.Timer _searchTimer; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public VehicleListData List { get => _list; diff --git a/WheelList/WheelEditor.cs b/WheelList/WheelEditor.cs index 5c9ac9f..cc90dea 100644 --- a/WheelList/WheelEditor.cs +++ b/WheelList/WheelEditor.cs @@ -18,6 +18,7 @@ public partial class WheelEditor : Form public delegate void Done(Wheel wheel); public event Done OnDone; private Wheel _wheel; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public Wheel Wheel { get diff --git a/WheelList/WheelList.csproj b/WheelList/WheelList.csproj index f2e6469..c9a3a4c 100644 --- a/WheelList/WheelList.csproj +++ b/WheelList/WheelList.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows enable true enable diff --git a/WheelList/WheelListForm.cs b/WheelList/WheelListForm.cs index 70b195e..b26cece 100644 --- a/WheelList/WheelListForm.cs +++ b/WheelList/WheelListForm.cs @@ -20,6 +20,7 @@ public partial class WheelListForm : Form, IEntryEditor public event OnEdit Edit; private WheelListData _list; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public WheelListData List { get => _list; diff --git a/WorldCollisionHandler/WorldColEditor.cs b/WorldCollisionHandler/WorldColEditor.cs index f3a9d03..106fd83 100644 --- a/WorldCollisionHandler/WorldColEditor.cs +++ b/WorldCollisionHandler/WorldColEditor.cs @@ -1,8 +1,9 @@ -using System; -using System.Windows.Forms; using BundleUtilities; using DebugHelper; using PluginAPI; +using System; +using System.ComponentModel; +using System.Windows.Forms; namespace WorldCollisionHandler { @@ -12,6 +13,7 @@ public partial class WorldColEditor : Form, IEntryEditor public event OnChanged Changed; private PolygonSoupList _poly; + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public PolygonSoupList Poly { get => _poly; diff --git a/WorldCollisionHandler/WorldCollisionHandler.csproj b/WorldCollisionHandler/WorldCollisionHandler.csproj index 09f5177..8e549c5 100644 --- a/WorldCollisionHandler/WorldCollisionHandler.csproj +++ b/WorldCollisionHandler/WorldCollisionHandler.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows Library false true