Move versioning stuff to Build target, rather than Configure

Since Build assumes Restore has already been done, this also simplifies
the targets

Author: kzu

build.proj

@@ -20,6 +20,7 @@
     <CommonBuildProperties>WarningLevel=0;NoWarn=1591;Out=$(Out);Configuration=$(Configuration);RunCodeAnalysis=$(RunCodeAnalysis);PackageOutputPath=$(Out)</CommonBuildProperties>
     <DefaultImportance Condition=" '$(DefaultImportance)' == '' ">high</DefaultImportance>
     <PS>%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PS>
+    <GitInfoReportImportance>high</GitInfoReportImportance>
   </PropertyGroup>
 
   <ItemGroup>
@@ -48,7 +49,15 @@
 
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Target Name="Build">
+  <Target Name="Build" DependsOnTargets="GitInfoReport;GetPackageVersion">
+    <!-- For now this is an informative version #, used to update CI -->
+    <Message Text="Building version $(PackageVersion)" Importance="high" />
+    <!-- Update AppVeyor build # to match the actual one being used -->
+    <Exec Command="appveyor UpdateBuild -Version $(PackageVersion)"
+          Condition=" '$(APPVEYOR)' == 'true' "
+          ConsoleToMSBuild="true"
+          ContinueOnError="WarnAndContinue" />
+  
     <Exec Command="rmdir $(Out) /S /Q" Condition=" Exists('$(Out)') " ContinueOnError="true" StandardOutputImportance="low" />
     <MakeDir Directories="$(Out)" Condition="!Exists('$(Out)')" />
     <Message Text="Build properties: $(CommonBuildProperties)." Importance="high" />
@@ -140,25 +149,10 @@
   </Target>
   <Import Project="src\PackageVersion.targets" />
 
-  <Target Name="Configure" DependsOnTargets="GetPackageVersion">
+  <Target Name="Configure">
     <Message Importance="high" Text="*********************************************************************************************************************" />
     <Message Importance="high" Text="$([System.Environment]::CommandLine)" />
     <Message Importance="high" Text="*********************************************************************************************************************" />
-
-    <!-- Invoke GitVersion just like the project-level targets do -->
-		<CallTarget Targets="GitInfoReport" Condition="'$(target)' != 'Restore'" />
-    <!-- For now this is an informative version #, used to update CI -->
-    <Message Text="Building version $(PackageVersion)" Importance="high" Condition="'$(target)' != 'Restore'" />
-
-    <PropertyGroup>
-      <GitInfoReportImportance>high</GitInfoReportImportance>
-    </PropertyGroup>
-
-    <!-- Update AppVeyor build # to match the actual one being used -->
-    <Exec Command="appveyor UpdateBuild -Version $(PackageVersion)"
-          Condition=" '$(APPVEYOR)' == 'true' and '$(target)' != 'Restore'"
-          ConsoleToMSBuild="true"
-          ContinueOnError="WarnAndContinue" />
   </Target>
 
 	<Import Project="corebuild\corebuild.targets" />