Skip to content

Commit 15ad01e

Browse files
committed
Remove EntityFrameworkCorePomeloVersion property (stable release is available now), fix flaky tests on MySQL
1 parent 2bbf36c commit 15ad01e

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

package-versions.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
4141
<AspNetCoreVersion>9.0.*</AspNetCoreVersion>
4242
<EntityFrameworkCoreVersion>9.0.*</EntityFrameworkCoreVersion>
43-
<EntityFrameworkCorePomeloVersion>9.0.0-*</EntityFrameworkCorePomeloVersion>
4443
</PropertyGroup>
4544

4645
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -50,6 +49,5 @@
5049
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
5150
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
5251
<EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
53-
<EntityFrameworkCorePomeloVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePomeloVersion>
5452
</PropertyGroup>
5553
</Project>

src/Examples/DapperExample/DapperExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCoreVersion)" />
1818
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
19-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCorePomeloVersion)" />
19+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCoreVersion)" />
2020
</ItemGroup>
2121
</Project>

test/DapperTests/IntegrationTests/QueryStrings/IncludeTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
7979
value.Should().NotBeNull();
8080
value.Data.ManyValue.Should().HaveCount(2);
8181
value.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("tags"));
82-
value.Data.ManyValue[0].Id.Should().Be(todoItems[0].Tags.ElementAt(0).StringId);
83-
value.Data.ManyValue[1].Id.Should().Be(todoItems[0].Tags.ElementAt(1).StringId);
82+
value.Data.ManyValue.Should().ContainSingle(resource => resource.Id == todoItems[0].Tags.ElementAt(0).StringId);
83+
value.Data.ManyValue.Should().ContainSingle(resource => resource.Id == todoItems[0].Tags.ElementAt(1).StringId);
8484
});
8585
});
8686

@@ -109,8 +109,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
109109
value.Should().NotBeNull();
110110
value.Data.ManyValue.Should().HaveCount(2);
111111
value.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("tags"));
112-
value.Data.ManyValue[0].Id.Should().Be(todoItems[1].Tags.ElementAt(0).StringId);
113-
value.Data.ManyValue[1].Id.Should().Be(todoItems[1].Tags.ElementAt(1).StringId);
112+
value.Data.ManyValue.Should().ContainSingle(resource => resource.Id == todoItems[1].Tags.ElementAt(0).StringId);
113+
value.Data.ManyValue.Should().ContainSingle(resource => resource.Id == todoItems[1].Tags.ElementAt(1).StringId);
114114
});
115115
});
116116

test/DapperTests/IntegrationTests/ReadWrite/Relationships/FetchRelationshipTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
141141

142142
responseDocument.Data.ManyValue.Should().HaveCount(2);
143143
responseDocument.Data.ManyValue.Should().AllSatisfy(resource => resource.Type.Should().Be("tags"));
144-
responseDocument.Data.ManyValue[0].Id.Should().Be(todoItem.Tags.ElementAt(0).StringId);
145-
responseDocument.Data.ManyValue[1].Id.Should().Be(todoItem.Tags.ElementAt(1).StringId);
144+
responseDocument.Data.ManyValue.Should().ContainSingle(resource => resource.Id == todoItem.Tags.ElementAt(0).StringId);
145+
responseDocument.Data.ManyValue.Should().ContainSingle(resource => resource.Id == todoItem.Tags.ElementAt(1).StringId);
146146

147147
responseDocument.Meta.Should().ContainTotal(2);
148148

0 commit comments

Comments
 (0)