diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index b9b453f89..e8c2516af 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -73,8 +73,6 @@
all
-
-
diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs
index 2a93cf093..41c87fd39 100644
--- a/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs
+++ b/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs
@@ -15,7 +15,6 @@ using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Interface.Utility;
using Dalamud.Storage.Assets;
using Dalamud.Utility;
-using SharpDX.DXGI;
using TerraFX.Interop.DirectX;
namespace Dalamud.Interface.ManagedFontAtlas.Internals;
@@ -749,7 +748,7 @@ internal sealed partial class FontAtlasFactory
new(
width,
height,
- (int)(use4 ? Format.B4G4R4A4_UNorm : Format.B8G8R8A8_UNorm),
+ (int)(use4 ? DXGI_FORMAT.DXGI_FORMAT_B4G4R4A4_UNORM : DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM),
width * bpp),
buf,
name);
diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
index e38537018..6e4740b22 100644
--- a/Dalamud/Interface/UiBuilder.cs
+++ b/Dalamud/Interface/UiBuilder.cs
@@ -12,7 +12,6 @@ using Dalamud.Interface.FontIdentifier;
using Dalamud.Interface.Internal;
using Dalamud.Interface.ManagedFontAtlas;
using Dalamud.Interface.ManagedFontAtlas.Internals;
-using Dalamud.Plugin;
using Dalamud.Plugin.Internal.Types;
using Dalamud.Utility;
using Serilog;
@@ -150,13 +149,6 @@ public interface IUiBuilder
///
public ImFontPtr FontMono { get; }
- ///
- /// Gets the game's active Direct3D device.
- ///
- // TODO: Remove it on API11/APIXI, and remove SharpDX/PInvoke/etc. dependency from Dalamud.
- [Obsolete($"Use {nameof(DeviceHandle)} and wrap it using DirectX wrapper library of your choice.")]
- SharpDX.Direct3D11.Device Device { get; }
-
/// Gets the game's active Direct3D device.
/// Pointer to the instance of IUnknown that the game is using and should be containing an ID3D11Device,
/// or 0 if it is not available yet.
@@ -302,8 +294,6 @@ public sealed class UiBuilder : IDisposable, IUiBuilder
private IFontHandle? monoFontHandle;
private IFontHandle? iconFontFixedWidthHandle;
- private SharpDX.Direct3D11.Device? sdxDevice;
-
///
/// Initializes a new instance of the class and registers it.
/// You do not have to call this manually.
@@ -493,12 +483,6 @@ public sealed class UiBuilder : IDisposable, IUiBuilder
this.InterfaceManagerWithScene?.MonoFontHandle
?? throw new InvalidOperationException("Scene is not yet ready.")));
- ///
- // TODO: Remove it on API11/APIXI, and remove SharpDX/PInvoke/etc. dependency from Dalamud.
- [Obsolete($"Use {nameof(DeviceHandle)} and wrap it using DirectX wrapper library of your choice.")]
- public SharpDX.Direct3D11.Device Device =>
- this.sdxDevice ??= new(this.InterfaceManagerWithScene!.Backend!.DeviceHandle);
-
///
public nint DeviceHandle => this.InterfaceManagerWithScene?.Backend?.DeviceHandle ?? 0;
diff --git a/Dalamud/Storage/Assets/DalamudAssetPurpose.cs b/Dalamud/Storage/Assets/DalamudAssetPurpose.cs
index e6c7bd920..69de1f871 100644
--- a/Dalamud/Storage/Assets/DalamudAssetPurpose.cs
+++ b/Dalamud/Storage/Assets/DalamudAssetPurpose.cs
@@ -11,12 +11,12 @@ public enum DalamudAssetPurpose
Empty = 0,
///
- /// The asset is a .png file, and can be purposed as a .
+ /// The asset is a .png file, and can be purposed as a .
///
TextureFromPng = 10,
-
+
///
- /// The asset is a raw texture, and can be purposed as a .
+ /// The asset is a raw texture, and can be purposed as a .
///
TextureFromRaw = 1001,
diff --git a/Dalamud/Utility/VectorExtensions.cs b/Dalamud/Utility/VectorExtensions.cs
deleted file mode 100644
index f617c8420..000000000
--- a/Dalamud/Utility/VectorExtensions.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Numerics;
-
-namespace Dalamud.Utility;
-
-///
-/// Extension methods for System.Numerics.VectorN and SharpDX.VectorN.
-///
-public static class VectorExtensions
-{
- ///
- /// Converts a SharpDX vector to System.Numerics.
- ///
- /// Vector to convert.
- /// A converted vector.
- public static Vector2 ToSystem(this SharpDX.Vector2 vec) => new(x: vec.X, y: vec.Y);
-
- ///
- /// Converts a SharpDX vector to System.Numerics.
- ///
- /// Vector to convert.
- /// A converted vector.
- public static Vector3 ToSystem(this SharpDX.Vector3 vec) => new(x: vec.X, y: vec.Y, z: vec.Z);
-
- ///
- /// Converts a SharpDX vector to System.Numerics.
- ///
- /// Vector to convert.
- /// A converted vector.
- public static Vector4 ToSystem(this SharpDX.Vector4 vec) => new(x: vec.X, y: vec.Y, z: vec.Z, w: vec.W);
-
- ///
- /// Converts a System.Numerics vector to SharpDX.
- ///
- /// Vector to convert.
- /// A converted vector.
- public static SharpDX.Vector2 ToSharpDX(this Vector2 vec) => new(x: vec.X, y: vec.Y);
-
- ///
- /// Converts a System.Numerics vector to SharpDX.
- ///
- /// Vector to convert.
- /// A converted vector.
- public static SharpDX.Vector3 ToSharpDX(this Vector3 vec) => new(x: vec.X, y: vec.Y, z: vec.Z);
-
- ///
- /// Converts a System.Numerics vector to SharpDX.
- ///
- /// Vector to convert.
- /// A converted vector.
- public static SharpDX.Vector4 ToSharpDX(this Vector4 vec) => new(x: vec.X, y: vec.Y, z: vec.Z, w: vec.W);
-}
diff --git a/Directory.Packages.props b/Directory.Packages.props
index d62d247c3..481e7591d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -26,9 +26,7 @@
-
-
-
+
diff --git a/build/DalamudBuild.cs b/build/DalamudBuild.cs
index ba2b09a4d..1a189f2c7 100644
--- a/build/DalamudBuild.cs
+++ b/build/DalamudBuild.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using Nuke.Common;
using Nuke.Common.Execution;
using Nuke.Common.Git;
@@ -128,7 +127,7 @@ public class DalamudBuild : NukeBuild
if (IsCIBuild)
{
s = s
- .SetProcessArgumentConfigurator(a => a.Add("/clp:NoSummary")); // Disable MSBuild summary on CI builds
+ .SetProcessAdditionalArguments("/clp:NoSummary"); // Disable MSBuild summary on CI builds
}
// We need to emit compiler generated files for the docs build, since docfx can't run generators directly
// TODO: This fails every build after this because of redefinitions...
@@ -238,7 +237,6 @@ public class DalamudBuild : NukeBuild
.SetProject(InjectorProjectFile)
.SetConfiguration(Configuration));
- FileSystemTasks.DeleteDirectory(ArtifactsDirectory);
- Directory.CreateDirectory(ArtifactsDirectory);
+ ArtifactsDirectory.CreateOrCleanDirectory();
});
}
diff --git a/build/build.csproj b/build/build.csproj
index 1e1416d92..7096c7f8a 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -11,7 +11,7 @@
false
-
+