Retired Windows.Win32.Interop.dll and moved attribute definitions to …

…Windows.Win32.Foundation.Metadata (#1527) * Initial attempt at merging Interop types into the main winmd. The winmd is generated but the attributes don't appear to be retaining the Attribute inheritance which is causing build failures in the WinmdGenerator and samples. * Updated new files and attributes. * Updated interop reference. * Attributes moved to Windows.Win32.Foundation.Metadata and everything builds and compiles but attributes that expose properties like MemorySize and NativeArrayInfo have questionable definitions since the properties aren't exposed in the metadata. * Updated debug configuration. * Added support for properties and attributes. * Updated the baseline. * Added public constructors. * Updated the diffing tool to account for the attribute namespace change and updated the baseline.
microsoft · Apr 6, 2023 · 45869a0 · 45869a0
1 parent 18f30ab
commit 45869a0
Show file tree

Hide file tree

Showing 108 changed files with 537 additions and 549 deletions.
diff --git a/BuildTools/BuildTools.proj b/BuildTools/BuildTools.proj
@@ -4,7 +4,6 @@
     <ProjectReference Include="..\sources\ConstantsScraper\ConstantsScraper.csproj"/>
     <ProjectReference Include="..\sources\ClangSharpSourceToWinmd\ClangSharpSourceToWinmd.csproj"/>
     <ProjectReference Include="..\sources\WinmdUtils\WinmdUtils.csproj"/>
-    <ProjectReference Include="..\sources\Win32MetadataInterop\Win32MetadataInterop.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -156,7 +156,7 @@ Constants are removed from the metadata when they are detected as members of an
 
 ## Attributes
 
-Our tooling defines several [attributes](sources/Win32MetadataInterop) that can be applied to APIs to provide useful context to language projections.
+Our tooling defines several [attributes](generation/WinSDK/manual/Metadata.cs) that can be applied to APIs to provide useful context to language projections.
 
 To apply an attribute to an API, update the `--memberRemap` section of [emitter.settings.rsp](generation/WinSDK/emitter.settings.rsp) in one of the following ways:
 

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Note: Community projects are listed here to help with discovery but are not offi
 
 See the [roadmap](./docs/roadmap.md) and [FAQ](./docs/faq.md) for more details.
 
-If you'd like to browse the metadata to see what we're emitting, extract Windows.Win32.winmd and Windows.Win32.Interop.dll from the [Microsoft.Windows.SDK.Win32Metadata](https://www.nuget.org/packages/Microsoft.Windows.SDK.Win32Metadata/) NuGet package and load Windows.Win32.winmd in [ILSpy](https://github.com/icsharpcode/ILSpy/releases/latest). Download the package and rename it to .zip to browse and extract its content.
+If you'd like to browse the metadata to see what we're emitting, extract Windows.Win32.winmd from the [Microsoft.Windows.SDK.Win32Metadata](https://www.nuget.org/packages/Microsoft.Windows.SDK.Win32Metadata/) NuGet package and load Windows.Win32.winmd in [ILSpy](https://github.com/icsharpcode/ILSpy/releases/latest). Download the package and rename it to .zip to browse and extract its content.
 
 ![ILSpy with winmd](./images/ILSpyWithWinmd.png)
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -169,7 +169,7 @@ jobs:
     inputs:
       ConnectedServiceName: 'Xlang Code Signing'
       FolderPath: '$(Build.SourcesDirectory)\bin'
-      Pattern: 'Windows.Win32.Interop.dll,Windows.Win32.winmd'
+      Pattern: 'Windows.Win32.winmd'
       signConfigType: 'inlineSignParams'
       inlineOperation: |
         [

diff --git a/generation/WinSDK/manual/ApplicationInstallationAndServicing.cs b/generation/WinSDK/manual/ApplicationInstallationAndServicing.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.ApplicationInstallationAndServicing
 {

diff --git a/generation/WinSDK/manual/Audio.cs b/generation/WinSDK/manual/Audio.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 using static Windows.Win32.UI.WindowsAndMessaging.Apis;
 
 namespace Windows.Win32.Media.Audio

diff --git a/generation/WinSDK/manual/Com.cs b/generation/WinSDK/manual/Com.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 using static Windows.Win32.UI.Controls.Apis;
 
 namespace Windows.Win32.System.Com

diff --git a/generation/WinSDK/manual/Console.cs b/generation/WinSDK/manual/Console.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.Console
 {

diff --git a/generation/WinSDK/manual/Controls.cs b/generation/WinSDK/manual/Controls.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 using static Windows.Win32.UI.Controls.Apis;
 
 namespace Windows.Win32.UI.Controls

diff --git a/generation/WinSDK/manual/CryptCerts.cs b/generation/WinSDK/manual/CryptCerts.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 using static Windows.Win32.UI.WindowsAndMessaging.Apis;
 
 namespace Windows.Win32.Security.Cryptography.Certificates

diff --git a/generation/WinSDK/manual/DevInst.cs b/generation/WinSDK/manual/DevInst.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Devices.DeviceAndDriverInstallation
 {

diff --git a/generation/WinSDK/manual/Dfs.cs b/generation/WinSDK/manual/Dfs.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Storage.IscsiDisc
 {

diff --git a/generation/WinSDK/manual/Direct2D.cs b/generation/WinSDK/manual/Direct2D.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Graphics.Direct2D
 {

diff --git a/generation/WinSDK/manual/DirectWrite.cs b/generation/WinSDK/manual/DirectWrite.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 using static Windows.Win32.System.SystemServices.Apis;
 
 namespace Windows.Win32.Graphics.DirectWrite

diff --git a/generation/WinSDK/manual/Dxgi.cs b/generation/WinSDK/manual/Dxgi.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Graphics.Dxgi
 {

diff --git a/generation/WinSDK/manual/ETW.cs b/generation/WinSDK/manual/ETW.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.Diagnostics.Etw
 {

diff --git a/generation/WinSDK/manual/FileSystem.cs b/generation/WinSDK/manual/FileSystem.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Storage.FileSystem
 {

diff --git a/generation/WinSDK/manual/Foundation.cs b/generation/WinSDK/manual/Foundation.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Foundation
 {

diff --git a/generation/WinSDK/manual/Gdi.cs b/generation/WinSDK/manual/Gdi.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Graphics.Gdi
 {

diff --git a/generation/WinSDK/manual/HiDpi.cs b/generation/WinSDK/manual/HiDpi.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.UI.HiDpi
 {

diff --git a/generation/WinSDK/manual/Identity.cs b/generation/WinSDK/manual/Identity.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Security.Authentication.Identity
 {

diff --git a/generation/WinSDK/manual/Iis.cs b/generation/WinSDK/manual/Iis.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using Windows.Win32.Foundation;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.Iis
 {

diff --git a/generation/WinSDK/manual/Ioctl.cs b/generation/WinSDK/manual/Ioctl.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.Ioctl
 {

diff --git a/generation/WinSDK/manual/JobObjects.cs b/generation/WinSDK/manual/JobObjects.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.JobObjects
 {

diff --git a/generation/WinSDK/manual/Js.cs b/generation/WinSDK/manual/Js.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.Js
 {

diff --git a/generation/WinSDK/manual/Kernel.cs b/generation/WinSDK/manual/Kernel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.System.Kernel
 {

diff --git a/generation/WinSDK/manual/MediaFoundation.cs b/generation/WinSDK/manual/MediaFoundation.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-using Windows.Win32.Interop;
+using Windows.Win32.Foundation.Metadata;
 
 namespace Windows.Win32.Media.MediaFoundation
 {