diff --git a/Directory.Build.props b/Directory.Build.props
index a8f8cbde6ab..0b6c9ffa060 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,6 +17,8 @@
 
     <!-- Working around https://github.com/NuGet/Home/issues/8467 -->
     <NoWarn>$(NoWarn);NU5131</NoWarn>
+    <!-- TODO - remove this line once we use embedded package icons -->
+    <NoWarn>$(NoWarn);NU5048</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 72a2262d524..42f59868ac8 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -7,23 +7,32 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Workaround while there is no 5.0 SDK available, copy known apphost/framework reference info from 3.0. -->
-    <KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
-        TargetFramework="netcoreapp5.0" />
-    <KnownFrameworkReference Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
-        TargetFramework="netcoreapp5.0" />
+    <!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 3.0 -->
+    <KnownAppHostPack 
+      Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
+      TargetFramework="$(DefaultNetCoreTargetFramework)"
+      Condition="!(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
+      />
+    <KnownFrameworkReference
+      Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
+      TargetFramework="$(DefaultNetCoreTargetFramework)"
+      Condition="!(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
+      />
 
     <!-- Reference base shared framework at incoming dependency flow version, not bundled sdk version. -->
-    <FrameworkReference Update="Microsoft.NETCore.App"
+    <KnownFrameworkReference Update="Microsoft.NETCore.App"
         Condition="'$(TargetFramework)' == 'netcoreapp5.0'"
         RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
         TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" />
 
     <!-- Reference netstandard library at incoming dependency flow version, not bundled sdk version. -->
-    <FrameworkReference Update="NETStandard.Library"
+    <KnownFrameworkReference Update="NETStandard.Library"
         Condition="'$(TargetFramework)' == 'netstandard2.1'"
         TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)" />
 
+    <!-- Remove unneeded reference to AspNetCore.App -->
+    <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
+
     <!-- Workaround for netstandard2.1 projects until we can get a 5.0 SDK containing https://github.com/dotnet/sdk/pull/3463 fix. -->
     <KnownFrameworkReference Update="NETStandard.Library">
       <RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
diff --git a/global.json b/global.json
index 2b51fa31f68..81daa9bf5bf 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-013656",
+    "dotnet": "5.0.100-alpha1-014696",
     "runtimes": {
       "dotnet": [
         "2.0.9",
@@ -9,7 +9,7 @@
     }
   },
   "sdk": {
-    "version": "3.0.100-preview8-013656"
+    "version": "5.0.100-alpha1-014696"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"
diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec
index 4c9d05dde92..993b1bf869f 100644
--- a/src/dotnet-ef/dotnet-ef.nuspec
+++ b/src/dotnet-ef/dotnet-ef.nuspec
@@ -6,7 +6,7 @@
       <packageType name="$packageType$" />
     </packageTypes>
     <dependencies>
-      <group targetFramework=".NETCoreApp3.1" />
+      <group targetFramework=".NETCoreApp5.0" />
     </dependencies>
   </metadata>