FIX: Api generation file name collision, bump version 1.8.1

Directory.Build.props

@@ -7,7 +7,7 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
 
-    <VersionPrefix>1.8.0</VersionPrefix>
+    <VersionPrefix>1.8.1</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Generator/Program.cs

@@ -1,6 +1,7 @@
 // Copyright © Amer Koleci and Contributors.
 // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
 
+using System.Dynamic;
 using System.Globalization;
 using System.Text;
 using Newtonsoft.Json;
@@ -1092,7 +1093,7 @@ public static class Program
                 outputPath = wicPath;
                 useSubFolders = false;
             }
-            else if (jsonFile.EndsWith("Direct2D.json"))
+            else if (jsonFile == "Graphics.Direct2D.json")
             {
                 outputPath = d2dPath;
                 useSubFolders = false;
@@ -1221,8 +1222,35 @@ public static class Program
 
     private static void GenerateConstants(string folder, string apiName, string docFileName, ApiData api)
     {
+        bool generateFile = false;
+
+        foreach (var constant in api.Constants)
+        {
+            if (ShouldSkipConstant(constant))
+                continue;
+
+            bool skipValue = false;
+            foreach (var enumToGenerate in s_generatedEnums)
+            {
+                if (constant.Name.StartsWith(enumToGenerate.Key))
+                {
+                    skipValue = true;
+                    break;
+                }
+            }
+
+            if (skipValue)
+                continue;
+
+            generateFile = true;
+            break;
+        }
+
+        if (!generateFile)
+            return;
+
         using CodeWriter writer = new(
-            Path.Combine(folder, $"Apis.cs"),
+            Path.Combine(folder, $"{apiName}.Apis.cs"),
             apiName,
             docFileName,
             $"Win32.{apiName}");
@@ -1511,7 +1539,7 @@ public static class Program
             return;
 
         using CodeWriter writer = new(
-            Path.Combine(folder, "Apis.Functions.cs"),
+            Path.Combine(folder, $"{apiName}.Apis.Functions.cs"),
             apiName,
             docFileName,
             $"Win32.{apiName}");

src/Vortice.Win32.Graphics.Direct2D/Generated/Apis.cs

@@ -1,15 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Imaging.D2D;
-
-public static partial class Apis
-{
-}
-

src/Vortice.Win32.Graphics.Direct3D11on12/Generated/Apis.cs

@@ -1,15 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Direct3D11on12;
-
-public static partial class Apis
-{
-}
-

src/Vortice.Win32/Generated/Graphics/Direct2D.Common/Apis.cs

@@ -1,15 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Direct2D.Common;
-
-public static partial class Apis
-{
-}
-