Attaching to the right part of the msbuild pipeline

Author: aaronpowell

Directory.Build.targets

@@ -3,11 +3,18 @@
     <Error Text="The supplied Version for packaging does not match what version has been used. Expected: '$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)', received: '$(PackageVersion)'" Condition="'$(PackageVersion)' != '$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)'" />
   </Target>
 
-  <Target Name="FailBuildIfPreviewVersionWrong" BeforeTargets="Pack" Condition=" $(ReleaseBuild) == 'false' and '$(IsPreview)' == 'true' ">
+  <Target Name="FailBuildIfPreviewVersionWrong" BeforeTargets="Pack" Condition=" $(ReleaseBuild) == 'true' and '$(IsPreview)' == 'true' ">
     <Error Text="The supplied Version for packaging does not match what version has been used. Expected: '$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)-$(ToolkitPreviewVersion)', received: '$(PackageVersion)'" Condition="'$(PackageVersion)' != '$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)-$(ToolkitPreviewVersion)'" />
   </Target>
 
-  <Target Name="LogVersionInfo" BeforeTargets="Pack">
-    <Message Text="Current Package Version: '$(PackageVersion)'" Importance="high" />
+  <Target Name="EnsurePreviewVersionSet" BeforeTargets="GenerateNuspec" Condition=" $(ReleaseBuild) == 'true' and '$(IsPreview)' == 'true' ">
+    <!--
+      Preview package suffixes
+    -->
+    <PropertyGroup>
+      <_VersionSuffix>$([System.DateTime]::Now.ToString(yyMMdd-HHmm))</_VersionSuffix>
+      <ToolkitPreviewVersion>$(ToolkitPreviewVersion).$(_VersionSuffix)</ToolkitPreviewVersion>
+      <PackageVersion>$(PackageVersion)-$(ToolkitPreviewVersion)</PackageVersion>
+    </PropertyGroup>
   </Target>
 </Project>

src/Directory.Build.targets

@@ -29,15 +29,6 @@
     <PackageVersion>$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
   </PropertyGroup>
 
-  <!--
-    Preview package suffixes
-  -->
-  <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' AND  '$(VersionSuffix)' == '' AND '$(IsPreview)' == 'true' ">
-    <_VersionSuffix>$([System.DateTime]::Now.ToString(yyMMdd-HHmm))</_VersionSuffix>
-    <VersionSuffix>$(ToolkitPreviewVersion).$(_VersionSuffix)</VersionSuffix>
-    <PackageVersion>$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
-  </PropertyGroup>
-
   <PropertyGroup>
     <WarningsAsErrors>$(DefaultWarningsAsErrors);$(WarningsAsErrors)</WarningsAsErrors>
   </PropertyGroup>