diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj b/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj
index 2f63ef75ec..fc30e717eb 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj
@@ -21,10 +21,14 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- Following VS convention of using the VS release # as a convention for the vsix version. -->
+    <!-- 
+      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.
+    -->
     <VsixVersion>15.6</VsixVersion>
-    <VsixVersion Condition="'$(BuildNumber)'!=''">$(VsixVersion).$(BuildNumber)</VsixVersion>
-    <VsixVersion Condition="'$(BuildNumber)'==''">$(VsixVersion).999999</VsixVersion>
+    <VsixVersion Condition="'$(BuildNumber)'!='' AND '$(BuildNumber)'!='t000'">$(VsixVersion).$(BuildNumber)</VsixVersion>
+    <VsixVersion Condition="'$(BuildNumber)'=='' OR '$(BuildNumber)'=='t000'">$(VsixVersion).999999</VsixVersion>
   </PropertyGroup>
   <!--
     Used by the .vsixmanifest to insert the the VSIX version based on $(VsixVersion)
diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs b/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs
index df2a6eafa5..dc398d7ac4 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs
@@ -5,10 +5,13 @@ using Microsoft.VisualStudio.Shell;
 
 // Add binding redirects for each assembly we ship in VS. This is required so that these assemblies show
 // up in the Load context, which means that we can use ServiceHub and other nice things.
+//
+// The versions here need to match what the build is producing. If you change the version numbers
+// for the Blazor assemblies, this needs to change as well.
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.VisualStudio.LanguageServices.Blazor",
     GenerateCodeBase = true,
     PublicKeyToken = "",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "1.0.0.0",
-    NewVersion = "1.0.0.0")]
+    OldVersionUpperBound = "0.0.5.0",
+    NewVersion = "0.0.5.0")]