Put REFERENCE_ASSEMBLY branch first in conditional attribute blocks

Sergio0694 · Copilot · Sergio0694 · commit 0b4a5f0fb879 · 2026-04-18T20:02:13.000-07:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/WinRT.Runtime2/Windows.Foundation/AsyncActionProgressHandler{TProgress}.cs b/src/WinRT.Runtime2/Windows.Foundation/AsyncActionProgressHandler{TProgress}.cs
@@ -14,9 +14,9 @@ namespace Windows.Foundation;
 /// <typeparam name="TProgress">The type of progress information.</typeparam>
 /// <param name="asyncInfo">The asynchronous action.</param>
 /// <param name="progressInfo">The progress information.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void AsyncActionProgressHandler<TProgress>(IAsyncActionWithProgress<TProgress> asyncInfo, TProgress progressInfo);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/AsyncActionWithProgressCompletedHandler{TProgress}.cs b/src/WinRT.Runtime2/Windows.Foundation/AsyncActionWithProgressCompletedHandler{TProgress}.cs
@@ -14,9 +14,9 @@ namespace Windows.Foundation;
 /// <typeparam name="TProgress">The type of progress information.</typeparam>
 /// <param name="asyncInfo">The asynchronous action.</param>
 /// <param name="asyncStatus">One of the enumeration values.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void AsyncActionWithProgressCompletedHandler<TProgress>(IAsyncActionWithProgress<TProgress> asyncInfo, AsyncStatus asyncStatus);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/AsyncOperationCompletedHandler{TResult}.cs b/src/WinRT.Runtime2/Windows.Foundation/AsyncOperationCompletedHandler{TResult}.cs
@@ -14,9 +14,9 @@ namespace Windows.Foundation;
 /// <typeparam name="TResult">The result type.</typeparam>
 /// <param name="asyncInfo">The asynchronous action.</param>
 /// <param name="asyncStatus">One of the enumeration values.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void AsyncOperationCompletedHandler<TResult>(IAsyncOperation<TResult> asyncInfo, AsyncStatus asyncStatus);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/AsyncOperationProgressHandler{TResult, TProgress}.cs b/src/WinRT.Runtime2/Windows.Foundation/AsyncOperationProgressHandler{TResult, TProgress}.cs
@@ -15,9 +15,9 @@ namespace Windows.Foundation;
 /// <typeparam name="TProgress">The type of progress information.</typeparam>
 /// <param name="asyncInfo">The asynchronous action.</param>
 /// <param name="progressInfo">The progress information.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void AsyncOperationProgressHandler<TResult, TProgress>(IAsyncOperationWithProgress<TResult, TProgress> asyncInfo, TProgress progressInfo);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/AsyncOperationWithProgressCompletedHandler{TResult, TProgress}.cs b/src/WinRT.Runtime2/Windows.Foundation/AsyncOperationWithProgressCompletedHandler{TResult, TProgress}.cs
@@ -15,9 +15,9 @@ namespace Windows.Foundation;
 /// <typeparam name="TProgress">The type of progress information.</typeparam>
 /// <param name="asyncInfo">The asynchronous action.</param>
 /// <param name="asyncStatus">One of the enumeration values.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void AsyncOperationWithProgressCompletedHandler<TResult, TProgress>(IAsyncOperationWithProgress<TResult, TProgress> asyncInfo, AsyncStatus asyncStatus);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/AsyncStatus.cs b/src/WinRT.Runtime2/Windows.Foundation/AsyncStatus.cs
@@ -13,14 +13,14 @@ namespace Windows.Foundation;
 /// Represents the status for an asynchronous operation.
 /// </summary>
 /// <see href="https://learn.microsoft.com/windows/win32/api/asyncinfo/ne-asyncinfo-asyncstatus"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.AsyncStatus>")]
 [WindowsRuntimeReferenceType(typeof(AsyncStatus?))]
 [ABI.Windows.Foundation.AsyncStatusComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(FoundationContract), 65536u)]
 #endif
 public enum AsyncStatus
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/CollectionChange.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/CollectionChange.cs
@@ -19,15 +19,15 @@ namespace Windows.Foundation.Collections;
 /// <see cref="IMapChangedEventArgs{K}.Key"/> property to determine the location of the change.
 /// </remarks>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.collections.collectionchange"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Collections.CollectionChange>")]
 [WindowsRuntimeMetadataTypeName("Windows.Foundation.Collections.CollectionChange")]
 [WindowsRuntimeReferenceType(typeof(CollectionChange?))]
 [ABI.Windows.Foundation.Collections.CollectionChangeComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(FoundationContract), 65536u)]
 #endif
 public enum CollectionChange
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/MapChangedEventHandler{K, V}.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/MapChangedEventHandler{K, V}.cs
@@ -15,9 +15,9 @@ namespace Windows.Foundation.Collections;
 /// <typeparam name="V">The type of values in the observable map.</typeparam>
 /// <param name="sender">The observable map that changed.</param>
 /// <param name="event">The description of the change that occurred in the map.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void MapChangedEventHandler<K, V>(IObservableMap<K, V> sender, IMapChangedEventArgs<K> @event);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Collections/VectorChangedEventHandler{T}.cs b/src/WinRT.Runtime2/Windows.Foundation/Collections/VectorChangedEventHandler{T}.cs
