From a89537ecf31fc75d024348ddf6093b0e42cedd13 Mon Sep 17 00:00:00 2001
From: Shay Rojansky <roji@roji.org>
Date: Fri, 20 Sep 2024 12:17:42 +0200
Subject: [PATCH 1/3] Rename IncludeRootDiscriminatorInJsonId to
 HasRootDiscriminatorInJsonId (#34717)

---
 .../Extensions/CosmosEntityTypeBuilderExtensions.cs  | 12 ++++++------
 .../Extensions/CosmosModelBuilderExtensions.cs       |  2 +-
 test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs |  6 +++---
 .../KeysWithConvertersCosmosTest.cs                  |  2 +-
 .../Query/NorthwindQueryCosmosFixture.cs             | 12 ++++++------
 ...ItemPartitionKeyQueryRootDiscriminatorInIdTest.cs |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs
index 02399247c3b..e801beb2235 100644
--- a/src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs
+++ b/src/EFCore.Cosmos/Extensions/CosmosEntityTypeBuilderExtensions.cs
@@ -531,7 +531,7 @@ public static EntityTypeBuilder HasDiscriminatorInJsonId(
     ///     <see langword="null" /> to revert to the default setting.
     /// </param>
     /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static EntityTypeBuilder IncludeRootDiscriminatorInJsonId(
+    public static EntityTypeBuilder HasRootDiscriminatorInJsonId(
         this EntityTypeBuilder entityTypeBuilder,
         bool? includeDiscriminator = true)
     {
@@ -578,11 +578,11 @@ public static EntityTypeBuilder<TEntity> HasDiscriminatorInJsonId<TEntity>(
     ///     <see langword="null" /> to revert to the default setting.
     /// </param>
     /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static EntityTypeBuilder<TEntity> IncludeRootDiscriminatorInJsonId<TEntity>(
+    public static EntityTypeBuilder<TEntity> HasRootDiscriminatorInJsonId<TEntity>(
         this EntityTypeBuilder<TEntity> entityTypeBuilder,
         bool? includeDiscriminator = true)
         where TEntity : class
-        => (EntityTypeBuilder<TEntity>)IncludeRootDiscriminatorInJsonId((EntityTypeBuilder)entityTypeBuilder, includeDiscriminator);
+        => (EntityTypeBuilder<TEntity>)HasRootDiscriminatorInJsonId((EntityTypeBuilder)entityTypeBuilder, includeDiscriminator);
 
     /// <summary>
     ///     Includes the discriminator value of the entity type in the JSON "id" value. This was the default behavior before EF Core 9.
@@ -633,12 +633,12 @@ public static EntityTypeBuilder<TEntity> IncludeRootDiscriminatorInJsonId<TEntit
     /// </param>
     /// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
     /// <returns>The same builder instance if the configuration was applied, <see langword="null" /> otherwise.</returns>
-    public static IConventionEntityTypeBuilder? IncludeRootDiscriminatorInJsonId(
+    public static IConventionEntityTypeBuilder? HasRootDiscriminatorInJsonId(
         this IConventionEntityTypeBuilder entityTypeBuilder,
         bool? includeDiscriminator,
         bool fromDataAnnotation = false)
     {
-        if (!entityTypeBuilder.CanSetIncludeRootDiscriminatorInJsonId(includeDiscriminator, fromDataAnnotation))
+        if (!entityTypeBuilder.CanSetRootDiscriminatorInJsonId(includeDiscriminator, fromDataAnnotation))
         {
             return null;
         }
@@ -699,7 +699,7 @@ public static bool CanSetDiscriminatorInJsonId(
     /// </param>
     /// <param name="fromDataAnnotation">Indicates whether the configuration was specified using a data annotation.</param>
     /// <returns><see langword="true" /> if the configuration can be applied.</returns>
-    public static bool CanSetIncludeRootDiscriminatorInJsonId(
+    public static bool CanSetRootDiscriminatorInJsonId(
         this IConventionEntityTypeBuilder entityTypeBuilder,
         bool? includeDiscriminator,
         bool fromDataAnnotation = false)
diff --git a/src/EFCore.Cosmos/Extensions/CosmosModelBuilderExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosModelBuilderExtensions.cs
index f4a8c1e91df..ad6064ebab2 100644
--- a/src/EFCore.Cosmos/Extensions/CosmosModelBuilderExtensions.cs
+++ b/src/EFCore.Cosmos/Extensions/CosmosModelBuilderExtensions.cs
@@ -165,7 +165,7 @@ public static ModelBuilder HasDiscriminatorInJsonIds(
     ///     <see langword="null" /> to revert to the default setting.
     /// </param>
     /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-    public static ModelBuilder IncludeRootDiscriminatorInJsonId(
+    public static ModelBuilder HasRootDiscriminatorInJsonId(
         this ModelBuilder modelBuilder,
         bool? includeDiscriminator = true)
     {
diff --git a/test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs
index c83b8e9ed43..c282f9903e2 100644
--- a/test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/FindCosmosTest.cs
@@ -461,11 +461,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
             modelBuilder.Entity<IntKey>()
                 .ToContainer("Ints")
-                .IncludeRootDiscriminatorInJsonId();
+                .HasRootDiscriminatorInJsonId();
 
             modelBuilder.Entity<NullableIntKey>()
                 .ToContainer("Ints")
-                .IncludeRootDiscriminatorInJsonId();
+                .HasRootDiscriminatorInJsonId();
 
             modelBuilder.Entity<StringKey>()
                 .ToContainer("Strings");
@@ -475,7 +475,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
             modelBuilder.Entity<BaseType>()
                 .ToContainer("Base")
-                .IncludeRootDiscriminatorInJsonId();
+                .HasRootDiscriminatorInJsonId();
 
             modelBuilder.Entity<ShadowKey>().ToContainer("ShadowKeys");
         }
diff --git a/test/EFCore.Cosmos.FunctionalTests/KeysWithConvertersCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/KeysWithConvertersCosmosTest.cs
index 7426f08e237..c365f06debe 100644
--- a/test/EFCore.Cosmos.FunctionalTests/KeysWithConvertersCosmosTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/KeysWithConvertersCosmosTest.cs
@@ -20,7 +20,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         {
             base.OnModelCreating(modelBuilder, context);
 
-            modelBuilder.IncludeRootDiscriminatorInJsonId();
+            modelBuilder.HasRootDiscriminatorInJsonId();
         }
 
         public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindQueryCosmosFixture.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindQueryCosmosFixture.cs
index d0d57c6d1d5..a96b54ccbf8 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindQueryCosmosFixture.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindQueryCosmosFixture.cs
@@ -42,32 +42,32 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         modelBuilder.Entity<Employee>().ToContainer("Employees");
 
         modelBuilder.Entity<Order>()
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .ToContainer("ProductsAndOrders");
 
         modelBuilder.Entity<OrderDetail>()
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .ToContainer("ProductsAndOrders");
 
         modelBuilder.Entity<Product>()
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .ToContainer("ProductsAndOrders");
 
         modelBuilder.Entity<OrderQuery>()
             .ToContainer("ProductsAndOrders")
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .HasDiscriminator<string>("$type").HasValue("Order");
 
         modelBuilder
             .Entity<ProductQuery>()
             .ToContainer("ProductsAndOrders")
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .HasDiscriminator<string>("$type").HasValue("Product");
 
         modelBuilder
             .Entity<ProductView>()
             .ToContainer("ProductsAndOrders")
-            .IncludeRootDiscriminatorInJsonId()
+            .HasRootDiscriminatorInJsonId()
             .HasDiscriminator<string>("$type").HasValue("ProductView");
 
         modelBuilder
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
index f65ca71a1ef..ca992cf55da 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Query/ReadItemPartitionKeyQueryRootDiscriminatorInIdTest.cs
@@ -858,7 +858,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         {
             base.OnModelCreating(modelBuilder, context);
 
-            modelBuilder.IncludeRootDiscriminatorInJsonId();
+            modelBuilder.HasRootDiscriminatorInJsonId();
         }
     }
 }

From 1af68b0ff99a7f58540af9edab69b42f07c00e88 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:19:35 +0000
Subject: [PATCH 2/3] Update dependencies from
 https://github.com/dotnet/runtime build 20240920.3 (#34737)

[release/9.0] Update dependencies from dotnet/runtime
---
 eng/Version.Details.xml | 56 ++++++++++++++++++++---------------------
 eng/Versions.props      | 28 ++++++++++-----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 864a993f633..77953f0b523 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</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="9.0.0-rc.2.24456.9">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="9.0.0-rc.2.24456.9">
+    <Dependency Name="System.Formats.Asn1" Version="9.0.0-rtm.24470.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
+      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 918396ba20f..baa9c8d29f7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,20 +17,20 @@
     <UsingToolXliff>False</UsingToolXliff>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/runtime">
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24456.9</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24456.9</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemTextEncodingsWebVersion>9.0.0-rc.2.24456.9</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rc.2.24456.9</SystemTextJsonVersion>
-    <SystemFormatsAsn1Version>9.0.0-rc.2.24456.9</SystemFormatsAsn1Version>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24470.3</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24470.3</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemTextEncodingsWebVersion>9.0.0-rtm.24470.3</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rtm.24470.3</SystemTextJsonVersion>
+    <SystemFormatsAsn1Version>9.0.0-rtm.24470.3</SystemFormatsAsn1Version>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
     <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24466.2</MicrosoftDotNetBuildTasksTemplatingVersion>

From c7035b3ccc485a63bd03a64da4d9f0ec18f27948 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:05:15 +0000
Subject: [PATCH 3/3] Update dependencies from
 https://github.com/dotnet/runtime build 20240923.2 (#34745)

[release/9.0] Update dependencies from dotnet/runtime
---
 eng/Version.Details.xml | 56 ++++++++++++++++++++---------------------
 eng/Versions.props      | 28 ++++++++++-----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 77953f0b523..8435f2d7f1f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</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="9.0.0-rtm.24470.3">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="9.0.0-rtm.24470.3">
+    <Dependency Name="System.Formats.Asn1" Version="9.0.0-rtm.24473.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>9c9e77e8eec007a6cc5e7d14739b14974dbddc55</Sha>
+      <Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index baa9c8d29f7..99a39945444 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,20 +17,20 @@
     <UsingToolXliff>False</UsingToolXliff>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/runtime">
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24470.3</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24470.3</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24470.3</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemTextEncodingsWebVersion>9.0.0-rtm.24470.3</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>9.0.0-rtm.24470.3</SystemTextJsonVersion>
-    <SystemFormatsAsn1Version>9.0.0-rtm.24470.3</SystemFormatsAsn1Version>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24473.2</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24473.2</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24473.2</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemTextEncodingsWebVersion>9.0.0-rtm.24473.2</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>9.0.0-rtm.24473.2</SystemTextJsonVersion>
+    <SystemFormatsAsn1Version>9.0.0-rtm.24473.2</SystemFormatsAsn1Version>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
     <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24466.2</MicrosoftDotNetBuildTasksTemplatingVersion>