diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
index be0bd7f87b..eb8d04e634 100644
--- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
+++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
@@ -14,6 +14,7 @@
 
     <!-- This is so that we add the FrameworkReference to Microsoft.AspNetCore.App -->
     <UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
+    <MicrosoftAspNetCoreAppVersion>3.1.0</MicrosoftAspNetCoreAppVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/Blazor/DevServer/src/runtimeconfig.template.json b/src/Components/Blazor/DevServer/src/runtimeconfig.template.json
new file mode 100644
index 0000000000..f022b7ffce
--- /dev/null
+++ b/src/Components/Blazor/DevServer/src/runtimeconfig.template.json
@@ -0,0 +1,3 @@
+{
+  "rollForwardOnNoCandidateFx": 2
+}
\ No newline at end of file
diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props
index 227faf5fc0..0b1e44f2d6 100644
--- a/src/Components/Directory.Build.props
+++ b/src/Components/Directory.Build.props
@@ -14,7 +14,7 @@
 
     <!-- This property points to the latest released Microsoft.AspNetCore.App version it needs to be updated to
          target the latest patch before a preview release. -->
-    <LatestAspNetCoreReferenceVersion>3.1.2</LatestAspNetCoreReferenceVersion>
+    <LatestAspNetCoreReferenceVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</LatestAspNetCoreReferenceVersion>
 
     <ComponentsSharedSourceRoot>$(MSBuildThisFileDirectory)Shared\</ComponentsSharedSourceRoot>
 
diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets
index b6b1f773d9..8b7db89e7a 100644
--- a/src/Components/Directory.Build.targets
+++ b/src/Components/Directory.Build.targets
@@ -12,8 +12,8 @@
       <KnownFrameworkReference Include="Microsoft.AspNetCore.App">
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <RuntimeFrameworkName>Microsoft.AspNetCore.App</RuntimeFrameworkName>
-        <DefaultRuntimeFrameworkVersion>$(LatestAspNetCoreReferenceVersion)</DefaultRuntimeFrameworkVersion>
-        <LatestRuntimeFrameworkVersion>$(LatestAspNetCoreReferenceVersion)</LatestRuntimeFrameworkVersion>
+        <DefaultRuntimeFrameworkVersion>$(MicrosoftAspNetCoreAppVersion)</DefaultRuntimeFrameworkVersion>
+        <LatestRuntimeFrameworkVersion>$(MicrosoftAspNetCoreAppVersion)</LatestRuntimeFrameworkVersion>
         <TargetingPackName>Microsoft.AspNetCore.App.Ref</TargetingPackName>
         <TargetingPackVersion>$(LatestAspNetCoreReferenceVersion)</TargetingPackVersion>
         <RuntimePackNamePatterns>Microsoft.AspNetCore.App.Runtime.**RID**</RuntimePackNamePatterns>