File tree Expand file tree Collapse file tree 13 files changed +35
-35
lines changed
ConflictHandling-FirstWins
ConflictHandling-LastWins Expand file tree Collapse file tree 13 files changed +35
-35
lines changed Original file line number Diff line number Diff line change 77 </PropertyGroup >
88
99 <ItemGroup >
10- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
11- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
10+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
11+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
1212 </ItemGroup >
1313
1414
Original file line number Diff line number Diff line change 1212 </PropertyGroup>-->
1313
1414 <ItemGroup >
15- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
16- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
15+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
16+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1717 <PrivateAssets >all</PrivateAssets >
1818 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1919 </PackageReference >
20- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
20+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
2121 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
2222 </ItemGroup >
2323
Original file line number Diff line number Diff line change 1212 </PropertyGroup>-->
1313
1414 <ItemGroup >
15- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
16- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
15+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
16+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1717 <PrivateAssets >all</PrivateAssets >
1818 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1919 </PackageReference >
20- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
20+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
2121 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
2222 </ItemGroup >
2323
Original file line number Diff line number Diff line change 99 </PropertyGroup >
1010
1111 <ItemGroup >
12- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
13- <PackageReference Include =" Microsoft.EntityFrameworkCore.Cosmos" Version =" 6.0.3 " />
14- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
12+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
13+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Cosmos" Version =" 6.0.8 " />
14+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1515 <PrivateAssets >all</PrivateAssets >
1616 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1717 </PackageReference >
Original file line number Diff line number Diff line change 1212 </PropertyGroup>-->
1313
1414 <ItemGroup >
15- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
16- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
15+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
16+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1717 <PrivateAssets >all</PrivateAssets >
1818 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1919 </PackageReference >
20- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
20+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
2121 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
2222 </ItemGroup >
2323
Original file line number Diff line number Diff line change 88 </PropertyGroup >
99
1010 <ItemGroup >
11- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
12- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
11+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
12+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1313 <PrivateAssets >all</PrivateAssets >
1414 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1515 </PackageReference >
16- <PackageReference Include =" Microsoft.EntityFrameworkCore.Proxies" Version =" 6.0.3 " />
17- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
16+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Proxies" Version =" 6.0.8 " />
17+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
1818 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
1919 </ItemGroup >
2020
Original file line number Diff line number Diff line change 99
1010 <ItemGroup >
1111 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
12- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
12+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1313 <PrivateAssets >all</PrivateAssets >
1414 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1515 </PackageReference >
Original file line number Diff line number Diff line change 88 </PropertyGroup >
99
1010 <ItemGroup >
11- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
12- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
11+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
12+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1313 <PrivateAssets >all</PrivateAssets >
1414 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1515 </PackageReference >
16- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
16+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
1717 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
1818 </ItemGroup >
1919
Original file line number Diff line number Diff line change 88 </PropertyGroup >
99
1010 <ItemGroup >
11- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
12- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
11+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
12+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
1313 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
1414 </ItemGroup >
1515
Original file line number Diff line number Diff line change 1212 </PropertyGroup>-->
1313
1414 <ItemGroup >
15- <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.3 " />
16- <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.3 " >
15+ <PackageReference Include =" Microsoft.EntityFrameworkCore" Version =" 6.0.8 " />
16+ <PackageReference Include =" Microsoft.EntityFrameworkCore.Design" Version =" 6.0.8 " >
1717 <PrivateAssets >all</PrivateAssets >
1818 <IncludeAssets >runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets >
1919 </PackageReference >
20- <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.3 " />
20+ <PackageReference Include =" Microsoft.EntityFrameworkCore.SqlServer" Version =" 6.0.8 " />
2121 <PackageReference Include =" Microsoft.Extensions.Hosting" Version =" 6.0.1" />
2222 </ItemGroup >
2323
You can’t perform that action at this time.
0 commit comments