diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index e17d710a4ad901efdf9c347ddce4775d8c07c316..651456e0088bb6f55093685e4dee18598165fdbc 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -392,4 +392,7 @@
       <Message Text="$(IbcMergeOutput)" />
 
   </Target>
+
+  <!-- Returns the current build version. Used in .vsixmanifests to substitute our build version into them -->
+  <Target Name="GetBuildVersion" Outputs="$(VsixVersion)" />
 </Project>
diff --git a/build/Targets/Versions.props b/build/Targets/Versions.props
index d0984d599d7ce2e4395564a05eef018f586ffad7..d15becfe657844b6414a061d01a258915ffafab5 100644
--- a/build/Targets/Versions.props
+++ b/build/Targets/Versions.props
@@ -17,23 +17,17 @@
     <NuGetPreReleaseVersion>$(RoslynFileVersionBase)-$(RoslynNuGetMoniker)</NuGetPreReleaseVersion>
     <!-- Currently we version IW the same as Roslyn. -->
     <MicrosoftVisualStudioInteractiveWindowVersion>$(RoslynAssemblyVersionBase)</MicrosoftVisualStudioInteractiveWindowVersion>
-  </PropertyGroup>
 
-  <PropertyGroup>
     <!-- We should not be signing a build anywhere except for in MicroBuild, which will always specify 'BUILD_BUILDNUMBER' -->
     <BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
     <Error Condition="'$(BuildNumber)' == '' AND '$(OfficialBuild)' == 'true'">A build number must be specified for a signed build.</Error>
-  </PropertyGroup>
 
-  <PropertyGroup>
     <!-- When a build number is not specified, then we should default back to '00000000.0', which is a build number in the
          same format as provided by MicroBuild v2, but with all digits set to zero. -->
     <BuildNumber Condition="'$(BuildNumber)' == ''">00000000.0</BuildNumber>
     <!-- When a build number is specified, it needs to be in the format of 'x.y' -->
     <Error Condition="$(BuildNumber.Split('.').Length) != 2">BuildNumber should have two parts (in the form of 'x.y')</Error>
-  </PropertyGroup>
 
-  <PropertyGroup>
     <!-- Split the build parts out from the BuildNumber which is given to us by MicroBuild in the format of yyyymmdd.nn
          where BuildNumberFiveDigitDateStamp is ymmdd (such as 60615) and BuildNumberBuildOfTheDay is nn (which represents the nth build 
          started that day). So the first build of the day, 20160615.1, will produce something similar to BuildNumberFiveDigitDateStamp: 60615,
@@ -43,6 +37,10 @@
          each part to be in the range of 0 through 65535. Issue #12038 tracks the fix that needs to happen. -->
     <BuildNumberFiveDigitDateStamp>$(BuildNumber.Split('.')[0].Substring(3).Trim())</BuildNumberFiveDigitDateStamp>
     <BuildNumberBuildOfTheDayPadded>$(BuildNumber.Split('.')[1].PadLeft(2,'0'))</BuildNumberBuildOfTheDayPadded>
+
+    <!-- NuGet version -->
+    <NuGetReleaseVersion>$(RoslynFileVersionBase)</NuGetReleaseVersion>
+    <NuGetPerBuildPreReleaseVersion>$(NuGetPreReleaseVersion)-$(BuildNumberFiveDigitDateStamp)-$(BuildNumberBuildOfTheDayPadded)</NuGetPerBuildPreReleaseVersion>
   </PropertyGroup>
   
   <Choose>
@@ -69,36 +67,25 @@
   </Choose>
 
   <Choose>
-      <When Condition="'$(BUILD_SOURCEVERSION)' != ''">
-          <PropertyGroup>
-              <GitHeadSha>$(BUILD_SOURCEVERSION)</GitHeadSha>
-          </PropertyGroup>
-      </When>
-      <When Condition="'$(BUILD_SOURCEVERSION)' == '' and '$(GIT_COMMIT)' != ''">
-          <PropertyGroup>
-              <GitHeadSha>$(GIT_COMMIT)</GitHeadSha>
-          </PropertyGroup>
-      </When>
-      <Otherwise>
-          <PropertyGroup>
-            <GitHeadSha>Not found</GitHeadSha>
-            <DotGitDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../../.git'))</DotGitDir>
-            <HeadFileContent Condition="Exists('$(DotGitDir)/HEAD')">$([System.IO.File]::ReadAllText('$(DotGitDir)/HEAD').Trim())</HeadFileContent>
-            <RefPath Condition="$(HeadFileContent.StartsWith('ref: '))">$(DotGitDir)/$(HeadFileContent.Substring(5))</RefPath>
-            <GitHeadSha Condition="'$(RefPath)' != '' and Exists('$(RefPath)')">$([System.IO.File]::ReadAllText('$(RefPath)').Trim())</GitHeadSha>
-            <GitHeadSha Condition="'$(HeadFileContent)' != '' and
-                                   '$(RefPath)' == ''">$(HeadFileContent)</GitHeadSha>
-          </PropertyGroup>
-      </Otherwise>
+    <When Condition="'$(BUILD_SOURCEVERSION)' != ''">
+      <PropertyGroup>
+        <GitHeadSha>$(BUILD_SOURCEVERSION)</GitHeadSha>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(BUILD_SOURCEVERSION)' == '' and '$(GIT_COMMIT)' != ''">
+      <PropertyGroup>
+        <GitHeadSha>$(GIT_COMMIT)</GitHeadSha>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <GitHeadSha>Not found</GitHeadSha>
+        <DotGitDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../../.git'))</DotGitDir>
+        <HeadFileContent Condition="Exists('$(DotGitDir)/HEAD')">$([System.IO.File]::ReadAllText('$(DotGitDir)/HEAD').Trim())</HeadFileContent>
+        <RefPath Condition="$(HeadFileContent.StartsWith('ref: '))">$(DotGitDir)/$(HeadFileContent.Substring(5))</RefPath>
+        <GitHeadSha Condition="'$(RefPath)' != '' and Exists('$(RefPath)')">$([System.IO.File]::ReadAllText('$(RefPath)').Trim())</GitHeadSha>
+        <GitHeadSha Condition="'$(HeadFileContent)' != '' and '$(RefPath)' == ''">$(HeadFileContent)</GitHeadSha>
+      </PropertyGroup>
+    </Otherwise>
   </Choose>
-
-  <!-- Returns the current build version. Used in .vsixmanifests to substitute our build version into them -->
-  <Target Name="GetBuildVersion" Outputs="$(VsixVersion)" />
-
-  <!-- NuGet version -->
-  <PropertyGroup>
-    <NuGetReleaseVersion>$(RoslynFileVersionBase)</NuGetReleaseVersion>
-    <NuGetPerBuildPreReleaseVersion>$(NuGetPreReleaseVersion)-$(BuildNumberFiveDigitDateStamp)-$(BuildNumberBuildOfTheDayPadded)</NuGetPerBuildPreReleaseVersion>
-  </PropertyGroup>
-
 </Project>