Revert the incorrect merge

Author: Simon Zhao (BEYONDSOFT CONSULTING INC)

src/Tasks/Common/Resources/Strings.resx

@@ -994,12 +994,21 @@ 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>
   <data name="RuntimeGraphFileDoesNotExist" xml:space="preserve">
-    <value>NETSDK1229: File '{0}' does not exist. Please ensure the runtime graph path exists.</value>
-    <comment>{StrBegins="NETSDK1229: "}{Locked="{0}"}</comment>
+    <value>NETSDK1231: File '{0}' does not exist. Please ensure the runtime graph path exists.</value>
+    <comment>{StrBegins="NETSDK1231: "}{Locked="{0}"}</comment>
   </data>
   <data name="UnableToFindMatchingRid" xml:space="preserve">
-    <value>NETSDK1230: Unable to find a matching RID for '{0}' from among [{1}] in graph '{2}'.</value>
-    <comment>{StrBegins="NETSDK1230: "}{Locked="{0}"}{Locked="{1}"}{Locked="{2}"}</comment>
+    <value>NETSDK1232: Unable to find a matching RID for '{0}' from among [{1}] in graph '{2}'.</value>
+    <comment>{StrBegins="NETSDK1232: "}{Locked="{0}"}{Locked="{1}"}{Locked="{2}"}</comment>
   </data>
+  <!-- The latest message added is UnableToFindMatchingRid. Please update this value with each PR to catch parallel PRs both adding a new message -->
 </root>