Skip to content

Commit f32bdc7

Browse files
ericburchamericburcham
committed
Merge branch 'release/7.0.3'
2 parents c8b06d6 + 8d01fd4 commit f32bdc7

33 files changed

Lines changed: 122 additions & 121 deletions

‎.github/workflows/nuke-build.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ name: nuke-build
1818

1919
on: [push]
2020

21+
permissions:
22+
contents: read
23+
actions: write
24+
2125
jobs:
2226
ubuntu-latest:
2327
name: ubuntu-latest
@@ -51,4 +55,4 @@ jobs:
5155
uses: actions/upload-artifact@v4
5256
with:
5357
name: artifacts
54-
path: artifacts
58+
path: artifacts

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
22
<Project>
33
<!-- Global properties -->
44
<PropertyGroup>
@@ -32,7 +32,7 @@
3232

3333
<!-- Stylecop Analyzers -->
3434
<ItemGroup>
35-
<AdditionalFiles Include="../../stylecop.json" Link="stylecop.json"/>
35+
<AdditionalFiles Include="../../stylecop.json" Link="stylecop.json" />
3636
<PackageReference Include="StyleCop.Analyzers">
3737
<PrivateAssets>all</PrivateAssets>
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎src/Directory.Packages.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="AwesomeAssertions" Version="8.2.0" />
7+
<PackageVersion Include="AwesomeAssertions" Version="9.1.0" />
88
<PackageVersion Include="EntityFramework" Version="6.5.1" />
99
<PackageVersion Include="FluentMigrator" Version="7.1.0" />
1010
<PackageVersion Include="FluentMigrator.Runner.Core" Version="7.1.0" />
@@ -13,24 +13,24 @@
1313
<PackageVersion Include="FluentMigrator.Runner.SqlServer" Version="7.1.0" />
1414
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
1515
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
16-
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.5" />
17-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
18-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
21-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
16+
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.7" />
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.7" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.7" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
20+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
21+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2222
<PackageVersion Include="MySql.Data" Version="9.3.0" />
2323
<PackageVersion Include="MySql.Data.EntityFramework" Version="9.3.0" />
2424
<PackageVersion Include="MySql.EntityFrameworkCore" Version="9.0.3" />
2525
<PackageVersion Include="NUnit" Version="4.3.2" />
26-
<PackageVersion Include="NUnit.Analyzers" Version="4.7.0">
26+
<PackageVersion Include="NUnit.Analyzers" Version="4.9.2">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageVersion>
3030
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
3131
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
3232
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
33-
<PackageVersion Include="Testcontainers.MsSql" Version="4.4.0" />
34-
<PackageVersion Include="Testcontainers.MySql" Version="4.4.0" />
33+
<PackageVersion Include="Testcontainers.MsSql" Version="4.6.0" />
34+
<PackageVersion Include="Testcontainers.MySql" Version="4.6.0" />
3535
</ItemGroup>
3636
</Project>

‎src/code/DataJam.EntityFrameworkCore/DataJam.EntityFrameworkCore.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore"/>
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" />
99
</ItemGroup>
1010

1111
<!-- Override package versions when targeting net8.0 -->
1212
<!-- DO NOT UPDATE: These specific versions are required for net8.0 compatibility -->
1313
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
14-
<PackageReference Remove="Microsoft.EntityFrameworkCore"/>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" VersionOverride="[8.*,9.0)"/>
14+
<PackageReference Remove="Microsoft.EntityFrameworkCore" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" VersionOverride="[8.*,9.0)" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\DataJam\DataJam.csproj"/>
19+
<ProjectReference Include="..\DataJam\DataJam.csproj" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<None Remove="DataJam.EntityFrameworkCore.csproj.DotSettings"/>
23+
<None Remove="DataJam.EntityFrameworkCore.csproj.DotSettings" />
2424
</ItemGroup>
2525

2626
</Project>

‎src/code/Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
22
<Project>
33

4-
<Import Project="../Directory.Build.props"/>
4+
<Import Project="../Directory.Build.props" />
55

66
<PropertyGroup>
77
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -17,10 +17,10 @@
1717
<!-- Include Stylecop.json -->
1818
<ItemGroup>
1919
<!-- Removes the stylecop.json file included from the outer Directory.Build.props file-->
20-
<AdditionalFiles Remove="../../stylecop.json" Link="stylecop.json"/>
20+
<AdditionalFiles Remove="../../stylecop.json" Link="stylecop.json" />
2121

2222
<!-- Add the stylecop.json file that is specific to the code folder. -->
23-
<AdditionalFiles Include="../stylecop.json" Link="stylecop.json"/>
23+
<AdditionalFiles Include="../stylecop.json" Link="stylecop.json" />
2424
</ItemGroup>
2525

2626

