diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj
index ea7c29341d6..3b481d98be5 100644
--- a/SmokeTests/SmokeTest.csproj
+++ b/SmokeTests/SmokeTest.csproj
@@ -6,6 +6,9 @@
     <!-- When writting the SmokeTests, change this to whichever Toolkit project you want to build a test to, then reload the project -->
     <CurrentProject>Microsoft.Toolkit.Uwp.UI.Controls</CurrentProject>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(NuGetPackageVersion)' == ''">
+    <NuGetPackageVersion>To Fill In With Local Version Number</NuGetPackageVersion>
+  </PropertyGroup>
   <!-- - - - - - Don't check-in changes in between this lines. Used for development. - - - - - -->
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -112,8 +115,8 @@
       <Version>2.4.3</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline'">
-    <PackageReference Include="$(CurrentProject)" Version="7.*-*" />
+  <ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
+    <PackageReference Include="$(CurrentProject)" Version="$(NuGetPackageVersion)" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
@@ -125,5 +128,6 @@
       <ToolkitNuget Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', `$(CurrentProject).([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?.nupkg`))" Include="@(ToolkitNugets)"/>
     </ItemGroup>
     <Error Condition="'@(ToolkitNuget)' == '' and $(CurrentProject) != 'UWPBaseline'" Text="NuGet $(CurrentProject).[SEMVER].nupkg doesn't exist!"/>
+    <Error Condition="'$(CurrentProject)' != 'UWPBaseline' and '$(NuGetPackageVersion)' == 'To Fill In With Local Version Number'" Text="Please set NuGetPackageVersion at the top of SmokeTest.csproj with the version to smoke test locally."/>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/SmokeTests/SmokeTest.sln b/SmokeTests/SmokeTest.sln
index 63b5bc21c10..b37aa3328f7 100644
--- a/SmokeTests/SmokeTest.sln
+++ b/SmokeTests/SmokeTest.sln
@@ -5,6 +5,13 @@ VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmokeTest", "SmokeTest.csproj", "{A6E4CB52-1025-4BBA-9C65-BB871D1FB53F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{86F3F991-6DDA-442D-A610-9309D6559522}"
+	ProjectSection(SolutionItems) = preProject
+		nuget.config = nuget.config
+		SmokeTestAnalysis.ps1 = SmokeTestAnalysis.ps1
+		SmokeTests.proj = SmokeTests.proj
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index 18b9aee3a8b..e4f08260c42 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -7,8 +7,18 @@
     <ToolkitPackages>UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown</ToolkitPackages>
   </PropertyGroup>
 
+  <Target Name="GetNuGetVersion">
+    <Exec Command="powershell -Command &quot;&amp; { .\&quot;$(ProjectDir)..\build\tools\Nerdbank.GitVersioning\tools\Get-Version.ps1\&quot; | Select -ExpandProperty NuGetPackageVersion }&quot;"
+          ConsoleToMSBuild="true"
+          EchoOff="true"
+          Condition="'$(NuGetPackageVersion)' == ''">
+      <Output TaskParameter="ConsoleOutput" PropertyName="NuGetPackageVersion" />
+    </Exec>
+    <Message Text="Got GitBank Version... $(NuGetPackageVersion)" Importance="High" />
+  </Target>
+
   <Target Name="Build" 
-          DependsOnTargets="ChooseProjectsToBuild"
+          DependsOnTargets="ChooseProjectsToBuild;GetNuGetVersion"
           Inputs="@(ProjectsToBuild)"
           Outputs="%(Filename)">
 
@@ -16,7 +26,7 @@
 
     <MSBuild Projects="SmokeTest.csproj"
               Targets="restore;build"
-              Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform)"/>
+              Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)"/>
   </Target>
 
   <Target Name="ChooseProjectsToBuild" DependsOnTargets="CheckNugets">
diff --git a/build/build.cake b/build/build.cake
index 4369b25d3d3..5813e08d10f 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -135,7 +135,6 @@ Task("Verify")
 
 Task("Version")
     .Description("Updates the version information in all Projects")
-    .IsDependentOn("Verify")
     .Does(() =>
 {
     Information("\nDownloading NerdBank GitVersioning...");
@@ -210,6 +209,7 @@ Task("InheritDoc")
 
 Task("Build")
     .Description("Build all projects runs InheritDoc")
+    .IsDependentOn("Verify")
     .IsDependentOn("BuildProjects")
     .IsDependentOn("InheritDoc");
 
@@ -289,10 +289,19 @@ Task("UITest")
 
 Task("SmokeTest")
 	.Description("Runs all Smoke Tests")
+    .IsDependentOn("Version")
     .Does(() =>
 {
+    // Need to do full NuGet restore here to grab proper UWP dependencies...
     NuGetRestore(baseDir + "/SmokeTests/SmokeTest.csproj");
-    MSBuild(baseDir + "/SmokeTests/SmokeTests.proj");
+
+    var buildSettings = new MSBuildSettings()
+    {
+        Restore = true,
+    }
+    .WithProperty("NuGetPackageVersion", Version);
+
+    MSBuild(baseDir + "/SmokeTests/SmokeTests.proj", buildSettings);
 }).DeferOnError();
 
 Task("MSTestUITest")