diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2995c7f564..23f8be4193 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,297 +13,297 @@
       <Uri>https://github.com/dotnet/blazor</Uri>
       <Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
     </Dependency>
-    <Dependency Name="dotnet-ef" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="dotnet-ef" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-rc.1.20372.13">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-rc.1.20405.3">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>59734ea22f29d22f8d0c1673c59a99c54ec4e78d</Sha>
+      <Sha>9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Drawing.Common" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.IO.Pipelines" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Net.Http.Json" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Reflection.Metadata" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Resources.Extensions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
     <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
-    <Dependency Name="System.Security.AccessControl" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Security.AccessControl" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Security.Permissions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Principal.Windows" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Security.Principal.Windows" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Text.Json" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Threading.Channels" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="System.Windows.Extensions" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20370.4">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20404.16">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
+      <Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20374.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3ac9563017..55da9dcac9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -64,82 +64,82 @@
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20379.3</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20370.4</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20370.4</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20370.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftWin32RegistryPackageVersion>5.0.0-rc.1.20370.4</MicrosoftWin32RegistryPackageVersion>
-    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftWin32SystemEventsPackageVersion>
-    <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsCachingAbstractionsPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationBinderPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
-    <MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationIniPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsConfigurationXmlPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsFileProvidersCompositePackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsHostingAbstractionsPackageVersion>
-    <MicrosoftExtensionsHostingPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsHostingPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsHttpPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingEventSourcePackageVersion>
-    <MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingEventLogPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rc.1.20370.4</MicrosoftExtensionsInternalTransportPackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>5.0.0-rc.1.20370.4</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-rc.1.20370.4</SystemDiagnosticsDiagnosticSourcePackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>5.0.0-rc.1.20370.4</SystemDiagnosticsEventLogPackageVersion>
-    <SystemDrawingCommonPackageVersion>5.0.0-rc.1.20370.4</SystemDrawingCommonPackageVersion>
-    <SystemIOPipelinesPackageVersion>5.0.0-rc.1.20370.4</SystemIOPipelinesPackageVersion>
-    <SystemNetHttpJsonPackageVersion>5.0.0-rc.1.20370.4</SystemNetHttpJsonPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-rc.1.20370.4</SystemNetHttpWinHttpHandlerPackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-rc.1.20370.4</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <SystemReflectionMetadataPackageVersion>5.0.0-rc.1.20370.4</SystemReflectionMetadataPackageVersion>
-    <SystemResourcesExtensionsPackageVersion>5.0.0-rc.1.20370.4</SystemResourcesExtensionsPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-rc.1.20370.4</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>5.0.0-rc.1.20404.16</MicrosoftWin32RegistryPackageVersion>
+    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftWin32SystemEventsPackageVersion>
+    <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsCachingAbstractionsPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+    <MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingEventLogPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rc.1.20404.16</MicrosoftExtensionsInternalTransportPackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>5.0.0-rc.1.20404.16</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-rc.1.20404.16</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>5.0.0-rc.1.20404.16</SystemDiagnosticsEventLogPackageVersion>
+    <SystemDrawingCommonPackageVersion>5.0.0-rc.1.20404.16</SystemDrawingCommonPackageVersion>
+    <SystemIOPipelinesPackageVersion>5.0.0-rc.1.20404.16</SystemIOPipelinesPackageVersion>
+    <SystemNetHttpJsonPackageVersion>5.0.0-rc.1.20404.16</SystemNetHttpJsonPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-rc.1.20404.16</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-rc.1.20404.16</SystemNetWebSocketsWebSocketProtocolPackageVersion>
+    <SystemReflectionMetadataPackageVersion>5.0.0-rc.1.20404.16</SystemReflectionMetadataPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>5.0.0-rc.1.20404.16</SystemResourcesExtensionsPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-rc.1.20404.16</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
-    <SystemSecurityAccessControlPackageVersion>5.0.0-rc.1.20370.4</SystemSecurityAccessControlPackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>5.0.0-rc.1.20370.4</SystemSecurityCryptographyCngPackageVersion>
-    <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-rc.1.20370.4</SystemSecurityCryptographyPkcsPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>5.0.0-rc.1.20370.4</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>5.0.0-rc.1.20370.4</SystemSecurityPermissionsPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>5.0.0-rc.1.20370.4</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemServiceProcessServiceControllerPackageVersion>5.0.0-rc.1.20370.4</SystemServiceProcessServiceControllerPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>5.0.0-rc.1.20370.4</SystemTextEncodingsWebPackageVersion>
-    <SystemTextJsonPackageVersion>5.0.0-rc.1.20370.4</SystemTextJsonPackageVersion>
-    <SystemThreadingChannelsPackageVersion>5.0.0-rc.1.20370.4</SystemThreadingChannelsPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>5.0.0-rc.1.20370.4</SystemWindowsExtensionsPackageVersion>
+    <SystemSecurityAccessControlPackageVersion>5.0.0-rc.1.20404.16</SystemSecurityAccessControlPackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>5.0.0-rc.1.20404.16</SystemSecurityCryptographyCngPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-rc.1.20404.16</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>5.0.0-rc.1.20404.16</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>5.0.0-rc.1.20404.16</SystemSecurityPermissionsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>5.0.0-rc.1.20404.16</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>5.0.0-rc.1.20404.16</SystemServiceProcessServiceControllerPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>5.0.0-rc.1.20404.16</SystemTextEncodingsWebPackageVersion>
+    <SystemTextJsonPackageVersion>5.0.0-rc.1.20404.16</SystemTextJsonPackageVersion>
+    <SystemThreadingChannelsPackageVersion>5.0.0-rc.1.20404.16</SystemThreadingChannelsPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>5.0.0-rc.1.20404.16</SystemWindowsExtensionsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20370.4</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from dotnet/blazor -->
     <MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefPackageVersion>5.0.0-rc.1.20372.13</dotnetefPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-rc.1.20372.13</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-rc.1.20372.13</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-rc.1.20372.13</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-rc.1.20372.13</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-rc.1.20372.13</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.1.20372.13</MicrosoftEntityFrameworkCorePackageVersion>