‎src/test-support/DataJam.TestSupport.Dependencies.Sqlite/DataJam.TestSupport.Dependencies.Sqlite.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Data.Sqlite.Core"/>
8+
<PackageReference Include="Microsoft.Data.Sqlite.Core" />
99
</ItemGroup>
1010

1111
<!-- Override package versions when targeting net8.0 -->
1212
<!-- DO NOT UPDATE: These specific versions are required for net8.0 compatibility -->
1313
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
14-
<PackageReference Remove="Microsoft.Data.Sqlite.Core"/>
15-
<PackageReference Include="Microsoft.Data.Sqlite.Core" VersionOverride="[8.*,9.0)"/>
14+
<PackageReference Remove="Microsoft.Data.Sqlite.Core" />
15+
<PackageReference Include="Microsoft.Data.Sqlite.Core" VersionOverride="[8.*,9.0)" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="..\DataJam.TestSupport.Dependencies\DataJam.TestSupport.Dependencies.csproj"/>
19+
<ProjectReference Include="..\DataJam.TestSupport.Dependencies\DataJam.TestSupport.Dependencies.csproj" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/test-support/DataJam.TestSupport.Migrations.Sqlite/Deployers/SqliteDatabaseDeployer.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,17 @@ private static ServiceProvider BuildServiceProvider(string connectionString, Ass
3131

3232
// Add common FluentMigrator services
3333
.AddFluentMigratorCore()
34-
.ConfigureRunner(
35-
rb => rb
34+
.ConfigureRunner(rb => rb
3635

37-
// Add SQLite support to FluentMigrator
38-
.AddSQLite()
36+
// Add SQLite support to FluentMigrator
37+
.AddSQLite()
3938

40-
// Set the connection string
41-
.WithGlobalConnectionString(connectionString)
39+
// Set the connection string
40+
.WithGlobalConnectionString(connectionString)
4241

43-
// Define the assembly containing the migrations
44-
.ScanIn(migrationAssembly)
45-
.For.Migrations())
42+
// Define the assembly containing the migrations
43+
.ScanIn(migrationAssembly)
44+
.For.Migrations())
4645

4746
// Enable logging to console in the FluentMigrator way
4847
.AddLogging(lb => lb.AddFluentMigratorConsole())

‎src/test-support/DataJam.TestSupport.Migrations/Deployers/MsSqlDatabaseDeployer.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,17 @@ private static ServiceProvider BuildServiceProvider(string connectionString, Ass
3535

3636
// Add common FluentMigrator services
3737
.AddFluentMigratorCore()
38-
.ConfigureRunner(
39-
rb => rb
38+
.ConfigureRunner(rb => rb
4039

41-
// Add SQL Server support to FluentMigrator
42-
.AddSqlServer()
40+
// Add SQL Server support to FluentMigrator
41+
.AddSqlServer()
4342

44-
// Set the connection string
45-
.WithGlobalConnectionString(connectionString)
43+
// Set the connection string
44+
.WithGlobalConnectionString(connectionString)
4645

47-
// Define the assembly containing the migrations
48-
.ScanIn(migrationAssembly)
49-
.For.Migrations())
46+
// Define the assembly containing the migrations
47+
.ScanIn(migrationAssembly)
48+
.For.Migrations())
5049

5150
// Enable logging to console in the FluentMigrator way
5251
.AddLogging(lb => lb.AddFluentMigratorConsole())

‎src/test-support/DataJam.TestSupport.Migrations/Deployers/MySqlDatabaseDeployer.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,17 @@ private static ServiceProvider BuildServiceProvider(string connectionString, Ass
3535

3636
// Add common FluentMigrator services
3737
.AddFluentMigratorCore()
38-
.ConfigureRunner(
39-
rb => rb
38+
.ConfigureRunner(rb => rb
4039

41-
// Add MySql support to FluentMigrator
42-
.AddMySql5()
40+
// Add MySql support to FluentMigrator
41+
.AddMySql5()
4342

44-
// Set the connection string
45-
.WithGlobalConnectionString(connectionString)
43+
// Set the connection string
44+
.WithGlobalConnectionString(connectionString)
4645

47-
// Define the assembly containing the migrations
48-
.ScanIn(migrationAssembly)
49-
.For.Migrations())
46+
// Define the assembly containing the migrations
47+
.ScanIn(migrationAssembly)
48+
.For.Migrations())
5049
.AddLogging(lb => lb.AddFluentMigratorConsole())
5150
.BuildServiceProvider(false);
5251
}

‎src/test-support/DataJam.TestSupport.TestPatterns/Family/WhenPersistingAndRetrievingAChild.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55

6-
using EntityFrameworkCore;
6+
using AwesomeAssertions;
77

8-
using FluentAssertions;
8+
using EntityFrameworkCore;
99

1010
using NUnit.Framework;
1111

0 commit comments

Comments
 (0)