Merge branch 'release/9.0'

roji · Aug 27, 2024 · 56716b0 · 56716b0
2 parents 621fa44 + f63769a
commit 56716b0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 38 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</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.1.24419.2">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="9.0.0-rc.1.24419.2">
+    <Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24423.10">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae</Sha>
+      <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -16,18 +16,18 @@
     <UsingToolXliff>False</UsingToolXliff>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/runtime">
-    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.1.24419.2</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.1.24419.2</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.1.24419.2</MicrosoftNETCoreAppRuntimewinx64Version>
-    <SystemTextJsonVersion>9.0.0-rc.1.24419.2</SystemTextJsonVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyModelVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24423.10</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24423.10</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24423.10</MicrosoftNETCoreAppRuntimewinx64Version>
+    <SystemTextJsonVersion>9.0.0-rc.2.24423.10</SystemTextJsonVersion>
   </PropertyGroup>
   <PropertyGroup Label="Dependencies from dotnet/arcade">
     <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24423.2</MicrosoftDotNetBuildTasksTemplatingVersion>

diff --git a/test/EFCore.Specification.Tests/MusicStoreTestBase.cs b/test/EFCore.Specification.Tests/MusicStoreTestBase.cs
@@ -327,7 +327,7 @@ await context.Database.CreateExecutionStrategy().ExecuteAsync(
     }
 
     [ConditionalFact]
-    public virtual async void Music_store_project_to_mapped_entity()
+    public virtual async Task Music_store_project_to_mapped_entity()
     {
         using var context = CreateContext();
         await context.Database.CreateExecutionStrategy().ExecuteAsync(

diff --git a/test/EFCore.Specification.Tests/SpatialTestBase.cs b/test/EFCore.Specification.Tests/SpatialTestBase.cs
@@ -38,7 +38,7 @@ public virtual void Values_arent_compared_by_reference()
     }
 
     [ConditionalFact]
-    public virtual async void Mutation_of_tracked_values_does_not_mutate_values_in_store()
+    public virtual async Task Mutation_of_tracked_values_does_not_mutate_values_in_store()
     {
         Point CreatePoint(double y = 2.2)
             => new(1.1, y, 3.3);