Resolve merge conflicts after rebase

Author: paulmedynski

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

@@ -86,11 +86,7 @@
     <AbstractionsProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj</AbstractionsProjectPath>
     <LoggingProjectPath>$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj</LoggingProjectPath>
 
-<<<<<<< HEAD
     <!-- Properties used by dotnet pack. -->
-=======
-    <NuspecVersion Condition="'$(NuspecVersion)' == ''">$(Version)</NuspecVersion>
->>>>>>> 6da35be91 (Align pack docs with dotnet build and harden SqlClient nuspec prep)
     <NuspecFile Condition="'$(NuspecFile)' == ''">$(SqlClientPackNuspecTemplatePath)</NuspecFile>
     <NuspecBasePath Condition="'$(NuspecBasePath)' == ''">$([System.IO.Path]::GetDirectoryName('$(SqlClientPackNuspecTemplatePath)'))</NuspecBasePath>
     <NuspecVersion Condition="'$(NuspecVersion)' == ''">$(Version)</NuspecVersion>
@@ -117,7 +113,6 @@
   <Target Name="PrepareSqlClientPackNuspec"
           BeforeTargets="GenerateNuspec"
           Condition="'$(NuspecFile)' == '$(SqlClientPackNuspecTemplatePath)'">
-<<<<<<< HEAD
 
     <!-- Calculate AbstractionsPackageVersion if not already set. -->
     <PropertyGroup Condition="'$(AbstractionsPackageVersion)' == ''">
@@ -137,17 +132,6 @@
     </Exec>
     <PropertyGroup Condition="'$(GetAbstractionsPackageVersionCommand)' != ''">
       <AbstractionsPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(AbstractionsPackageVersion), "\s", ""))</AbstractionsPackageVersion>
-=======
-      <Error Text="PrepareSqlClientPackNuspec requires AbstractionsPackageVersion. Specify -p:PackageVersionAbstractions=&lt;version&gt;."
-        Condition="'$(AbstractionsPackageVersion)' == ''" />
-      <Error Text="PrepareSqlClientPackNuspec requires LoggingPackageVersion. Specify -p:PackageVersionLogging=&lt;version&gt;."
-        Condition="'$(LoggingPackageVersion)' == ''" />
-      <Error Text="PrepareSqlClientPackNuspec requires NuspecVersion. Specify -p:NuspecVersion=&lt;version&gt;."
-        Condition="'$(NuspecVersion)' == ''" />
-
-    <PropertyGroup>
-      <_SqlClientPackNuspecExpandedText>$([System.IO.File]::ReadAllText('$(SqlClientPackNuspecTemplatePath)').Replace('$AbstractionsPackageVersion$','$(AbstractionsPackageVersion)').Replace('$LoggingPackageVersion$','$(LoggingPackageVersion)').Replace('<version>1.0.0</version>','<version>$(NuspecVersion)</version>'))</_SqlClientPackNuspecExpandedText>
->>>>>>> 6da35be91 (Align pack docs with dotnet build and harden SqlClient nuspec prep)
     </PropertyGroup>
 
     <!-- Calculate LoggingPackageVersion if not already set. -->