huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[master] Update dependencies from dotnet/efcore (#22558) 

* Update dependencies from https://github.com/dotnet/efcore build 20200604.3

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 5.0.0-preview.7.20304.1 -> To Version 5.0.0-preview.7.20304.3

* Update dependencies from https://github.com/dotnet/efcore build 20200604.5

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 5.0.0-preview.7.20304.1 -> To Version 5.0.0-preview.7.20304.5

* Update dependencies from https://github.com/dotnet/efcore build 20200604.6

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 5.0.0-preview.7.20304.1 -> To Version 5.0.0-preview.7.20304.6

* Update dependencies from https://github.com/dotnet/efcore build 20200605.1

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 5.0.0-preview.7.20304.1 -> To Version 5.0.0-preview.7.20305.1

* Update dependencies from https://github.com/dotnet/efcore build 20200605.2

Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory
 From Version 5.0.0-preview.7.20304.1 -> To Version 5.0.0-preview.7.20305.2

* Update Identity for breaking changes in EF Core

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Smit Patel <smitpatel@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2020-06-06 01:49:33 +00:00 committed by GitHub
parent 8a4af4f212
commit b6e593bbbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
eng/Version.Details.xml
View File

@ -13,33 +13,33 @@
<Uri>https://github.com/dotnet/blazor</Uri> <Uri>https://github.com/dotnet/blazor</Uri>
<Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha> <Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-ef" Version="5.0.0-preview.7.20304.1"> <Dependency Name="dotnet-ef" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.7.20304.1"> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.7.20304.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-preview.7.20304.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-preview.7.20304.1"> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.7.20304.1"> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.7.20304.1"> <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.7.20305.2">
<Uri>https://github.com/dotnet/efcore</Uri> <Uri>https://github.com/dotnet/efcore</Uri>
<Sha>a5efd9a8d8ef0c4315a52cdf6aa9bf98c898d53a</Sha> <Sha>49200d0082c3a5250f50fd211f8c3d25e24fd8b5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.7.20305.1"> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.7.20305.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>

14
eng/Versions.props
View File

@ -131,13 +131,13 @@
<!-- Packages from dotnet/blazor --> <!-- Packages from dotnet/blazor -->
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion> <MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
<!-- Packages from dotnet/efcore --> <!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.0-preview.7.20304.1</dotnetefPackageVersion> <dotnetefPackageVersion>5.0.0-preview.7.20305.2</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.7.20304.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.7.20305.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.7.20304.1</MicrosoftEntityFrameworkCoreRelationalPackageVersion> <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.7.20305.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.7.20304.1</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.7.20305.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.7.20304.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.7.20305.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.7.20304.1</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.7.20305.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.7.20304.1</MicrosoftEntityFrameworkCorePackageVersion> <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.7.20305.2</MicrosoftEntityFrameworkCorePackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- <!--

2
src/Identity/EntityFrameworkCore/src/IdentityDbContext.cs
View File

@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
builder.Entity<TRole>(b => builder.Entity<TRole>(b =>
{ {
b.HasKey(r => r.Id); b.HasKey(r => r.Id);
b.HasIndex(r => r.NormalizedName).HasName("RoleNameIndex").IsUnique(); b.HasIndex(r => r.NormalizedName).HasDatabaseName("RoleNameIndex").IsUnique();
b.ToTable("AspNetRoles"); b.ToTable("AspNetRoles");
b.Property(r => r.ConcurrencyStamp).IsConcurrencyToken(); b.Property(r => r.ConcurrencyStamp).IsConcurrencyToken();

6
src/Identity/EntityFrameworkCore/src/IdentityUserContext.cs
View File

@ -124,8 +124,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
builder.Entity<TUser>(b => builder.Entity<TUser>(b =>
{ {
b.HasKey(u => u.Id); b.HasKey(u => u.Id);
b.HasIndex(u => u.NormalizedUserName).HasName("UserNameIndex").IsUnique(); b.HasIndex(u => u.NormalizedUserName).HasDatabaseName("UserNameIndex").IsUnique();
b.HasIndex(u => u.NormalizedEmail).HasName("EmailIndex"); b.HasIndex(u => u.NormalizedEmail).HasDatabaseName("EmailIndex");
b.ToTable("AspNetUsers"); b.ToTable("AspNetUsers");
b.Property(u => u.ConcurrencyStamp).IsConcurrencyToken(); b.Property(u => u.ConcurrencyStamp).IsConcurrencyToken();
@ -173,7 +173,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
b.ToTable("AspNetUserLogins"); b.ToTable("AspNetUserLogins");
}); });
builder.Entity<TUserToken>(b => builder.Entity<TUserToken>(b =>
{ {
b.HasKey(t => new { t.UserId, t.LoginProvider, t.Name }); b.HasKey(t => new { t.UserId, t.LoginProvider, t.Name });

4
src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs
View File

@ -26,8 +26,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
builder.Entity<IdentityUser>(b => builder.Entity<IdentityUser>(b =>
{ {
b.HasKey(u => u.Id); b.HasKey(u => u.Id);
b.HasIndex(u => u.NormalizedUserName).HasName("UserNameIndex").IsUnique(); b.HasIndex(u => u.NormalizedUserName).HasDatabaseName("UserNameIndex").IsUnique();
b.HasIndex(u => u.NormalizedEmail).HasName("EmailIndex"); b.HasIndex(u => u.NormalizedEmail).HasDatabaseName("EmailIndex");
b.ToTable("AspNetUsers"); b.ToTable("AspNetUsers");
b.Property(u => u.ConcurrencyStamp).IsConcurrencyToken(); b.Property(u => u.ConcurrencyStamp).IsConcurrencyToken();

8
src/Identity/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs generated
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -36,7 +36,7 @@ namespace IdentitySample.Data.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("NormalizedName") b.HasIndex("NormalizedName")
.HasName("RoleNameIndex"); .HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles"); b.ToTable("AspNetRoles");
}); });
@ -167,11 +167,11 @@ namespace IdentitySample.Data.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("NormalizedEmail") b.HasIndex("NormalizedEmail")
.HasName("EmailIndex"); .HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName") b.HasIndex("NormalizedUserName")
.IsUnique() .IsUnique()
.HasName("UserNameIndex"); .HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers"); b.ToTable("AspNetUsers");
}); });

8
src/Identity/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -35,7 +35,7 @@ namespace IdentitySample.Data.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("NormalizedName") b.HasIndex("NormalizedName")
.HasName("RoleNameIndex"); .HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles"); b.ToTable("AspNetRoles");
}); });
@ -166,11 +166,11 @@ namespace IdentitySample.Data.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("NormalizedEmail") b.HasIndex("NormalizedEmail")
.HasName("EmailIndex"); .HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName") b.HasIndex("NormalizedUserName")
.IsUnique() .IsUnique()
.HasName("UserNameIndex"); .HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers"); b.ToTable("AspNetUsers");
}); });