diff --git a/build-tools/scripts/AssemblyInfo.g.cs.in b/build-tools/scripts/AssemblyInfo.g.cs.in
index 15d49cc72..fbab3c09f 100644
--- a/build-tools/scripts/AssemblyInfo.g.cs.in
+++ b/build-tools/scripts/AssemblyInfo.g.cs.in
@@ -18,6 +18,6 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("@INFORMATIONALVERSION@")]
 [assembly: System.Reflection.AssemblyProductAttribute("@PRODUCT@")]
 [assembly: System.Reflection.AssemblyTitleAttribute("@TITLE@")]
-[assembly: System.Reflection.AssemblyVersionAttribute("@VERSION@.0")]
+[assembly: System.Reflection.AssemblyVersionAttribute("@VERSION@")]
 
 // Generated by the MSBuild WriteCodeFragment class.
\ No newline at end of file
diff --git a/build-tools/scripts/Version.props.in b/build-tools/scripts/Version.props.in
index cbefc19da..a414f3475 100644
--- a/build-tools/scripts/Version.props.in
+++ b/build-tools/scripts/Version.props.in
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>@VERSION@</Version>
+    <Version Condition=" '$(Version)' == '' ">@VERSION@</Version>
     <InformationalVersion>@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@</InformationalVersion>
     <Company>Microsoft Corporation</Company>
     <Copyright>Microsoft Corporation</Copyright>
diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
index 228da5b2a..051223abd 100644
--- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
+++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
@@ -7,6 +7,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <AssemblyTitle>Java.Interop.Dynamic</AssemblyTitle>
+    <Version>0.1.0.0</Version>
   </PropertyGroup>
   <PropertyGroup>
     <OutputPath>$(ToolOutputFullPath)</OutputPath>
diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj
index b1dd39bd6..bc3170252 100644
--- a/src/Java.Interop.Export/Java.Interop.Export.csproj
+++ b/src/Java.Interop.Export/Java.Interop.Export.csproj
@@ -7,6 +7,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <AssemblyTitle>Java.Interop.Export</AssemblyTitle>
+    <Version>0.1.0.0</Version>
   </PropertyGroup>
   <PropertyGroup>
     <OutputPath>$(ToolOutputFullPath)</OutputPath>
diff --git a/src/Java.Interop/Java.Interop-MonoAndroid.csproj b/src/Java.Interop/Java.Interop-MonoAndroid.csproj
index cafa4db40..4aaf58ba6 100644
--- a/src/Java.Interop/Java.Interop-MonoAndroid.csproj
+++ b/src/Java.Interop/Java.Interop-MonoAndroid.csproj
@@ -17,6 +17,7 @@
     <LangVersion>8.0</LangVersion>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <Version>0.1.0.0</Version>
   </PropertyGroup>
   <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj
index ec061e072..ee91dd585 100644
--- a/src/Java.Interop/Java.Interop.csproj
+++ b/src/Java.Interop/Java.Interop.csproj
@@ -30,6 +30,7 @@
     <Nullable>enable</Nullable>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
+    <Version>0.1.0.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>