Support CsWinRT 3.0 multi-targeting and WindowsSdkPackageMinimumRevision

src/Layout/redist/targets/GenerateBundledVersions.targets

@@ -1317,7 +1317,20 @@ Copyright (c) .NET Foundation. All rights reserved.
                               TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)"
                               />
 
-    <!-- Supported Windows versions -->
+    <!--
+      Supported Windows versions using CsWinRT 3.0 (.NET 10 is the baseline). This leverages the revision of
+      the Windows SDK version to allow multi-targeting, which is required to allow customers to gradually migrate.
+      Both CsWinRT 3.0 and 2.x will be supported for a period of time, and packages can target both of them.
+    -->
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="10.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="10.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="10.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="10.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="10.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="10.0" />
+    <WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.1" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="10.0" />
+
+    <!-- Supported Windows versions using CsWinRT 2.x -->
     <WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="8.0" />
     <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="8.0" />
     <WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="8.0" />

src/Layout/redist/targets/OverlaySdkOnLKG.targets

@@ -37,11 +37,8 @@
           UseHardLinksIfPossible="true" />
 
     <OverrideAndCreateBundledNETCoreAppPackageVersion
-      Stage0MicrosoftNETCoreAppRefPackageVersionPath="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledVersions.props"
-      MicrosoftNETCoreAppRefPackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
-      NewSDKVersion="$(Version)"
-      TargetRid="$(TargetRid)"
-      OutputPath="$(TestHostDotNetRoot)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
+      Stage0BundledVersionsPath="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledVersions.props"
+      Stage2BundledVersionsPath="$(TestHostDotNetRoot)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
   </Target>
 
   <Target Name="PublishTestWorkloads"

src/Tasks/Common/Resources/Strings.resx

@@ -982,7 +982,6 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1225: Native compilation is not supported when invoking the Publish target directly. Try running dotnet publish.</value>
     <comment>{StrBegins="NETSDK1225: "}</comment>
   </data>
-  <!-- The latest message added is PrunePackageDataNotFound. Please update this value with each PR to catch parallel PRs both adding a new message -->
   <data name="PrunePackageDataNotFound" xml:space="preserve">
     <value>NETSDK1226: Prune Package data not found {0} {1} {2}.  To ignore this error, set the AllowMissingPrunePackageData to true.</value>
     <comment>{StrBegins="NETSDK1226: "}</comment>
@@ -995,4 +994,13 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1228: This project depends on the Aspire Workload which has been deprecated. Aspire now ships via NuGet packages and no longer requires a workload. Please visit {0} for upgrade guidance.</value>
     <comment>{StrBegins="NETSDK1228: "}</comment>
   </data>
+  <data name="UsingPreviewCsWinRT3_0Feature" xml:space="preserve">
+    <value>NETSDK1229: Targeting a Windows SDK version with '1' as the revision number will reference CsWinRT 3.0, which is currently in preview. The current project is targeting the Windows SDK version '{0}'. If this is not intended, change the revision number to '0' to use CsWinRT 2.x instead.</value>
+    <comment>{StrBegins="NETSDK1229: "}</comment>
+  </data>
+  <data name="CantSpecifyBothProperties" xml:space="preserve">
+    <value>NETSDK1230: The {0} and {1} properties cannot both be specified. Remove one or the other.</value>
+    <comment>{StrBegins="NETSDK1230: "}</comment>
+  </data>
+  <!-- The latest message added is CantSpecifyBothProperties. Please update this value with each PR to catch parallel PRs both adding a new message -->
 </root>