Skip to content

Commit eb486e7

Browse files
committed
.Net 10
1 parent c73baf9 commit eb486e7

35 files changed

Lines changed: 1804 additions & 73 deletions

.github/workflows/.net-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET Core
2525
uses: actions/setup-dotnet@v1
2626
with:
27-
dotnet-version: 8.0.100
27+
dotnet-version: 10.0.100
2828

2929
- name: Tests
3030
run: dotnet test EntityFrameworkCore.SqlServer.SimpleBulks.Tests/EntityFrameworkCore.SqlServer.SimpleBulks.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura

.github/workflows/.net-test-connection-extensions-discriminator-enabled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET Core
2525
uses: actions/setup-dotnet@v1
2626
with:
27-
dotnet-version: 8.0.100
27+
dotnet-version: 10.0.100
2828

2929
- name: Tests
3030
run: dotnet test EntityFrameworkCore.SqlServer.SimpleBulks.Tests/EntityFrameworkCore.SqlServer.SimpleBulks.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura

.github/workflows/.net-test-connection-extensions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET Core
2525
uses: actions/setup-dotnet@v1
2626
with:
27-
dotnet-version: 8.0.100
27+
dotnet-version: 10.0.100
2828

2929
- name: Tests
3030
run: dotnet test EntityFrameworkCore.SqlServer.SimpleBulks.Tests/EntityFrameworkCore.SqlServer.SimpleBulks.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura

.github/workflows/.net-test-dbcontext-extensions-discriminator-enabled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET Core
2525
uses: actions/setup-dotnet@v1
2626
with:
27-
dotnet-version: 8.0.100
27+
dotnet-version: 10.0.100
2828

2929
- name: Tests
3030
run: dotnet test EntityFrameworkCore.SqlServer.SimpleBulks.Tests/EntityFrameworkCore.SqlServer.SimpleBulks.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura

.github/workflows/.net-test-dbcontext-extensions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET Core
2525
uses: actions/setup-dotnet@v1
2626
with:
27-
dotnet-version: 8.0.100
27+
dotnet-version: 10.0.100
2828

2929
- name: Tests
3030
run: dotnet test EntityFrameworkCore.SqlServer.SimpleBulks.Tests/EntityFrameworkCore.SqlServer.SimpleBulks.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<CurrentTargetFramework>net8.0</CurrentTargetFramework>
3+
<CurrentTargetFramework>net10.0</CurrentTargetFramework>
44
<CurrentNet8Version>8.23.0</CurrentNet8Version>
55
<CurrentNet9Version>9.0.0-preview.1</CurrentNet9Version>
66
<CurrentNet10Version>10.0.0-preview.1</CurrentNet10Version>

src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/ComplexTypes.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ public class ComplexTypeLocation
1717

1818
public double Lng { get; set; }
1919
}
20+
21+
public class JsonComplexTypeAddress
22+
{
23+
public string Street { get; set; }
24+
25+
public ComplexTypeLocation Location { get; set; }
26+
}

src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/OwnedTypes.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ public class OwnedTypeLocation
1717

1818
public double Lng { get; set; }
1919
}
20+
21+
public class JsonOwnedTypeAddress
22+
{
23+
public string Street { get; set; }
24+
25+
public OwnedTypeLocation Location { get; set; }
26+
}

src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/SingleKeyRow.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ public class SingleKeyRow<TId>
3939
public ComplexTypeAddress ComplexShippingAddress { get; set; }
4040

4141
public OwnedTypeAddress OwnedShippingAddress { get; set; }
42+
43+
public JsonComplexTypeAddress JsonComplexShippingAddress { get; set; }
44+
45+
public JsonOwnedTypeAddress JsonOwnedShippingAddress { get; set; }
4246
}
4347

4448
public class ExtendedSingleKeyRow<TId> : SingleKeyRow<TId>

src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/TestDbContext.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
3939

4040
modelBuilder.Entity<SingleKeyRow<int>>().Property(x => x.SeasonAsString).HasConversion(v => v.ToString(), v => (Season)Enum.Parse(typeof(Season), v));
4141

42+
modelBuilder.Entity<SingleKeyRow<int>>().ComplexProperty(x => x.JsonComplexShippingAddress, x =>
43+
{
44+
if (!_enableDiscriminator)
45+
{
46+
x.ToJson();
47+
}
48+
});
49+
50+
modelBuilder.Entity<SingleKeyRow<int>>().OwnsOne(x => x.JsonOwnedShippingAddress, x =>
51+
{
52+
x.ToJson();
53+
});
54+
4255
modelBuilder.Entity<CompositeKeyRow<int, int>>().HasKey(x => new { x.Id1, x.Id2 });
4356
modelBuilder.Entity<CompositeKeyRow<int, int>>().Property(x => x.SeasonAsString).HasConversion(v => v.ToString(), v => (Season)Enum.Parse(typeof(Season), v));
4457

0 commit comments

Comments
 (0)