@@ -14,9 +14,9 @@ namespace Windows.Foundation.Collections;
 /// <typeparam name="T">The type of elements in the observable vector.</typeparam>
 /// <param name="sender">The observable vector that changed.</param>
 /// <param name="event">The description of the change that occurred in the vector.</param>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
-[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
 [ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 #endif
 public delegate void VectorChangedEventHandler<T>(IObservableVector<T> sender, IVectorChangedEventArgs @event);
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Point.cs b/src/WinRT.Runtime2/Windows.Foundation/Point.cs
@@ -19,14 +19,14 @@ namespace Windows.Foundation;
 /// Represents X and Y coordinate values that define a point in a two-dimensional plane.
 /// </summary>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.point"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Point>")]
 [WindowsRuntimeReferenceType(typeof(Point?))]
 [ABI.Windows.Foundation.PointComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(FoundationContract), 65536u)]
 #endif
 public struct Point : IEquatable<Point>, IFormattable
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/PropertyType.cs b/src/WinRT.Runtime2/Windows.Foundation/PropertyType.cs
@@ -13,14 +13,14 @@ namespace Windows.Foundation;
 /// Specifies property value types.
 /// </summary>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.propertytype"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.PropertyType>")]
 [WindowsRuntimeReferenceType(typeof(PropertyType?))]
 [ABI.Windows.Foundation.PropertyTypeComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(FoundationContract), 65536u)]
 #endif
 public enum PropertyType
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Rect.cs b/src/WinRT.Runtime2/Windows.Foundation/Rect.cs
@@ -21,14 +21,14 @@ namespace Windows.Foundation;
 /// Contains number values that represent the location and size of a rectangle.
 /// </summary>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.rect"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Rect>")]
 [WindowsRuntimeReferenceType(typeof(Rect?))]
 [ABI.Windows.Foundation.RectComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(FoundationContract), 65536u)]
 #endif
 public struct Rect : IEquatable<Rect>, IFormattable
 {
diff --git a/src/WinRT.Runtime2/Windows.Foundation/Size.cs b/src/WinRT.Runtime2/Windows.Foundation/Size.cs
@@ -18,14 +18,14 @@ namespace Windows.Foundation;
 /// Represents number values that specify a height and width.
 /// </summary>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.foundation.size"/>
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(FoundationContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Size>")]
 [WindowsRuntimeReferenceType(typeof(Size?))]
 [ABI.Windows.Foundation.SizeComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(FoundationContract), 65536u)]
 #endif
 public struct Size : IEquatable<Size>, IFormattable
 {
diff --git a/src/WinRT.Runtime2/Windows.Storage.Streams/InputStreamOptions.cs b/src/WinRT.Runtime2/Windows.Storage.Streams/InputStreamOptions.cs
@@ -16,14 +16,14 @@ namespace Windows.Storage.Streams;
 /// </summary>
 /// <see href="https://learn.microsoft.com/uwp/api/windows.storage.streams.inputstreamoptions"/>
 [Flags]
-#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
+#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
+[SupportedOSPlatform("Windows10.0.10240.0")]
+[ContractVersion(typeof(UniversalApiContract), 65536u)]
+#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
 [WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
 [WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Storage.Streams.InputStreamOptions>")]
 [WindowsRuntimeReferenceType(typeof(InputStreamOptions?))]
 [ABI.Windows.Storage.Streams.InputStreamOptionsComWrappersMarshaller]
-#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
-[SupportedOSPlatform("Windows10.0.10240.0")]
-[ContractVersion(typeof(UniversalApiContract), 65536u)]
 #endif
 public enum InputStreamOptions : uint
 {
