Fix VSIX version

Author: rynowak

src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <IsProductPackage>true</IsProductPackage>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>false</IsTestProject>
-    <AddImplicitReferences>false</AddImplicitReferences>
-  </PropertyGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -16,7 +10,7 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <!-- Other projects should not reference this assembly. It is only meaning to be used in Visual Studio. -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
-    <IsProductPackage>true</IsProductPackage>
+    <IsShippingPackage>true</IsShippingPackage>
     <IsPackable>false</IsPackable>
     <EnableSourceLink>false</EnableSourceLink>
     <GenerateSourceLinkFile>false</GenerateSourceLinkFile>
@@ -35,17 +29,19 @@
     <!--
       Following VS convention of using the VS release # as a convention for the vsix version.
 
-      VS needs this build number to be parsable by System.Version, so it can't have any letters.
+      VS needs this build number to be parsable by System.Version, so it can't have any letters or a - which
+      is used by our build system.
     -->
-    <VsixVersion>16.0.0</VsixVersion>
-    <VsixVersion Condition="'$(BuildNumber)'!='' AND '$(BuildNumber)'!='t000'">$(VsixVersion).$(BuildNumber)</VsixVersion>
-    <VsixVersion Condition="'$(BuildNumber)'=='' AND '$(CI)'!='true'">$(VsixVersion).999999</VsixVersion>
-    <VsixVersion Condition="'$(BuildNumber)'=='' AND '$(CI)'=='true'">$(VsixVersion).ERROR-MISSING_BUILD_NUMBER</VsixVersion>
+    <VsixVersionPrefix>16.0</VsixVersionPrefix>
+    <VsixVersionSuffix Condition="'$(BuildNumberSuffix)'=='t000'">424242.424242</VsixVersionSuffix>
+    <VsixVersionSuffix Condition="'$(VsixVersionSuffix)'==''">$(BuildNumberSuffix.Replace('-', '.'))</VsixVersionSuffix>
+    <VsixVersion>$(VsixVersionPrefix).$(VsixVersionSuffix)</VsixVersion>
   </PropertyGroup>
   <!--
     Used by the .vsixmanifest to insert the the VSIX version based on $(VsixVersion)
   -->
   <Target Name="GetBuildVersion" Outputs="$(VsixVersion)" />
+
   <PropertyGroup>
     <!-- Use the same experimental hive as Roslyn and Razor. This makes it easy to mix private builds. -->
     <StartAction>Program</StartAction>