diff --git a/Directory.Build.props b/Directory.Build.props
index bcfd949ae40..cdcd3c41701 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -21,7 +21,7 @@
Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore
Microsoft Entity Framework Core
true
- 9.0
+ 10.0
portable
https://docs.microsoft.com/ef/core/
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fb159ff88c4..0199b156c05 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,10 +1,9 @@
-
-
+
https://github.com/dotnet/runtime
- 293d47286161827ecc0d6e96f9eb7b82dafe8307
+ 95863758cd16c345d0b8fca067d5db5d6901e498
https://github.com/dotnet/runtime
@@ -34,10 +33,9 @@
https://github.com/dotnet/runtime
95863758cd16c345d0b8fca067d5db5d6901e498
-
-
+
https://github.com/dotnet/runtime
- 293d47286161827ecc0d6e96f9eb7b82dafe8307
+ 95863758cd16c345d0b8fca067d5db5d6901e498
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 513b1367fb0..24b29c941e2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,7 +17,7 @@
6.0.0-rc.1.21375.2
6.0.0-rc.1.21375.2
- 6.0.0-preview.6.21276.2
+ 6.0.0-rc.1.21375.2
6.0.0-rc.1.21375.2
6.0.0-rc.1.21375.2
6.0.0-rc.1.21375.2
@@ -25,7 +25,7 @@
6.0.0-rc.1.21375.2
6.0.0-rc.1.21375.2
6.0.0-rc.1.21375.2
- 6.0.0-preview.6.21276.2
+ 6.0.0-rc.1.21375.2
3.7.0
diff --git a/global.json b/global.json
index 82cbc22726f..6953c069d02 100644
--- a/global.json
+++ b/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"
},
diff --git a/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs b/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs
index 8addc816ae7..e5f89799e83 100644
--- a/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs
+++ b/src/EFCore.Abstractions/ChangeTracking/Internal/ObservableBackedBindingList.cs
@@ -46,10 +46,10 @@ public ObservableBackedBindingList(ICollection 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.
///
- protected override object AddNewCore()
+ protected override object? AddNewCore()
{
_addingNewInstance = true;
- _addNewInstance = (T)base.AddNewCore();
+ _addNewInstance = (T?)base.AddNewCore();
return _addNewInstance;
}
diff --git a/src/EFCore/Metadata/Builders/IndexBuilder.cs b/src/EFCore/Metadata/Builders/IndexBuilder.cs
index 5380c3079df..033b4b039d7 100644
--- a/src/EFCore/Metadata/Builders/IndexBuilder.cs
+++ b/src/EFCore/Metadata/Builders/IndexBuilder.cs
@@ -28,7 +28,7 @@ public class IndexBuilder : IInfrastructure
[EntityFrameworkInternal]
public IndexBuilder(IMutableIndex index)
{
- Builder = ((Index)index).Builder;
+ Builder = ((Internal.Index)index).Builder;
}
///
diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs
index e8161894fa7..5b1895e4d5c 100644
--- a/test/EFCore.Relational.Tests/Metadata/RelationalIndexTest.cs
+++ b/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());
diff --git a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj
index 981d083d827..76cbcfbfdf1 100644
--- a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj
+++ b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj
@@ -3,7 +3,6 @@
Shared test suite for Entity Framework Core database providers.
net6.0
- 9.0
Microsoft.EntityFrameworkCore.Specification.Tests
Microsoft.EntityFrameworkCore
true