Skip to content

Commit cd0ece8

Browse files
Sergio0694Copilot
andcommitted
Merge adjacent ifdef blocks where attribute order is preserved
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 5b1a7f7 commit cd0ece8

8 files changed

Lines changed: 9 additions & 25 deletions

File tree

src/WinRT.Runtime2/Windows.Foundation/AsyncActionCompletedHandler.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ namespace Windows.Foundation;
1313
/// </summary>
1414
/// <param name="asyncInfo">The asynchronous operation.</param>
1515
/// <param name="asyncStatus">One of the enumeration values.</param>
16-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
17-
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
18-
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.AsyncActionCompletedHandler>")]
19-
#endif
2016
#if WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2117
[ContractVersion(typeof(FoundationContract), 65536u)]
2218
#elif WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
19+
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
20+
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.AsyncActionCompletedHandler>")]
2321
[ABI.Windows.Foundation.AsyncActionCompletedHandlerComWrappersMarshaller]
2422
#endif
2523
public delegate void AsyncActionCompletedHandler(IAsyncAction asyncInfo, AsyncStatus asyncStatus);

src/WinRT.Runtime2/Windows.Foundation/AsyncStatus.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ namespace Windows.Foundation;
1717
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
1818
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.AsyncStatus>")]
1919
[WindowsRuntimeReferenceType(typeof(AsyncStatus?))]
20+
[ABI.Windows.Foundation.AsyncStatusComWrappersMarshaller]
2021
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2122
[SupportedOSPlatform("Windows10.0.10240.0")]
2223
[ContractVersion(typeof(FoundationContract), 65536u)]
2324
#endif
24-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
25-
[ABI.Windows.Foundation.AsyncStatusComWrappersMarshaller]
26-
#endif
2725
public enum AsyncStatus
2826
{
2927
/// <summary>

src/WinRT.Runtime2/Windows.Foundation/Collections/CollectionChange.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ namespace Windows.Foundation.Collections;
2424
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Collections.CollectionChange>")]
2525
[WindowsRuntimeMetadataTypeName("Windows.Foundation.Collections.CollectionChange")]
2626
[WindowsRuntimeReferenceType(typeof(CollectionChange?))]
27+
[ABI.Windows.Foundation.Collections.CollectionChangeComWrappersMarshaller]
2728
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2829
[SupportedOSPlatform("Windows10.0.10240.0")]
2930
[ContractVersion(typeof(FoundationContract), 65536u)]
3031
#endif
31-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
32-
[ABI.Windows.Foundation.Collections.CollectionChangeComWrappersMarshaller]
33-
#endif
3432
public enum CollectionChange
3533
{
3634
/// <summary>

src/WinRT.Runtime2/Windows.Foundation/Point.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@ namespace Windows.Foundation;
2323
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
2424
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Point>")]
2525
[WindowsRuntimeReferenceType(typeof(Point?))]
26+
[ABI.Windows.Foundation.PointComWrappersMarshaller]
2627
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2728
[SupportedOSPlatform("Windows10.0.10240.0")]
2829
[ContractVersion(typeof(FoundationContract), 65536u)]
2930
#endif
30-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
31-
[ABI.Windows.Foundation.PointComWrappersMarshaller]
32-
#endif
3331
public struct Point : IEquatable<Point>, IFormattable
3432
{
3533
/// <summary>

src/WinRT.Runtime2/Windows.Foundation/PropertyType.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ namespace Windows.Foundation;
1717
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
1818
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.PropertyType>")]
1919
[WindowsRuntimeReferenceType(typeof(PropertyType?))]
20+
[ABI.Windows.Foundation.PropertyTypeComWrappersMarshaller]
2021
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2122
[SupportedOSPlatform("Windows10.0.10240.0")]
2223
[ContractVersion(typeof(FoundationContract), 65536u)]
2324
#endif
24-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
25-
[ABI.Windows.Foundation.PropertyTypeComWrappersMarshaller]
26-
#endif
2725
public enum PropertyType
2826
{
2927
/// <summary>

src/WinRT.Runtime2/Windows.Foundation/Rect.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@ namespace Windows.Foundation;
2525
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
2626
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Rect>")]
2727
[WindowsRuntimeReferenceType(typeof(Rect?))]
28+
[ABI.Windows.Foundation.RectComWrappersMarshaller]
2829
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2930
[SupportedOSPlatform("Windows10.0.10240.0")]
3031
[ContractVersion(typeof(FoundationContract), 65536u)]
3132
#endif
32-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
33-
[ABI.Windows.Foundation.RectComWrappersMarshaller]
34-
#endif
3533
public struct Rect : IEquatable<Rect>, IFormattable
3634
{
3735
/// <summary>

src/WinRT.Runtime2/Windows.Foundation/Size.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ namespace Windows.Foundation;
2222
[WindowsRuntimeMetadata("Windows.Foundation.FoundationContract")]
2323
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Foundation.Size>")]
2424
[WindowsRuntimeReferenceType(typeof(Size?))]
25+
[ABI.Windows.Foundation.SizeComWrappersMarshaller]
2526
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2627
[SupportedOSPlatform("Windows10.0.10240.0")]
2728
[ContractVersion(typeof(FoundationContract), 65536u)]
2829
#endif
29-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
30-
[ABI.Windows.Foundation.SizeComWrappersMarshaller]
31-
#endif
3230
public struct Size : IEquatable<Size>, IFormattable
3331
{
3432
/// <summary>

src/WinRT.Runtime2/Windows.Storage.Streams/InputStreamOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ namespace Windows.Storage.Streams;
2020
[WindowsRuntimeMetadata("Windows.Foundation.UniversalApiContract")]
2121
[WindowsRuntimeClassName("Windows.Foundation.IReference`1<Windows.Storage.Streams.InputStreamOptions>")]
2222
[WindowsRuntimeReferenceType(typeof(InputStreamOptions?))]
23+
[ABI.Windows.Storage.Streams.InputStreamOptionsComWrappersMarshaller]
2324
#elif WINDOWS_RUNTIME_REFERENCE_ASSEMBLY
2425
[SupportedOSPlatform("Windows10.0.10240.0")]
2526
[ContractVersion(typeof(UniversalApiContract), 65536u)]
2627
#endif
27-
#if WINDOWS_RUNTIME_IMPLEMENTATION_ASSEMBLY
28-
[ABI.Windows.Storage.Streams.InputStreamOptionsComWrappersMarshaller]
29-
#endif
3028
public enum InputStreamOptions : uint
3129
{
3230
/// <summary>

0 commit comments

Comments
 (0)