Fixes #782 - DEFINE_DEVPROPKEY should emit a DEVPROPKEY, not PROPERTYKEY

generation/WinSDK/ConstantsScraper.header.txt

@@ -1,5 +1,5 @@
 using Windows.Win32.UI.Shell.PropertiesSystem; // For PROPERTYKEY
-using Windows.Win32.System.SystemServices;
+using Windows.Win32.Devices.Properties;  // For DEVPROPKEY
 using static Windows.Win32.Data.Xml.MsXml.Apis; // Various constants
 using static Windows.Win32.Devices.DeviceAccess.Apis; // Various constants
 using static Windows.Win32.Foundation.Apis; // Various constants

scripts/BaselineWinmd/Windows.Win32.winmd

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a62b259aee77b47b24d074089a02d9177ca0961836bb758ca725f7811f1a272f
+oid sha256:e39675e2adcf0fc693c59ec8058867d740a69d6832976e8f8b6f690b57bd592c
 size 16089600

sources/GeneratorSdk/version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.21-preview",
+  "version": "0.22-preview",
   "assemblyVersion": {
     "precision": "revision"
   },

sources/MetadataUtils/ConstantWriter.cs

@@ -42,7 +42,7 @@ namespace MetadataUtils
             }
         }
 
-        public void AddPropKey(string name, string args)
+        public void AddPropKey(string structType, string name, string args)
         {
             if (this.namesToValues.ContainsKey(name))
             {
@@ -53,7 +53,7 @@ namespace MetadataUtils
 
             this.Writer.WriteLine(
 $@"        [PropertyKey({args})]
-        public static readonly PROPERTYKEY {name};");
+        public static readonly {structType} {name};");
 
             this.Writer.WriteLine();
         }

sources/MetadataUtils/ConstantsScraper.cs

@@ -339,7 +339,8 @@ namespace MetadataUtils
 
                 if (defineGuidKeyword == "DEFINE_DEVPROPKEY" || defineGuidKeyword == "DEFINE_PROPERTYKEY")
                 {
-                    writer.AddPropKey(name, args);
+                    string structType = defineGuidKeyword == "DEFINE_DEVPROPKEY" ? "DEVPROPKEY" : "PROPERTYKEY";
+                    writer.AddPropKey(structType, name, args);
                 }
                 else
                 {

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "21.0-preview",
+  "version": "22.0-preview",
   "assemblyVersion": {
     "precision": "revision"
   },