Skip to content

Commit a147adc

Browse files
authored
feat!: efcore 10 and .NET 10 (#671)
* feat!: efcore 10 and .NET 10 Target Entity Framework Core 10 and .NET 10. * chore: address review comments
1 parent 9c14613 commit a147adc

File tree

33 files changed

+530
-266
lines changed

33 files changed

+530
-266
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET
1919
uses: actions/setup-dotnet@v5
2020
with:
21-
dotnet-version: 8.0.x
21+
dotnet-version: 10.0.x
2222
- name: Restore dependencies
2323
run: dotnet restore
2424
- name: Build

.github/workflows/integration-tests-on-emulator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET
2323
uses: actions/setup-dotnet@v5
2424
with:
25-
dotnet-version: 8.0.x
25+
dotnet-version: 10.0.x
2626
- name: Restore dependencies
2727
run: dotnet restore
2828
- name: Build

.github/workflows/integration-tests-on-production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup .NET
2828
uses: actions/setup-dotnet@v5
2929
with:
30-
dotnet-version: 8.0.x
30+
dotnet-version: 10.0.x
3131
- id: 'auth'
3232
uses: 'google-github-actions/auth@v3'
3333
with:

.github/workflows/samples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET
1414
uses: actions/setup-dotnet@v5
1515
with:
16-
dotnet-version: 8.0.x
16+
dotnet-version: 10.0.x
1717
- name: Restore dependencies
1818
run: dotnet restore
1919
- name: Build

Google.Cloud.EntityFrameworkCore.Spanner.Benchmarks/Google.Cloud.EntityFrameworkCore.Spanner.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests/Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77

@@ -19,8 +19,8 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.24" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.24">
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.2" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>

Google.Cloud.EntityFrameworkCore.Spanner.IntegrationTests/QueryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ public async Task CanUseStringFormat()
692692

693693
var formattedName = await db.Singers
694694
.Where(s => new long[] { singerId }.Contains(s.SingerId))
695-
.Select(s => string.Format("String without formatting"))
695+
.Select(s => string.Format("String without formatting", Array.Empty<object>()))
696696
.FirstOrDefaultAsync();
697697
Assert.Equal("String without formatting", formattedName);
698698

Google.Cloud.EntityFrameworkCore.Spanner.Samples/Google.Cloud.EntityFrameworkCore.Spanner.Samples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AssemblyName>SampleRunner</AssemblyName>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<RollForward>LatestMajor</RollForward>
88
</PropertyGroup>
99

@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.24">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.2">
2929
<PrivateAssets>all</PrivateAssets>
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
</PackageReference>

Google.Cloud.EntityFrameworkCore.Spanner.Tests/AutoGeneratedPrimaryKeyTests/AutoGeneratedPrimaryKeyMockServerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public async Task FindInvoiceAsync_ReturnsNull_IfNotFound()
6363
{
6464
var sql = $"SELECT `i`.`InvoiceId`, `i`.`Description`{Environment.NewLine}" +
6565
$"FROM `Invoices` AS `i`{Environment.NewLine}" +
66-
$"WHERE `i`.`InvoiceId` = @__p_0{Environment.NewLine}" +
66+
$"WHERE `i`.`InvoiceId` = @p{Environment.NewLine}" +
6767
$"LIMIT 1";
6868
_fixture.SpannerMock.AddOrUpdateStatementResult(sql, StatementResult.CreateResultSet(
6969
new List<Tuple<V1.Type, string>>(),

Google.Cloud.EntityFrameworkCore.Spanner.Tests/EntityFrameworkMockServerTests.cs

Lines changed: 81 additions & 79 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)