+    <dotnetefPackageVersion>5.0.0-rc.1.20405.3</dotnetefPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-rc.1.20405.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-rc.1.20405.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-rc.1.20405.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-rc.1.20405.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-rc.1.20405.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.1.20405.3</MicrosoftEntityFrameworkCorePackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/global.json b/global.json
index 43ce9ccf9d..527272a0a8 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "5.0.100-preview.7.20330.3"
+    "version": "5.0.100-rc.1.20379.10"
   },
   "tools": {
-    "dotnet": "5.0.100-preview.7.20330.3",
+    "dotnet": "5.0.100-rc.1.20379.10",
     "runtimes": {
       "dotnet/x64": [
         "2.1.18",
diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
index 936d30ba14..56c2264553 100644
--- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
+++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs
@@ -53,15 +53,20 @@ namespace Microsoft.AspNetCore.Components.Forms
             messages.Clear();
             foreach (var validationResult in validationResults)
             {
+                if (validationResult == null)
+                {
+                    continue;
+                }
+
                 if (!validationResult.MemberNames.Any())
                 {
-                    messages.Add(new FieldIdentifier(editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage);
+                    messages.Add(new FieldIdentifier(editContext.Model, fieldName: string.Empty), validationResult.ErrorMessage!);
                     continue;
                 }
 
                 foreach (var memberName in validationResult.MemberNames)
                 {
-                    messages.Add(editContext.Field(memberName), validationResult.ErrorMessage);
+                    messages.Add(editContext.Field(memberName), validationResult.ErrorMessage!);
                 }
             }
 
@@ -81,7 +86,7 @@ namespace Microsoft.AspNetCore.Components.Forms
 
                 Validator.TryValidateProperty(propertyValue, validationContext, results);
                 messages.Clear(fieldIdentifier);
-                messages.Add(fieldIdentifier, results.Select(result => result.ErrorMessage));
+                messages.Add(fieldIdentifier, results.Select(result => result.ErrorMessage!));
 
                 // We have to notify even if there were no messages before and are still no messages now,
                 // because the "state" that changed might be the completion of some async validation task
diff --git a/src/Components/Ignitor/src/Ignitor.csproj b/src/Components/Ignitor/src/Ignitor.csproj
index 1176fa2c6c..df9565339e 100644
--- a/src/Components/Ignitor/src/Ignitor.csproj
+++ b/src/Components/Ignitor/src/Ignitor.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <!-- Intentionally targeting netcoreapp3.0 because we do not want to update the Benchmark client to use 3.1 -->
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsShippingPackage>false</IsShippingPackage>
     <DefineConstants>$(DefineConstants);IGNITOR</DefineConstants>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs b/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs
index 6abac268cc..12987cbac6 100644
--- a/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs
+++ b/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs
@@ -12,6 +12,9 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http
     /// </summary>
     public static class WebAssemblyHttpRequestMessageExtensions
     {
+        private static readonly HttpRequestOptionsKey<IDictionary<string, object>> FetchRequestOptionsKey = new HttpRequestOptionsKey<IDictionary<string, object>>("WebAssemblyFetchOptions");
+        private static readonly HttpRequestOptionsKey<bool> WebAssemblyEnableStreamingResponseKey = new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse");
+
         /// <summary>
         /// Configures a value for the 'credentials' option for the HTTP request.
         /// </summary>
@@ -126,17 +129,15 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http
                 throw new ArgumentNullException(nameof(requestMessage));
             }
 
-            const string FetchRequestOptionsKey = "WebAssemblyFetchOptions";
             IDictionary<string, object> fetchOptions;
-
-            if (requestMessage.Properties.TryGetValue(FetchRequestOptionsKey, out var entry))
+            if (requestMessage.Options.TryGetValue(FetchRequestOptionsKey, out var entry))
             {
-                fetchOptions = (IDictionary<string, object>)entry;
+                fetchOptions = entry;
             }
             else
             {
                 fetchOptions = new Dictionary<string, object>(StringComparer.Ordinal);
-                requestMessage.Properties[FetchRequestOptionsKey] = fetchOptions;
+                requestMessage.Options.Set(FetchRequestOptionsKey, fetchOptions);
             }
 
             fetchOptions[name] = value;
@@ -161,7 +162,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http
                 throw new ArgumentNullException(nameof(requestMessage));
             }
 
-            requestMessage.Properties["WebAssemblyEnableStreamingResponse"] = streamingEnabled;
+            requestMessage.Options.Set(WebAssemblyEnableStreamingResponseKey, streamingEnabled);
 
             return requestMessage;
         }
diff --git a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
index 2ab8014948..8d2b6a4115 100644
--- a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
+++ b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -152,9 +152,10 @@ namespace Microsoft.AspNetCore.Mvc.Testing.Handlers
                 redirect.Content = originalContent;
             }
 
-            foreach (var property in response.RequestMessage.Properties)
+            foreach (var property in response.RequestMessage.Options)
             {
-                redirect.Properties.Add(property.Key, property.Value);
+                var key = new HttpRequestOptionsKey<object>(property.Key);
+                redirect.Options.Set(key, property.Value);
             }
         }
 
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs
index e651cad69f..700c190385 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs
@@ -113,7 +113,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
                 Assert.BuildFailed(result);
 
