Streamline type aliases, centralize suppressions in unit tests

Sergio0694 · Jan 14, 2023 · 48e4dbd · 48e4dbd
1 parent 113f2ba
commit 48e4dbd
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 65 deletions.
diff --git a/...D2D1.Tests.AssemblyLevelAttributes/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes.csproj b/...D2D1.Tests.AssemblyLevelAttributes/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj b/tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <NoWarn>$(NoWarn);CS0419;CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.D2D1.Tests/D2D1ResourceTextureManagerTests.cs b/tests/ComputeSharp.D2D1.Tests/D2D1ResourceTextureManagerTests.cs
@@ -12,14 +12,13 @@
 using SixLabors.ImageSharp.PixelFormats;
 using Win32;
 using Win32.Graphics.Direct2D;
+using HRESULT = Win32.HResult;
+using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect;
 
-#pragma warning disable CS0649, IDE0044, IDE0065
+#pragma warning disable CS0649, IDE0044
 
 namespace ComputeSharp.D2D1.Tests;
 
-using HRESULT = HResult;
-using D2D1_MAPPED_RECT = MappedRect;
-
 [TestClass]
 [TestCategory("D2D1ResourceTextureManager")]
 public partial class D2D1ResourceTextureManagerTests

diff --git a/tests/ComputeSharp.D2D1.Tests/D2D1TransformMapperTests.cs b/tests/ComputeSharp.D2D1.Tests/D2D1TransformMapperTests.cs
@@ -9,15 +9,14 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Win32;
 using Win32.Graphics.Direct2D;
+using HRESULT = Win32.HResult;
+using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect;
+using Rectangle = System.Drawing.Rectangle;
 
-#pragma warning disable CS0649, IDE0044, IDE0065
+#pragma warning disable CS0649, IDE0044
 
 namespace ComputeSharp.D2D1.Tests;
 
-using HRESULT = HResult;
-using D2D1_MAPPED_RECT = MappedRect;
-using Rectangle = System.Drawing.Rectangle;
-
 [TestClass]
 [TestCategory("D2D1TransformMapper")]
 public partial class D2D1TransformMapperTests

diff --git a/tests/ComputeSharp.D2D1.Tests/Effects/BokehBlurEffect.cs b/tests/ComputeSharp.D2D1.Tests/Effects/BokehBlurEffect.cs
@@ -11,20 +11,18 @@
 using SixLabors.ImageSharp;
 using Win32;
 using Win32.Graphics.Direct2D;
-
-#pragma warning disable IDE0065
+using D2D1_BORDER_EDGE_MODE = Win32.Graphics.Direct2D.BorderEdgeMode;
+using D2D1_BORDER_PROP = Win32.Graphics.Direct2D.BorderProp;
+using D2D1_BUFFER_PRECISION = Win32.Graphics.Direct2D.BufferPrecision;
+using D2D1_COMPOSITE_MODE = Win32.Graphics.Direct2D.Common.CompositeMode;
+using D2D1_COMPOSITE_PROP = Win32.Graphics.Direct2D.CompositeProp;
+using D2D1_INTERPOLATION_MODE = Win32.Graphics.Direct2D.InterpolationMode;
+using D2D1_PROPERTY = Win32.Graphics.Direct2D.Property;
+using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect;
+using D2D1_RENDERING_CONTROLS = Win32.Graphics.Direct2D.RenderingControls;
 
 namespace ComputeSharp.D2D1.Tests.Effects;
 
-using D2D1_BORDER_EDGE_MODE = BorderEdgeMode;
-using D2D1_BORDER_PROP = BorderProp;
-using D2D1_BUFFER_PRECISION = BufferPrecision;
-using D2D1_COMPOSITE_MODE = Win32.Graphics.Direct2D.Common.CompositeMode;
-using D2D1_COMPOSITE_PROP = CompositeProp;
-using D2D1_INTERPOLATION_MODE = InterpolationMode;
-using D2D1_PROPERTY = Property;
-using D2D1_MAPPED_RECT = MappedRect;
-using D2D1_RENDERING_CONTROLS = RenderingControls;
 using D2D1 = Win32.Graphics.Direct2D.Apis;
 
 /// <summary>

