diff --git a/test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs b/test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs index 64f8b748..4a958bd2 100644 --- a/test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs +++ b/test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs @@ -1,30 +1,36 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -internal static class MyReferenceAssemblies -{ #pragma warning disable SA1202 // Elements should be ordered by access - because field initializer depend on each other - private static readonly ImmutableArray AdditionalLegacyPackages = ImmutableArray.Create( - new PackageIdentity("Microsoft.Windows.SDK.Contracts", "10.0.22621.2428")); - private static readonly ImmutableArray AdditionalModernPackages = AdditionalLegacyPackages.AddRange(ImmutableArray.Create( +internal static class MyReferenceAssemblies +{ + private static readonly ImmutableArray AdditionalModernPackages = [ ExtraPackages.Unsafe, ExtraPackages.Memory, - ExtraPackages.Registry)); + ExtraPackages.Registry, + ]; + + private static readonly ImmutableArray AdditionalLegacyPackagesNetFX = [ + new PackageIdentity("Microsoft.Windows.SDK.Contracts", "10.0.22621.2428"), + ]; + + private static readonly ImmutableArray AdditionalLegacyPackagesNET = [ + new PackageIdentity("Microsoft.Windows.SDK.NET.Ref", "10.0.22621.57"), + ]; - internal static readonly ReferenceAssemblies NetStandard20 = ReferenceAssemblies.NetStandard.NetStandard20.AddPackages(AdditionalModernPackages); -#pragma warning restore SA1202 // Elements should be ordered by access + internal static readonly ReferenceAssemblies NetStandard20 = ReferenceAssemblies.NetStandard.NetStandard20.AddPackages([.. AdditionalLegacyPackagesNetFX, .. AdditionalModernPackages]); internal static class NetFramework { - internal static readonly ReferenceAssemblies Net35 = ReferenceAssemblies.NetFramework.Net35.WindowsForms.AddPackages(AdditionalLegacyPackages); - internal static readonly ReferenceAssemblies Net472 = ReferenceAssemblies.NetFramework.Net472.WindowsForms.AddPackages(AdditionalModernPackages); + internal static readonly ReferenceAssemblies Net35 = ReferenceAssemblies.NetFramework.Net35.WindowsForms.AddPackages(AdditionalLegacyPackagesNetFX); + internal static readonly ReferenceAssemblies Net472 = ReferenceAssemblies.NetFramework.Net472.WindowsForms.AddPackages([.. AdditionalLegacyPackagesNetFX, .. AdditionalModernPackages]); } internal static class Net { - internal static readonly ReferenceAssemblies Net80 = ReferenceAssemblies.Net.Net80.AddPackages(AdditionalModernPackages); - internal static readonly ReferenceAssemblies Net90 = ReferenceAssemblies.Net.Net90.AddPackages(AdditionalModernPackages); + internal static readonly ReferenceAssemblies Net80 = ReferenceAssemblies.Net.Net80.AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]); + internal static readonly ReferenceAssemblies Net90 = ReferenceAssemblies.Net.Net90.AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]); } internal static class ExtraPackages