Skip to content

Commit c6c8904

Browse files
PawelGerrPawelGerr
committed
Merge branch 'feature/dotnet-10'
2 parents 5a83c74 + fad3d95 commit c6c8904

File tree

26 files changed

+106
-589
lines changed

26 files changed

+106
-589
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ jobs:
1212

1313
steps:
1414

15-
- name: install .NET Core 8/9 SDKs
15+
- name: install .NET Core 10 SDKs
1616
uses: actions/setup-dotnet@v2
1717
with:
1818
include-prerelease: false
1919
dotnet-version: |
20-
8.0.x
21-
9.0.x
20+
10.0.x
2221
2322
- name: checkout repository
2423
uses: actions/checkout@v2

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
5-
<VersionPrefix>9.2.1</VersionPrefix>
5+
<VersionPrefix>10.0.0</VersionPrefix>
66
<Authors>Pawel Gerr</Authors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageProjectUrl>https://dev.azure.com/pawelgerr/Thinktecture.EntityFrameworkCore</PackageProjectUrl>
@@ -12,8 +12,8 @@
1212
<RepositoryUrl>https://[email protected]/pawelgerr/Thinktecture.EntityFrameworkCore/_git/Thinktecture.EntityFrameworkCore</RepositoryUrl>
1313
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1414
<RootNamespace>Thinktecture</RootNamespace>
15-
<TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
16-
<LangVersion>13.0</LangVersion>
15+
<TargetFrameworks>net10.0;</TargetFrameworks>
16+
<LangVersion>14.0</LangVersion>
1717
<Nullable>enable</Nullable>
1818
<NoWarn>$(NoWarn);CA1303;MSB3884;</NoWarn>
1919
<ImplicitUsings>enable</ImplicitUsings>

‎Directory.Packages.props‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
4-
<PackageVersion Include="AwesomeAssertions" Version="9.2.0" />
5-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.3" />
6-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9" />
7-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
8-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
9-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
10-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
11-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
12-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
13-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
14-
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.9" />
15-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
3+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
4+
<PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
5+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.2" />
6+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
7+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
8+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
9+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
10+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
11+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
12+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.0" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1616
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" PrivateAssets="all" />
1717
<PackageVersion Include="NSubstitute" Version="5.3.0" />
1818
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
1919
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.19" />
20-
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
21-
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
22-
<PackageVersion Include="Testcontainers.MsSql" Version="4.7.0" />
20+
<PackageVersion Include="Testcontainers.MsSql" Version="4.8.1" />
2321
<PackageVersion Include="Xunit.Extensions.AssemblyFixture" Version="2.6.0" />
2422
<PackageVersion Include="xunit" Version="2.9.3" />
2523
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />

‎azure-pipelines.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,13 @@ pool:
1616
steps:
1717

1818
- task: UseDotNet@2
19-
displayName: 'use .NET 8.0 SDK'
19+
displayName: 'use .NET 10.0 SDK'
2020
inputs:
2121
packageType: sdk
22-
version: 8.0.x
23-
includePreviewVersions: false
22+
version: 10.0.x
23+
includePreviewVersions: true
2424
installationPath: $(Agent.ToolsDirectory)/dotnet
25-
26-
- task: UseDotNet@2
27-
displayName: 'use .NET 9.0 SDK'
28-
inputs:
29-
packageType: sdk
30-
version: 9.0.x
31-
includePreviewVersions: false
32-
installationPath: $(Agent.ToolsDirectory)/dotnet
33-
25+
3426
- script: |
3527
echo dotnet --version
3628
dotnet --version
@@ -70,6 +62,12 @@ steps:
7062
inputs:
7163
artifactName: 'NugetPackages'
7264

65+
- script: |
66+
sudo apt-get update
67+
sudo apt-get install -y mono-complete
68+
displayName: 'install mono'
69+
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
70+
7371
- task: NuGetCommand@2
7472
displayName: 'push to nuget.org'
7573
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.0",
3+
"version": "10.0.0",
44
"rollForward": "latestMajor",
55
"allowPrerelease": false
66
}

‎samples/Directory.Build.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,4 @@
77

88
<Import Condition="exists('$(ParentPropsFile)') " Project="$(ParentPropsFile)"/>
99