diff --git a/tests/ComputeSharp.D2D1.Tests/Extensions/HRESULTExtensions.cs b/tests/ComputeSharp.D2D1.Tests/Extensions/HRESULTExtensions.cs
@@ -4,13 +4,10 @@
 using System.Diagnostics.CodeAnalysis;
 #endif
 using System.Runtime.CompilerServices;
-
-#pragma warning disable IDE0065
+using HRESULT = Win32.HResult;
 
 namespace ComputeSharp.D2D1.Tests.Extensions;
 
-using HRESULT = Win32.HResult;
-
 /// <summary>
 /// Helper methods to efficiently throw exceptions.
 /// </summary>

diff --git a/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1Helper.cs b/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1Helper.cs
@@ -5,31 +5,29 @@
 using Win32.Graphics.Direct2D;
 using Win32.Graphics.Direct3D11;
 using Win32.Graphics.Dxgi;
-
-#pragma warning disable IDE0065
-
-namespace ComputeSharp.D2D1.Tests.Helpers;
-
 using D2D1_ALPHA_MODE = Win32.Graphics.Direct2D.Common.AlphaMode;
-using D2D1_BITMAP_OPTIONS = BitmapOptions;
-using D2D1_DEVICE_CONTEXT_OPTIONS = DeviceContextOptions;
-using D2D1_FACTORY_OPTIONS = FactoryOptions;
-using D2D1_FACTORY_TYPE = FactoryType;
-using D2D1_INTERPOLATION_MODE = InterpolationMode;
+using D2D1_BITMAP_OPTIONS = Win32.Graphics.Direct2D.BitmapOptions;
+using D2D1_DEVICE_CONTEXT_OPTIONS = Win32.Graphics.Direct2D.DeviceContextOptions;
+using D2D1_FACTORY_OPTIONS = Win32.Graphics.Direct2D.FactoryOptions;
+using D2D1_FACTORY_TYPE = Win32.Graphics.Direct2D.FactoryType;
+using D2D1_INTERPOLATION_MODE = Win32.Graphics.Direct2D.InterpolationMode;
 using D2D1_COMPOSITE_MODE = Win32.Graphics.Direct2D.Common.CompositeMode;
-using D2D1_MAP_OPTIONS = MapOptions;
+using D2D1_MAP_OPTIONS = Win32.Graphics.Direct2D.MapOptions;
 using D2D_RECT_U = Win32.Numerics.Rect;
 using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect;
-using D2D1_BITMAP_PROPERTIES = BitmapProperties;
-using D2D1_BITMAP_PROPERTIES1 = BitmapProperties1;
+using D2D1_BITMAP_PROPERTIES = Win32.Graphics.Direct2D.BitmapProperties;
+using D2D1_BITMAP_PROPERTIES1 = Win32.Graphics.Direct2D.BitmapProperties1;
 using D3D_FEATURE_LEVEL = Win32.Graphics.Direct3D.FeatureLevel;
 using D3D_DRIVER_TYPE = Win32.Graphics.Direct3D.DriverType;
-using D3D11_CREATE_DEVICE_FLAG = CreateDeviceFlags;
+using D3D11_CREATE_DEVICE_FLAG = Win32.Graphics.Direct3D11.CreateDeviceFlags;
 using DXGI_FORMAT = Win32.Graphics.Dxgi.Common.Format;
-using Win32 = Win32.Apis;
-using D2D1 = Win32.Graphics.Direct2D.Apis;
 using D3D11 = Win32.Graphics.Direct3D11.Apis;
 
+namespace ComputeSharp.D2D1.Tests.Helpers;
+
+using D2D1 = Win32.Graphics.Direct2D.Apis;
+using Win32 = Win32.Apis;
+
 /// <summary>
 /// A <see langword="class"/> that uses the D2D1 APIs to configure and run effects.
 /// </summary>

diff --git a/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1TestRunner.cs b/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1TestRunner.cs
@@ -6,13 +6,10 @@
 using ComputeSharp.Tests.Helpers;
 using Win32;
 using Win32.Graphics.Direct2D;
-
-#pragma warning disable IDE0065
+using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect;
 
 namespace ComputeSharp.D2D1.Tests.Helpers;
 
