Comments from Copilot ... I'd love it if it could give the same comments across commits.

Author: benrr101

build2.proj

@@ -291,7 +291,7 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
-        $(PacakgeVersionArgument)
+        $(PacakgeVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -316,7 +316,7 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
-        $(PacakgeVersionArgument)
+        $(PacakgeVersionMdsArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)

src/Microsoft.Data.SqlClient/MdsVersions.props

@@ -3,15 +3,7 @@
   <PropertyGroup>
     <MdsVersionDefault>7.0.0</MdsVersionDefault>
 
-    <!--
-      This is the version that is used as the version for the NuGet package. If it is not
-      overridden, the above default version will be used with the build number and a string suffix
-      appended (to indicate the version is pre-production).
-
-      NOTE/@TODO: Since the PackMds target in build2.proj directly calls nuget.exe, it will not
-          pick up this property.
-    -->
-    <MdsPackageVersion Condition="'$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber)-dev</MdsPackageVersion>
+    <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
 
     <!--
       This is the version that is used as the AssemblyVersion and FileVersion fields in the
@@ -20,11 +12,24 @@
       As a convenience feature, if a package version but not an assembly version is supplied, the
       package version will have any suffix trimmed to generate valid assembly version.
 
-      NOTE: It is possible that the build number can be in the format xxxx.y which *may* overflow
+      NOTE: It is possible that the build number can be in the format xxxxx.yy which *may* overflow
       the 16-bit integer for the revision part of the assembly version. For that reason, we simply
       discard everything after the first part of the build number for the assembly version.
     -->
     <MdsAssemblyVersion Condition="'$(MdsAssemblyVersion)' == '' AND '$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber.Split('.')[0])</MdsAssemblyVersion>
     <MdsAssemblyVersion Condition="'$(MdsAssemblyVersion)' == '' AND '$(MdsPackageVersion)' != ''">$(MdsPackageVersion.Split('-')[0])</MdsAssemblyVersion>
+
+    <!--
+      This is the version that is used as the version for the NuGet package. If it is not
+      overridden, the above default version will be used with the build number and a string suffix
+      appended (to indicate the version is pre-production).
+
+      NOTE: NuGet versioning can handle arbitrary version strings, so we do not need to trim the
+      build number like we do for the assembly version.
+
+      NOTE/@TODO: Since the PackMds target in build2.proj directly calls nuget.exe, it will not
+          pick up this property.
+    -->
+    <MdsPackageVersion Condition="'$(MdsPackageVersion)' == ''">$(MdsVersionDefault).$(BuildNumber)-dev</MdsPackageVersion>
   </PropertyGroup>
 </Project>