diff --git a/build/VSIX.targets b/build/VSIX.targets
index 5995deeabd..2ce110ac89 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -65,7 +65,7 @@
         /t:Restore;
         /v:m;
         /p:Configuration=$(Configuration);
-        /p:BuildNumber=$(BuildNumber);" />
+        /p:BuildNumber=$(VSIXBuildNumber);" />
       <MSBuildArguments Include="/p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
       <MSBuildArguments Include="/p:DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''" />
     </ItemGroup>
@@ -103,7 +103,7 @@
         /p:SymbolsPublishDir=$(BuildDir);
         /p:Configuration=$(Configuration);
         /p:FeatureBranchVersionSuffix=$(FeatureBranchVersionSuffix);
-        /p:BuildNumber=$(BuildNumber);
+        /p:BuildNumber=$(VSIXBuildNumber);
         /p:LangVersion=7.1" />
     </ItemGroup>
 
diff --git a/version.props b/version.props
index 88598148cd..dd3f51a14b 100644
--- a/version.props
+++ b/version.props
@@ -8,7 +8,10 @@
     <FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <!-- VS for Mac does not like letters in package versions -->
+    
+    <!-- VS does not like letters in package versions -->
+    <VSIXBuildNumber Condition="'$(BuildNumber)' == 't000'">99999</VSIXBuildNumber>
+    <VSIXBuildNumber Condition="'$(VSIXBuildNumber)' == ''">$(BuildNumber)</VSIXBuildNumber>
     <AddinBuildNumber Condition="'$(BuildNumber)' == 't000'">99999</AddinBuildNumber>
     <AddinBuildNumber Condition="'$(AddinBuildNumber)' == ''">$(BuildNumber)</AddinBuildNumber>