-                // This needs to be relative path. Tracked by https://github.com/aspnet/Razor/issues/2187.
                 var filePath = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
                 var location = filePath + "(1,2)";
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs
index b6d14278a4..7f7e829b06 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         public Task Build_SimpleMvc_UsingDotnetMSBuildAndWithoutBuildServer_CanBuildSuccessfully()
             => Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind.Dotnet);
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24427")]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("SimpleMvc")]
         public Task Build_SimpleMvc_UsingDesktopMSBuildAndWithoutBuildServer_CanBuildSuccessfully()
@@ -96,7 +96,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             Assert.BuildFailed(result);
 
             // Verifying that the error correctly gets mapped to the original source
-            Assert.BuildError(result, "CS1503", location: Path.Combine("Views", "Home", "Index.cshtml") + "(1,27)");
+            var filePath = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml");
+            var location = filePath + "(1,27)";
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                // Absolute paths on OSX don't work well.
+                location = null;
+            }
+            Assert.BuildError(result, "CS1503", location);
 
             // Compilation failed without creating the views assembly
             Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs
index 670c032036..de73ff376a 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs
@@ -216,8 +216,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("_IntrospectContentItems");
 
             Assert.BuildPassed(result);
-            var launchSettingsPath = Path.Combine("Properties", "launchSettings.json");
-            Assert.BuildOutputContainsLine(result, $"Content: {launchSettingsPath} CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=Never ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
         }
@@ -230,8 +228,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             var result = await DotnetMSBuild("_IntrospectContentItems", "/p:ExcludeConfigFilesFromBuildOutput=true");
 
             Assert.BuildPassed(result);
-            var launchSettingsPath = Path.Combine("Properties", "launchSettings.json");
-            Assert.BuildOutputContainsLine(result, $"Content: {launchSettingsPath} CopyToOutputDirectory= CopyToPublishDirectory=Never ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
             Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true");
         }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs
index 005ac4ccf6..9b1510ee09 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         public Task Build_SimpleMvc_WithServer_UsingDotnetMSBuild_CanBuildSuccessfully()
             => Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind.Dotnet);
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24427")]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("SimpleMvc")]
         public Task Build_SimpleMvc_WithServer_UsingDesktopMSBuild_CanBuildSuccessfully()
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs
index fa6e78c7d7..f0a1c87c32 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs
@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         [InitializeTestProject("MvcWithComponents")]
         public Task Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Dotnet);
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24427")]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         [InitializeTestProject("MvcWithComponents")]
         public Task Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Desktop);
diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
index 3f808a9395..71e4f7fd20 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
+++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Client for ASP.NET Core SignalR</Description>
@@ -27,10 +27,6 @@
     <Reference Include="System.Threading.Channels" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(AspNetCoreMajorMinorVersion)' == '5.0'">
     <!-- This dependency was replaced by Protocols.NewtonsoftJson between 3.0 and 2.2. This suppression can be removed after 3.0 is complete. -->
     <SuppressBaselineReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />