Resolve merge conflicts after rebase

Author: paulmedynski

src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj

@@ -173,10 +173,13 @@
     <PropertyGroup>
       <CommitId Condition="'$(CommitId)' == ''">$(SourceRevisionId)</CommitId>
       <NuspecProperties>$(NuspecProperties);COMMITID=$(CommitId)</NuspecProperties>
+    </PropertyGroup>
+
+    <!-- Checkc for empty sibling package versions. -->
+    <PropertyGroup>
       <_AbstractionsPackageVersionTrimmed>$([System.String]::Copy('$(AbstractionsPackageVersion)').Trim())</_AbstractionsPackageVersionTrimmed>
       <_LoggingPackageVersionTrimmed>$([System.String]::Copy('$(LoggingPackageVersion)').Trim())</_LoggingPackageVersionTrimmed>
     </PropertyGroup>
-
     <Error Condition="'$(_AbstractionsPackageVersionTrimmed)' == ''"
       Text="AbstractionsPackageVersion is required for SqlClient packaging. When packing via build.proj, set -p:PackageVersionAbstractions=&lt;version&gt;; when packing the project directly, set -p:AbstractionsPackageVersion=&lt;version&gt;; otherwise ensure the Abstractions Versions.props import can resolve a value." />
     <Error Condition="'$(_LoggingPackageVersionTrimmed)' == ''"