Skip to content

Commit f307b2d

Browse files
committed
Support '1.' TFM for CsWinRT 3.0
1 parent 301f9e9 commit f307b2d

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

eng/ManualVersions.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12+
13+
<!-- CsWinRT 3.0 targeting packs -->
14+
<MicrosoftWindowsSDKNETRef10_0_17763_1PackageVersion>10.0.17763.57</MicrosoftWindowsSDKNETRef10_0_17763_1PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_18362_1PackageVersion>10.0.18362.57</MicrosoftWindowsSDKNETRef10_0_18362_1PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_19041_1PackageVersion>10.0.19041.57</MicrosoftWindowsSDKNETRef10_0_19041_1PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_20348_1PackageVersion>10.0.20348.57</MicrosoftWindowsSDKNETRef10_0_20348_1PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_22000_1PackageVersion>10.0.22000.57</MicrosoftWindowsSDKNETRef10_0_22000_1PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_22621_1PackageVersion>10.0.22621.57</MicrosoftWindowsSDKNETRef10_0_22621_1PackageVersion>
20+
<MicrosoftWindowsSDKNETRef10_0_26100_1PackageVersion>10.0.26100.57</MicrosoftWindowsSDKNETRef10_0_26100_1PackageVersion>
21+
22+
<!-- CsWinRT 2.x targeting packs-->
1223
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.57</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
1324
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.57</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
1425
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.57</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>

src/Layout/redist/targets/GenerateBundledVersions.targets

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,8 +1318,21 @@ Copyright (c) .NET Foundation. All rights reserved.
13181318
TargetingPackName="NETStandard.Library.Ref"
13191319
TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)"
13201320
/>
1321-
1322-
<!-- Supported Windows versions -->
1321+
1322+
<!--
1323+
Supported Windows versions using CsWinRT 3.0 (.NET 10 is the baseline). This leverages the patch version of
1324+
the Windows SDK version to allow multi-targeting, which is required to allow customers to gradually migrate.
1325+
Both CsWinRT 3.0 and 2.x will be supported for a period of time, and packages can target both of them.
1326+
-->
1327+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100_1PackageVersion)" MinimumNETVersion="10.0" />
1328+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621_1PackageVersion)" MinimumNETVersion="10.0" />
1329+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000_1PackageVersion)" MinimumNETVersion="10.0" />
1330+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348_1PackageVersion)" MinimumNETVersion="10.0" />
1331+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041_1PackageVersion)" MinimumNETVersion="10.0" />
1332+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362_1PackageVersion)" MinimumNETVersion="10.0" />
1333+
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763_1PackageVersion)" MinimumNETVersion="10.0" />
1334+
1335+
<!-- Supported Windows versions using CsWinRT 2.x -->
13231336
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="8.0" />
13241337
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="8.0" />
13251338
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="8.0" />

0 commit comments

Comments
 (0)