10-
<PropertyGroup>
11-
<TargetFramework>net9.0</TargetFramework>
12-
</PropertyGroup>
13-
1410
</Project>

‎samples/Thinktecture.EntityFrameworkCore.Benchmarks/Database/SqlServerBenchmarkDbContext.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ public SqlServerBenchmarkDbContext(DbContextOptions<SqlServerBenchmarkDbContext>
77
{
88
}
99

10-
/// <inheritdoc />
11-
protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
12-
{
13-
configurationBuilder.Properties<decimal>(builder => builder
14-
.HavePrecision(18, 5));
15-
}
16-
1710
/// <inheritdoc />
1811
protected override void OnModelCreating(ModelBuilder modelBuilder)
1912
{

‎samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Database/DemoDbContext.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ public DemoDbContext(DbContextOptions<DemoDbContext> options, IDbDefaultSchema?
2121
Schema = schema?.Schema;
2222
}
2323

24-
/// <inheritdoc />
25-
protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
26-
{
27-
configurationBuilder.Properties<decimal>(builder => builder
28-
.HavePrecision(18, 5));
29-
}
30-
3124
/// <inheritdoc />
3225
protected override void OnModelCreating(ModelBuilder modelBuilder)
3326
{

‎samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Program.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ public static async Task Main(string[] args)
5656
await DoComplexCollectionParameterAsync(ctx, customerId);
5757
ctx.ChangeTracker.Clear();
5858

59-
// LEFT JOIN
60-
await DoLeftJoinAsync(ctx);
61-
ctx.ChangeTracker.Clear();
62-
6359
// ROWNUMBER
6460
await DoRowNumberAsync(ctx);
6561
ctx.ChangeTracker.Clear();
@@ -183,18 +179,6 @@ private static async Task DoRowNumberAsync(DemoDbContext ctx)
183179
Console.WriteLine($"Latest orders: {String.Join(", ", latestOrders.Select(o => $"{{ CustomerId={o.CustomerId}, OrderId={o.Id} }}"))}");
184180
}
185181

186-
private static async Task DoLeftJoinAsync(DemoDbContext ctx)
187-
{
188-
var customerOrder = await ctx.Customers
189-
.LeftJoin(ctx.Orders,
190-
c => c.Id,
191-
o => o.CustomerId,
192-
result => new { Customer = result.Left, Order = result.Right })
193-
.ToListAsync();
194-
195-
Console.WriteLine($"Found customers: {String.Join(", ", customerOrder.Select(co => $"{{ CustomerId={co.Customer.Id}, OrderId={co.Order?.Id} }}"))}");
196-
}
197-
198182
private static async Task DoBulkInsertAsync(DemoDbContext ctx)
199183
{
200184
var id = Guid.NewGuid();

‎samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Program.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ public static async Task Main(string[] args)
4646
await DoBulkInsertOrUpdateAsync(ctx, customerId);
4747
ctx.ChangeTracker.Clear();
4848

49-
// LEFT JOIN
50-
await DoLeftJoinAsync(ctx);
51-
ctx.ChangeTracker.Clear();
52-
5349
// ROWNUMBER
5450
await DoRowNumberAsync(ctx);
5551
ctx.ChangeTracker.Clear();
@@ -95,18 +91,6 @@ private static async Task DoRowNumberAsync(DemoDbContext ctx)
9591
Console.WriteLine($"Latest orders: {String.Join(", ", latestOrders.Select(o => $"{{ CustomerId={o.CustomerId}, OrderId={o.Id} }}"))}");
9692
}
9793

98-
private static async Task DoLeftJoinAsync(DemoDbContext ctx)
99-
{
100-
var customerOrder = await ctx.Customers
101-
.LeftJoin(ctx.Orders,
102-
c => c.Id,
103-
o => o.CustomerId,
104-
result => new { Customer = result.Left, Order = result.Right })
105-
.ToListAsync();
106-
107-
Console.WriteLine($"Found customers: {String.Join(", ", customerOrder.Select(co => $"{{ CustomerId={co.Customer.Id}, OrderId={co.Order?.Id} }}"))}");
108-
}
109-
11094
private static async Task BulkInsertIntoTempTableAsync(DemoDbContext ctx)
11195
{
11296
var customersToInsert = new Customer(Guid.NewGuid(), "First name", "Last name");

0 commit comments

Comments
 (0)