Update to .NET 6 Preview 7

Directory.Build.props

@@ -21,7 +21,7 @@
     <PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore</PackageTags>
     <Product>Microsoft Entity Framework Core</Product>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <DebugType>portable</DebugType>
     <PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
   </PropertyGroup>

eng/Version.Details.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <!-- NB: Pinned for compatibility with Preview 5 -->
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.6.21276.2" Pinned="True">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-rc.1.21375.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
+      <Sha>95863758cd16c345d0b8fca067d5db5d6901e498</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-rc.1.21375.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -34,10 +33,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>95863758cd16c345d0b8fca067d5db5d6901e498</Sha>
     </Dependency>
-    <!-- NB: Pinned for compatibility with Preview 5 -->
-    <Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21276.2" Pinned="True">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.1.21375.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
+      <Sha>95863758cd16c345d0b8fca067d5db5d6901e498</Sha>
     </Dependency>
     <Dependency Name="System.Collections.Immutable" Version="6.0.0-rc.1.21375.2">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -17,15 +17,15 @@
   <PropertyGroup Label="Dependencies from dotnet/runtime">
     <SystemCollectionsImmutableVersion>6.0.0-rc.1.21375.2</SystemCollectionsImmutableVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.1.21375.2</SystemDiagnosticsDiagnosticSourceVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsCachingMemoryVersion>
     <MicrosoftExtensionsConfigurationVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsConfigurationVersion>
     <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
     <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
     <MicrosoftExtensionsConfigurationJsonVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsConfigurationJsonVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsDependencyInjectionVersion>
     <MicrosoftExtensionsDependencyModelVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
-    <MicrosoftExtensionsLoggingVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsLoggingVersion>6.0.0-rc.1.21375.2</MicrosoftExtensionsLoggingVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.6.21355.2",
+    "dotnet": "6.0.100-preview.7.21377.35",
     "runtimes": {
       "dotnet": [
         "3.1.16",
@@ -13,7 +13,7 @@
     }
   },
   "sdk": {
-    "version": "6.0.100-preview.6.21355.2",
+    "version": "6.0.100-preview.7.21377.35",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },

src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs

@@ -46,10 +46,10 @@ public ObservableBackedBindingList(ICollection<T> observableCollection)
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        protected override object AddNewCore()
+        protected override object? AddNewCore()
         {
             _addingNewInstance = true;
-            _addNewInstance = (T)base.AddNewCore();
+            _addNewInstance = (T?)base.AddNewCore();
             return _addNewInstance;
         }
 

src/EFCore/Metadata/Builders/IndexBuilder.cs

@@ -28,7 +28,7 @@ public class IndexBuilder : IInfrastructure<IConventionIndexBuilder>
         [EntityFrameworkInternal]
         public IndexBuilder(IMutableIndex index)
         {
-            Builder = ((Index)index).Builder;
+            Builder = ((Internal.Index)index).Builder;
         }
 
         /// <summary>

test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
@@ -28,7 +27,7 @@ public void IndexAttribute_database_name_can_be_overriden_using_fluent_api()
 
             modelBuilder.Model.FinalizeModel();
 
-            var index0 = (Index)entityBuilder.Metadata.GetIndexes().First();
+            var index0 = (Internal.Index)entityBuilder.Metadata.GetIndexes().First();
             Assert.Equal(ConfigurationSource.DataAnnotation, index0.GetConfigurationSource());
             Assert.Equal("IndexOnAAndB", index0.Name);
             Assert.Equal("MyIndexOnAAndB", index0.GetDatabaseName());
@@ -40,7 +39,7 @@ public void IndexAttribute_database_name_can_be_overriden_using_fluent_api()
                 prop0 => Assert.Equal("A", prop0.Name),
                 prop1 => Assert.Equal("B", prop1.Name));
 
-            var index1 = (Index)entityBuilder.Metadata.GetIndexes().Skip(1).First();
+            var index1 = (Internal.Index)entityBuilder.Metadata.GetIndexes().Skip(1).First();
             Assert.Equal(ConfigurationSource.DataAnnotation, index1.GetConfigurationSource());
             Assert.Equal("IndexOnBAndC", index1.Name);
             Assert.Equal("MyIndexOnBAndC", index1.GetDatabaseName());

test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <Description>Shared test suite for Entity Framework Core database providers.</Description>
     <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
     <AssemblyName>Microsoft.EntityFrameworkCore.Specification.Tests</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>