Skip to content

Commit d79ffed

Browse files
authored
.NET targeting projects should reference Microsoft.Windows.SDK.NET.Ref instead (#1471)
2 parents b770992 + 57ce419 commit d79ffed

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

test/Microsoft.Windows.CsWin32.Tests/MyReferenceAssemblies.cs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

4-
internal static class MyReferenceAssemblies
5-
{
64
#pragma warning disable SA1202 // Elements should be ordered by access - because field initializer depend on each other
7-
private static readonly ImmutableArray<PackageIdentity> AdditionalLegacyPackages = ImmutableArray.Create(
8-
new PackageIdentity("Microsoft.Windows.SDK.Contracts", "10.0.22621.2428"));
95

10-
private static readonly ImmutableArray<PackageIdentity> AdditionalModernPackages = AdditionalLegacyPackages.AddRange(ImmutableArray.Create(
6+
internal static class MyReferenceAssemblies
7+
{
8+
private static readonly ImmutableArray<PackageIdentity> AdditionalModernPackages = [
119
ExtraPackages.Unsafe,
1210
ExtraPackages.Memory,
13-
ExtraPackages.Registry));
11+
ExtraPackages.Registry,
12+
];
13+
14+
private static readonly ImmutableArray<PackageIdentity> AdditionalLegacyPackagesNetFX = [
15+
new PackageIdentity("Microsoft.Windows.SDK.Contracts", "10.0.22621.2428"),
16+
];
17+
18+
private static readonly ImmutableArray<PackageIdentity> AdditionalLegacyPackagesNET = [
19+
new PackageIdentity("Microsoft.Windows.SDK.NET.Ref", "10.0.22621.57"),
20+
];
1421

15-
internal static readonly ReferenceAssemblies NetStandard20 = ReferenceAssemblies.NetStandard.NetStandard20.AddPackages(AdditionalModernPackages);
16-
#pragma warning restore SA1202 // Elements should be ordered by access
22+
internal static readonly ReferenceAssemblies NetStandard20 = ReferenceAssemblies.NetStandard.NetStandard20.AddPackages([.. AdditionalLegacyPackagesNetFX, .. AdditionalModernPackages]);
1723

1824
internal static class NetFramework
1925
{
20-
internal static readonly ReferenceAssemblies Net35 = ReferenceAssemblies.NetFramework.Net35.WindowsForms.AddPackages(AdditionalLegacyPackages);
21-
internal static readonly ReferenceAssemblies Net472 = ReferenceAssemblies.NetFramework.Net472.WindowsForms.AddPackages(AdditionalModernPackages);
26+
internal static readonly ReferenceAssemblies Net35 = ReferenceAssemblies.NetFramework.Net35.WindowsForms.AddPackages(AdditionalLegacyPackagesNetFX);
27+
internal static readonly ReferenceAssemblies Net472 = ReferenceAssemblies.NetFramework.Net472.WindowsForms.AddPackages([.. AdditionalLegacyPackagesNetFX, .. AdditionalModernPackages]);
2228
}
2329

2430
internal static class Net
2531
{
26-
internal static readonly ReferenceAssemblies Net80 = ReferenceAssemblies.Net.Net80.AddPackages(AdditionalModernPackages);
27-
internal static readonly ReferenceAssemblies Net90 = ReferenceAssemblies.Net.Net90.AddPackages(AdditionalModernPackages);
32+
internal static readonly ReferenceAssemblies Net80 = ReferenceAssemblies.Net.Net80.AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]);
33+
internal static readonly ReferenceAssemblies Net90 = ReferenceAssemblies.Net.Net90.AddPackages([.. AdditionalLegacyPackagesNET, .. AdditionalModernPackages]);
2834
}
2935

3036
internal static class ExtraPackages

0 commit comments

Comments
 (0)