File tree 13 files changed +50
-50
lines changed
ConflictHandling-FirstWins
ConflictHandling-LastWins
13 files changed +50
-50
lines changed Original file line number Diff line number Diff line change 1
- <Project Sdk =" Microsoft.NET.Sdk" >
1
+ <Project Sdk =" Microsoft.NET.Sdk" >
2
2
3
3
<PropertyGroup >
4
4
<TargetFramework >net8.0</TargetFramework >
7
7
</PropertyGroup >
8
8
9
9
<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 " />
12
12
</ItemGroup >
13
13
14
14
Original file line number Diff line number Diff line change 12
12
</PropertyGroup>-->
13
13
14
14
<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 " >
17
17
<PrivateAssets >all</PrivateAssets >
18
18
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
19
19
</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 " />
22
22
</ItemGroup >
23
23
24
24
<ItemGroup >
Original file line number Diff line number Diff line change 12
12
</PropertyGroup>-->
13
13
14
14
<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 " >
17
17
<PrivateAssets >all</PrivateAssets >
18
18
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
19
19
</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 " />
22
22
</ItemGroup >
23
23
24
24
<ItemGroup >
Original file line number Diff line number Diff line change 9
9
</PropertyGroup >
10
10
11
11
<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 " >
15
15
<PrivateAssets >all</PrivateAssets >
16
16
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
17
17
</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 " />
20
20
</ItemGroup >
21
21
22
22
<ItemGroup >
Original file line number Diff line number Diff line change 12
12
</PropertyGroup>-->
13
13
14
14
<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 " >
17
17
<PrivateAssets >all</PrivateAssets >
18
18
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
19
19
</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 " />
22
22
</ItemGroup >
23
23
24
24
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<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 " >
13
13
<PrivateAssets >all</PrivateAssets >
14
14
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
15
15
</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 " />
19
19
</ItemGroup >
20
20
21
21
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<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 " >
13
13
<PrivateAssets >all</PrivateAssets >
14
14
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
15
15
</PackageReference >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<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 " >
13
13
<PrivateAssets >all</PrivateAssets >
14
14
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
15
15
</PackageReference >
16
- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.0 " />
17
- <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.0 " />
16
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.15 " />
17
+ <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.1 " />
18
18
</ItemGroup >
19
19
20
20
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<ItemGroup >
11
- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 8.0.0 " />
12
- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.0 " />
13
- <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.0 " />
11
+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 8.0.15 " />
12
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.15 " />
13
+ <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.1 " />
14
14
</ItemGroup >
15
15
16
16
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<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 " >
13
13
<PrivateAssets >all</PrivateAssets >
14
14
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
15
15
</PackageReference >
16
- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.0 " />
17
- <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.0 " />
16
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.15 " />
17
+ <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.1 " />
18
18
</ItemGroup >
19
19
20
20
<ItemGroup >
Original file line number Diff line number Diff line change 1
- <Project Sdk =" Microsoft.NET.Sdk" >
1
+ <Project Sdk =" Microsoft.NET.Sdk" >
2
2
3
3
<PropertyGroup >
4
4
<OutputType >Exe</OutputType >
5
- <TargetFramework >net7 .0</TargetFramework >
5
+ <TargetFramework >net8 .0</TargetFramework >
6
6
<Nullable >enable</Nullable >
7
7
<ImplicitUsings >enable</ImplicitUsings >
8
8
</PropertyGroup >
9
9
10
10
<ItemGroup >
11
- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 7 .0.13 " >
11
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 8 .0.15 " >
12
12
<PrivateAssets >all</PrivateAssets >
13
13
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
14
14
</PackageReference >
15
- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 7 .0.13 " />
15
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8 .0.15 " />
16
16
</ItemGroup >
17
17
18
18
</Project >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<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 " >
13
13
<PrivateAssets >all</PrivateAssets >
14
14
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
15
15
</PackageReference >
16
- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.0 " />
17
- <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.0 " />
16
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.15 " />
17
+ <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.1 " />
18
18
</ItemGroup >
19
19
20
20
<ItemGroup >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<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 " >
13
13
<PrivateAssets >all</PrivateAssets >
14
14
<IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
15
15
</PackageReference >
16
- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.0 " />
17
- <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.0 " />
16
+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 8.0.15 " />
17
+ <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 8.0.1 " />
18
18
</ItemGroup >
19
19
20
20
<ItemGroup >
You can’t perform that action at this time.
0 commit comments