-using D2D1_MAPPED_RECT = MappedRect;
-
 /// <summary>
 /// A test helper for D2D1 pixel shaders.
 /// </summary>

diff --git a/tests/ComputeSharp.Tests.DeviceLost/ComputeSharp.Tests.DeviceLost.csproj b/tests/ComputeSharp.Tests.DeviceLost/ComputeSharp.Tests.DeviceLost.csproj
@@ -4,7 +4,6 @@
     <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.Tests.DeviceLost/DeviceDisposalTests.cs b/tests/ComputeSharp.Tests.DeviceLost/DeviceDisposalTests.cs
@@ -7,8 +7,6 @@
 using Win32;
 using Win32.Graphics.Direct3D12;
 
-#pragma warning disable IDE0065
-
 namespace ComputeSharp.Tests.DeviceLost;
 
 using Win32 = Win32.Apis;

diff --git a/tests/ComputeSharp.Tests.DeviceLost/GetDefaultDeviceTests.cs b/tests/ComputeSharp.Tests.DeviceLost/GetDefaultDeviceTests.cs
@@ -4,14 +4,11 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Win32;
 using Win32.Graphics.Direct3D12;
-
-#pragma warning disable IDE0065
-
-namespace ComputeSharp.Tests.DeviceLost;
-
 using DXGI = Win32.Graphics.Dxgi.Apis;
 using HRESULT = Win32.HResult;
 
+namespace ComputeSharp.Tests.DeviceLost;
+
 [TestClass]
 [TestCategory("GetDefaultDevice")]
 public class GetDefaultDeviceTests

diff --git a/tests/ComputeSharp.Tests.DeviceLost/Helpers/GraphicsDeviceHelper.cs b/tests/ComputeSharp.Tests.DeviceLost/Helpers/GraphicsDeviceHelper.cs
@@ -5,8 +5,6 @@
 using Win32;
 using Win32.Graphics.Direct3D12;
 
-#pragma warning disable IDE0065
-
 namespace ComputeSharp.Tests.DeviceLost.Helpers;
 
 using Win32 = Win32.Apis;

diff --git a/...Sharp.Tests.DisableDynamicCompilation/ComputeSharp.Tests.DisableDynamicCompilation.csproj b/...Sharp.Tests.DisableDynamicCompilation/ComputeSharp.Tests.DisableDynamicCompilation.csproj
@@ -4,7 +4,6 @@
     <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.Tests.GlobalStatements/ComputeSharp.Tests.GlobalStatements.csproj b/tests/ComputeSharp.Tests.GlobalStatements/ComputeSharp.Tests.GlobalStatements.csproj
@@ -5,7 +5,6 @@
     <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.Tests.Internals/ComputeSharp.Tests.Internals.csproj b/tests/ComputeSharp.Tests.Internals/ComputeSharp.Tests.Internals.csproj
@@ -4,7 +4,6 @@
     <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.Tests/ComputeSharp.Tests.csproj b/tests/ComputeSharp.Tests/ComputeSharp.Tests.csproj
@@ -4,7 +4,6 @@
     <TargetFrameworks>net472;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
-    <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/ComputeSharp.Tests/InteropServicesTests.cs b/tests/ComputeSharp.Tests/InteropServicesTests.cs
@@ -6,14 +6,12 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Win32;
 using Win32.Graphics.Direct3D12;
-
-#pragma warning disable IDE0065
-
-namespace ComputeSharp.Tests;
-
 using D3D12_RESOURCE_DIMENSION = Win32.Graphics.Direct3D12.ResourceDimension;
 using HRESULT = Win32.HResult;
 using LUID = Win32.Luid;
+
+namespace ComputeSharp.Tests;
+
 using Win32 = Win32.Apis;
 
 [TestClass]

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -2,6 +2,14 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
+
+    <!-- Unit tests don't need public XML docs -->
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+
+    <!-- Ignore platform compatibility warnings -->
+    <NoWarn>$(NoWarn);CA1416</NoWarn>
+
+    <!-- Ignore warnings for usings outside of a namespace (needed for some Vortice.Win32 type aliases) -->
+    <NoWarn>$(NoWarn);IDE0065</NoWarn>
   </PropertyGroup>
 </Project>