diff --git a/Directory.Build.props b/Directory.Build.props
index 91758478ee..80a2c6569e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,4 @@
 <Project>
-  <Import Project="version.xml" />
   <Import Project="build\dependencies.props" />
 
   <PropertyGroup>
@@ -10,7 +9,6 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 </Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index 0cb948e13a..7a15023f19 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,4 +1,6 @@
 <Project>
+  <Import Project="..\version.xml" />
+
   <PropertyGroup>
     <AspNetCoreIntegrationTestingVersion>0.5.0-*</AspNetCoreIntegrationTestingVersion>
     <AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>
diff --git a/build/repo.props b/build/repo.props
index 2e89e8f97a..0f3c67c012 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -1,4 +1,6 @@
 <Project>
+  <Import Project="dependencies.props" />
+
   <ItemGroup>
     <ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\Microsoft.AspNetCore.RuntimeStore.csproj" />
     <ExcludeFromPack Include="$(RepositoryRoot)src\Archive.AspNetCore.All\Archive.AspNetCore.All.csproj" />
diff --git a/build/repo.targets b/build/repo.targets
index 1e11e3a619..4eb7caedd4 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,11 +1,5 @@
 <Project>
-  <Import Project="..\version.xml" />
-  <Import Project="dependencies.props" />
-
   <PropertyGroup>
-    <OriginalVersionSuffix>$(VersionSuffix)</OriginalVersionSuffix>
-    <VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-
     <!-- Project for building the Runtime Store -->
     <MetaPackagePath>$(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\</MetaPackagePath>
     <MetaPackageFile>$(MetaPackagePath)Microsoft.AspNetCore.RuntimeStore.csproj</MetaPackageFile>
diff --git a/version.xml b/version.xml
index 3c05022b7d..88464f4cc3 100644
--- a/version.xml
+++ b/version.xml
@@ -4,5 +4,9 @@
     <KoreBuildChannel>dev</KoreBuildChannel>
     <VersionPrefix>2.1.0</VersionPrefix>
     <VersionSuffix>preview1</VersionSuffix>
+    <OriginalVersionSuffix>$(VersionSuffix)</OriginalVersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <Version>$(VersionPrefix)</Version>
+    <Version Condition="'$(VersionSuffix)' != ''">$(Version)-$(VersionSuffix)</Version>
   </PropertyGroup>
 </Project>