Put [Guid] attribute first on interfaces and merge ifdef blocks

Sergio0694 · Copilot · Sergio0694 · commit d83014f545bf · 2026-04-19T16:44:40.000-07:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/IMapChangedEventArgs{K}.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/IMapChangedEventArgs{K}.cs
@@ -13,12 +13,11 @@ namespace Windows.Foundation.Collections;
 /// Provides data for the changed event of a map collection.
 /// </summary>
 /// <typeparam name="K">The type of keys in the map.</typeparam>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("9939F4DF-050A-4C0F-AA60-77075F9C4777")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IMapChangedEventArgs<K>
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/IObservableMap{K, V}.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/IObservableMap{K, V}.cs
@@ -16,12 +16,11 @@ namespace Windows.Foundation.Collections;
 /// </summary>
 /// <typeparam name="K">The type of keys in the observable map.</typeparam>
 /// <typeparam name="V">The type of values in the observable map.</typeparam>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("65DF2BF5-BF39-41B5-AEBC-5A9D865E472B")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IObservableMap<K, V> : IDictionary<K, V>, ICollection<KeyValuePair<K, V>>, IEnumerable<KeyValuePair<K, V>>, IEnumerable
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/IObservableVector{T}.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/IObservableVector{T}.cs
@@ -15,12 +15,11 @@ namespace Windows.Foundation.Collections;
 /// Notifies listeners of changes to the vector.
 /// </summary>
 /// <typeparam name="T">The type of elements in the observable vector.</typeparam>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("5917EB53-50B4-4A0D-B309-65862B3F1DBC")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IObservableVector<T> : IList<T>, ICollection<T>, IEnumerable<T>, IEnumerable
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/IVectorChangedEventArgs.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/IVectorChangedEventArgs.cs
@@ -12,12 +12,11 @@ namespace Windows.Foundation.Collections;
 /// <summary>
 /// Provides data for the changed event of a vector.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("575933DF-34FE-4480-AF15-07691F3D5D9B")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IVectorChangedEventArgs
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IAsyncAction.cs b/src/WinRT.Runtime2/Windows.Foundation/IAsyncAction.cs
@@ -19,12 +19,11 @@ namespace Windows.Foundation;
 /// by <see cref="Completed"/> is invoked, and this is the only result from the action.
 /// </remarks>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.iasyncaction"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("5A648006-843A-4DA9-865B-9D26E5DFAD7B")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IAsyncAction : IAsyncInfo
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IAsyncActionWithProgress{TProgress}.cs b/src/WinRT.Runtime2/Windows.Foundation/IAsyncActionWithProgress{TProgress}.cs
@@ -20,12 +20,11 @@ namespace Windows.Foundation;
 /// of these as there are methods that use <see cref="IAsyncAction"/>, whose APIs don't report progress and don't have a result.
 /// </remarks>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.iasyncactionwithprogress-1"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("1F6DB258-E803-48A1-9546-EB7353398884")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IAsyncActionWithProgress<TProgress> : IAsyncInfo
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IAsyncInfo.cs b/src/WinRT.Runtime2/Windows.Foundation/IAsyncInfo.cs
@@ -13,12 +13,11 @@ namespace Windows.Foundation;
 /// <summary>
 /// Provides support for asynchronous operations.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("00000036-0000-0000-C000-000000000046")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IAsyncInfo
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IAsyncOperationWithProgress{TResult, TProgress}.cs b/src/WinRT.Runtime2/Windows.Foundation/IAsyncOperationWithProgress{TResult, TProgress}.cs
@@ -22,12 +22,11 @@ namespace Windows.Foundation;
 /// use another interface, <see cref="IAsyncOperation{TResult}"/>.
 /// </remarks>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.iasyncoperationwithprogress-2"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("B5D036D7-E297-498F-BA60-0289E76E23DD")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IAsyncOperationWithProgress<TResult, TProgress> : IAsyncInfo
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IAsyncOperation{TResult}.cs b/src/WinRT.Runtime2/Windows.Foundation/IAsyncOperation{TResult}.cs
@@ -20,12 +20,11 @@ namespace Windows.Foundation;
 /// progress and have a result use another interface, <see cref="IAsyncOperationWithProgress{TResult, TProgress}"/>.
 /// </remarks>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.iasyncoperation-1"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("9FC2B0BB-E446-44E2-AA61-9CAB8F636AF2")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IAsyncOperation<TResult> : IAsyncInfo
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IMemoryBufferReference.cs b/src/WinRT.Runtime2/Windows.Foundation/IMemoryBufferReference.cs
@@ -13,12 +13,11 @@ namespace Windows.Foundation;
 /// <summary>
 /// Represents a reference to an <see href="https://learn.microsoft.com/uwp/api/windows.foundation.imemorybuffer"><c>IMemoryBuffer</c></see> object.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
