Skip to content

Commit 72bb595

Browse files
christiannagelchristiannagel
authored
Merge pull request #241 from ProfessionalCSharp/dotnet8
ef core - bump backages .net 8
2 parents e930e96 + 238d09b commit 72bb595

File tree

16 files changed

+66
-79
lines changed

16 files changed

+66
-79
lines changed

‎2_Libs/EFCore/BooksLib/BooksLib.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" />
1212
</ItemGroup>
1313

1414

‎2_Libs/EFCore/ConflictHandling-FirstWins/ConflictHandling-FirstWins.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</PropertyGroup>-->
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎2_Libs/EFCore/ConflictHandling-LastWins/ConflictHandling-LastWins.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</PropertyGroup>-->
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎2_Libs/EFCore/Cosmos/Cosmos.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.15" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
19+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎2_Libs/EFCore/Cosmos/MenusContext.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
using Microsoft.EntityFrameworkCore;
22
using Microsoft.Extensions.Options;
33

4-
internal class MenusContext : DbContext
4+
internal class MenusContext(DbContextOptions<MenusContext> options, IOptions<RestaurantConfiguration> restaurantOptions) : DbContext(options)
55
{
6-
private readonly string _restaurantId;
7-
8-
public MenusContext(DbContextOptions<MenusContext> options, IOptions<RestaurantConfiguration> restaurantOptions)
9-
: base(options)
10-
{
11-
_restaurantId = restaurantOptions.Value.RestaurantId ?? throw new System.Exception("restaurantid required");
12-
}
6+
private readonly string _restaurantId = restaurantOptions.Value.RestaurantId ?? throw new System.Exception("restaurantid required");
137

148
public DbSet<MenuCard> MenuCards => Set<MenuCard>();
159

‎2_Libs/EFCore/Cosmos/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
await runner.CreateDatabaseAsync();
2424

2525
await runner.AddMenuCardAsync();
26-
await runner.AddAddtionalCardsAsync();
26+
await runner.AddAdditionalCardsAsync();
2727
await runner.ShowCardsAsync();
2828
await runner.DeleteDatabaseAsync();

‎2_Libs/EFCore/Cosmos/Runner.cs‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,22 @@ internal class RestaurantConfiguration
66
public string? RestaurantId { get; set; }
77
}
88

9-
internal class Runner
9+
internal class Runner(MenusContext menusContext, IOptions<RestaurantConfiguration> options)
1010
{
11-
private readonly string _restaurantId;
12-
private readonly MenusContext _menusContext;
13-
14-
public Runner(MenusContext menusContext, IOptions<RestaurantConfiguration> options)
15-
{
16-
_menusContext = menusContext;
17-
_restaurantId = options.Value.RestaurantId ?? throw new ArgumentException("restaurant-id required");
18-
}
11+
private readonly string _restaurantId = options.Value.RestaurantId ?? throw new ArgumentException("restaurant-id required");
1912

2013
public async Task CreateDatabaseAsync()
2114
{
22-
await _menusContext.Database.EnsureCreatedAsync();
15+
await menusContext.Database.EnsureCreatedAsync();
2316
}
2417

2518
public async Task AddMenuCardAsync()
2619
{
2720
Console.WriteLine(nameof(AddMenuCardAsync));
2821
MenuCard soupCard = new("Soups", _restaurantId);
2922

30-
MenuItem[] soups = new MenuItem[]
31-
{
23+
MenuItem[] soups =
24+
[
3225
new("Consommé Célestine (with shredded pancake)")
3326
{
3427
Price = 4.8m
@@ -41,33 +34,33 @@ public async Task AddMenuCardAsync()
4134
{
4235
Price = 4.8m
4336
}
44-
};
37+
];
4538

4639
foreach (var soup in soups)
4740
{
4841
soupCard.MenuItems.Add(soup);
4942
}
5043

51-
_menusContext.MenuCards.Add(soupCard);
44+
menusContext.MenuCards.Add(soupCard);
5245

53-
int records = await _menusContext.SaveChangesAsync();
46+
int records = await menusContext.SaveChangesAsync();
5447
Console.WriteLine($"{records} added");
5548
Console.WriteLine();
5649
}
5750

58-
public async Task AddAddtionalCardsAsync()
51+
public async Task AddAdditionalCardsAsync()
5952
{
6053
Random random = new();
6154
var menus = Enumerable.Range(1, 10).Select(i => new MenuItem($"menu {i}") { Price = random.Next(8) }).ToList();
6255
var cards = Enumerable.Range(1, 5).Select(i => new MenuCard($"card {i}", _restaurantId) { MenuItems = menus });
6356

64-
await _menusContext.MenuCards.AddRangeAsync(cards);
65-
await _menusContext.SaveChangesAsync();
57+
await menusContext.MenuCards.AddRangeAsync(cards);
58+
await menusContext.SaveChangesAsync();
6659
}
6760

6861
public async Task ShowCardsAsync()
6962
{
70-
var cards = await _menusContext.MenuCards
63+
var cards = await menusContext.MenuCards
7164
.Where(c => c.IsActive)
7265
.Where(c => c.Title == "Soups")
7366
.WithPartitionKey(_restaurantId)
@@ -88,7 +81,7 @@ public async Task DeleteDatabaseAsync()
8881
string? input = Console.ReadLine();
8982
if (input?.ToLower() == "y")
9083
{
91-
bool deleted = await _menusContext.Database.EnsureDeletedAsync();
84+
bool deleted = await menusContext.Database.EnsureDeletedAsync();
9285
string deletionInfo = deleted ? "deleted" : "not deleted";
9386
Console.WriteLine($"database {deletionInfo}");
9487
}

‎2_Libs/EFCore/Intro/Intro.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</PropertyGroup>-->
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎2_Libs/EFCore/LoadingRelatedData/LoadingRelatedData.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
11+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.15" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.15" />
18+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎2_Libs/EFCore/MigrationApp/MigrationApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

0 commit comments

Comments
 (0)