Simplify SqlClient pack version flow

Author: paulmedynski

build.proj

@@ -535,35 +535,12 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
     </Exec>
 
-    <!-- Evaluate package version used to stamp the nuspec-driven pack output. -->
-    <PropertyGroup>
-      <GetSqlClientPackageVersionCommand>
-        "$(DotnetPath)dotnet" build "$(SqlClientProjectPath)"
-        -nologo
-        -verbosity:quiet
-        -getProperty:SqlClientPackageVersion
-
-        <!-- Versioning arguments -->
-        $(BuildNumberArgument)
-        $(BuildSuffixArgument)
-        $(PackageVersionSqlClientArgument)
-      </GetSqlClientPackageVersionCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GetSqlClientPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetSqlClientPackageVersionCommand), "\s+", " "))</GetSqlClientPackageVersionCommand>
-    </PropertyGroup>
-    <Message Text=">>> Evaluating SqlClient package version via command: $(GetSqlClientPackageVersionCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(GetSqlClientPackageVersionCommand)">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_EvaluatedSqlClientPackageVersion" />
-    </Exec>
-    <Error Text="Failed to evaluate SqlClientPackageVersion for PackSqlClient."
-           Condition="'$(_EvaluatedSqlClientPackageVersion)' == ''" />
-        <Error Text="PackSqlClient requires PackageVersionAbstractions. Specify -p:PackageVersionAbstractions=&lt;version&gt;."
-          Condition="'$(PackageVersionAbstractions)' == ''" />
-        <Error Text="PackSqlClient requires PackageVersionLogging. Specify -p:PackageVersionLogging=&lt;version&gt;."
-          Condition="'$(PackageVersionLogging)' == ''" />
+    <Error Text="PackSqlClient requires PackageVersionAbstractions. Specify -p:PackageVersionAbstractions=&lt;version&gt;."
+           Condition="'$(PackageVersionAbstractions)' == ''" />
+    <Error Text="PackSqlClient requires PackageVersionLogging. Specify -p:PackageVersionLogging=&lt;version&gt;."
+           Condition="'$(PackageVersionLogging)' == ''" />
 
     <PropertyGroup>
-      <_EvaluatedSqlClientPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedSqlClientPackageVersion), "\s", ""))</_EvaluatedSqlClientPackageVersion>
       <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
       <DotnetCommand>
         "$(DotnetPath)dotnet" pack "$(SqlClientProjectPath)"
@@ -583,7 +560,6 @@
 
         <!-- Pack settings are defined in Microsoft.Data.SqlClient.csproj -->
         -p:CommitId="$(CommitId)"
-        -p:NuspecVersion="$(_EvaluatedSqlClientPackageVersion)"
         -p:PackageOutputPath="$(SqlClientArtifactRoot)/$(ReferenceType)-$(Configuration)"
       </DotnetCommand>
       <!-- Convert more than one whitespace character into one space -->

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

@@ -82,6 +82,7 @@
     <SqlClientPackNuspecTemplatePath Condition="'$(SqlClientPackNuspecTemplatePath)' == ''">$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</SqlClientPackNuspecTemplatePath>
     <SqlClientPackNuspecGeneratedPath Condition="'$(SqlClientPackNuspecGeneratedPath)' == ''">$(BaseIntermediateOutputPath)Microsoft.Data.SqlClient.pack.nuspec</SqlClientPackNuspecGeneratedPath>
 
+    <NuspecVersion Condition="'$(NuspecVersion)' == ''">$(Version)</NuspecVersion>
     <NuspecFile Condition="'$(NuspecFile)' == ''">$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</NuspecFile>
     <NuspecBasePath Condition="'$(NuspecBasePath)' == ''">$([System.IO.Path]::GetDirectoryName('$(SqlClientPackNuspecTemplatePath)'))</NuspecBasePath>
     <IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>