-#endif
 [Guid("FBC4DD29-245B-11E4-AF98-689423260CF8")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(UniversalApiContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
 #endif
 public interface IMemoryBufferReference : IDisposable
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/IStringable.cs b/src/WinRT.Runtime2/Windows.Foundation/IStringable.cs
@@ -18,12 +18,11 @@ namespace Windows.Foundation;
 /// <see cref="object.ToString"/> method. When exposed to native code, they will implicitly get an implementation
 /// of <see cref="IStringable"/> that will call the managed <see cref="object.ToString"/> override.
 /// </remarks>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#endif
 [Guid("96369F54-8EB6-48F0-ABCE-C1B211E627C3")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public interface IStringable
 {
diff --git a/src/WinRT.Runtime2/Windows.Storage.Streams/IBuffer.cs b/src/WinRT.Runtime2/Windows.Storage.Streams/IBuffer.cs
@@ -14,12 +14,11 @@ namespace Windows.Storage.Streams;
 /// <summary>
 /// Represents a referenced array of bytes used by byte stream read and write interfaces.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
-#endif
 [Guid("905A0FE0-BC53-11DF-8C49-001E4FC686DA")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(UniversalApiContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
 #endif
 public interface IBuffer
 {
diff --git a/src/WinRT.Runtime2/Windows.Storage.Streams/IInputStream.cs b/src/WinRT.Runtime2/Windows.Storage.Streams/IInputStream.cs
@@ -14,12 +14,11 @@ namespace Windows.Storage.Streams;
 /// <summary>
 /// Represents a sequential stream of bytes to be read.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
-#endif
 [Guid("905A0FE2-BC53-11DF-8C49-001E4FC686DA")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(UniversalApiContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
 #endif
 public interface IInputStream : IDisposable
 {
diff --git a/src/WinRT.Runtime2/Windows.Storage.Streams/IOutputStream.cs b/src/WinRT.Runtime2/Windows.Storage.Streams/IOutputStream.cs
@@ -14,12 +14,11 @@ namespace Windows.Storage.Streams;
 /// <summary>
 /// Represents a sequential stream of bytes to be written.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
-#endif
 [Guid("905A0FE6-BC53-11DF-8C49-001E4FC686DA")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(UniversalApiContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
 #endif
 public interface IOutputStream : IDisposable
 {
diff --git a/src/WinRT.Runtime2/Windows.Storage.Streams/IRandomAccessStream.cs b/src/WinRT.Runtime2/Windows.Storage.Streams/IRandomAccessStream.cs
@@ -14,12 +14,11 @@ namespace Windows.Storage.Streams;
 /// <summary>
 /// Supports random access of data in input and output streams.
 /// </summary>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
-#endif
 [Guid("905A0FE1-BC53-11DF-8C49-001E4FC686DA")]
 #if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(UniversalApiContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
 #endif
 public interface IRandomAccessStream : IDisposable, IInputStream, IOutputStream
 {
