Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 5c143f8

Browse files
committed
Merge branch 'dotnet3-migration/dev-pre-merge' into dev
2 parents f8084f5 + 9bbb37a commit 5c143f8

File tree

31 files changed

+82
-82
lines changed

31 files changed

+82
-82
lines changed

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.2" />
1615
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.4" />
16+
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.2" />
1717
<PackageReference Include="Microsoft.AspNetCore.App" />
1818
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
1919
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.2.0" />
20+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
2021
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
2122
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
2223
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.2" />
1615
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.4" />
16+
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.2" />
1717
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
1818
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
19+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
1920
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
2021
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
2122
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
9-
<PackageReference Include="xunit" Version="2.3.0" />
109
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
10+
<PackageReference Include="xunit" Version="2.3.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.2" />
109
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.2" />
1110
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.2" />
1211
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.2" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.2" />
1313
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1414
</ItemGroup>
15+
1516
<ItemGroup>
1617
<ProjectReference Include="..\EventBus\EventBus.csproj" />
1718
</ItemGroup>

src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Polly" Version="6.0.1" />
98
<PackageReference Include="Microsoft.AspNetCore.App" />
9+
<PackageReference Include="Polly" Version="6.0.1" />
1010
</ItemGroup>
1111

1212
</Project>

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Acr.UserDialogs" Version="7.0.4" />
14-
<PackageReference Include="SlideOverKit" Version="2.1.6.2" />
14+
<PackageReference Include="IdentityModel" Version="3.0.0" />
1515
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1616
<PackageReference Include="PCLCrypto" Version="2.0.147" />
17-
<PackageReference Include="Xamarin.Forms" Version="4.1.0.673156" />
18-
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.3.4" />
19-
<PackageReference Include="IdentityModel" Version="3.0.0" />
17+
<PackageReference Include="SlideOverKit" Version="2.1.6.2" />
2018
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
19+
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.3.4" />
20+
<PackageReference Include="Xamarin.Forms" Version="4.1.0.673156" />
2121
</ItemGroup>
22+
2223
<ItemGroup>
2324
<Folder Include="Services\Permissions\" />
2425
<Folder Include="Models\Permissions\" />

src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<PackageReference Include="Xamarin.Forms" Version="4.1.0.673156" />
1414
<PackageReference Include="xunit" Version="2.4.1" />
1515
</ItemGroup>
16+
1617
<ItemGroup>
1718
<ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj" />
1819
</ItemGroup>

src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
2021
<PackageReference Include="Microsoft.AspNetCore.App" />
2122
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
2323
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
24-
<PackageReference Include="xunit" Version="2.4.1" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
25+
<PackageReference Include="Moq" Version="4.10.1" />
2526
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
2627
<PrivateAssets>all</PrivateAssets>
2728
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2829
</PackageReference>
29-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
30-
<PackageReference Include="Moq" Version="4.10.1" />
30+
<PackageReference Include="xunit" Version="2.4.1" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
11+
<PackageReference Include="MediatR" Version="5.1.0" />
1012
<PackageReference Include="Microsoft.AspNetCore.App" />
1113
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
1214
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
15+
<PackageReference Include="Moq" Version="4.10.1" />
1416
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1517
<PrivateAssets>all</PrivateAssets>
1618
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1719
</PackageReference>
18-
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
19-
<PackageReference Include="MediatR" Version="5.1.0" />
20-
<PackageReference Include="Moq" Version="4.10.1" />
20+
<PackageReference Include="xunit" Version="2.4.1" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

src/Services/Catalog/Catalog.API/Catalog.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
5353
<PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
5454
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
55-
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
5655
<PackageReference Include="Serilog.Sinks.Http" Version="4.2.1" />
56+
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
5757
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
5858
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
5959
</ItemGroup>

0 commit comments

Comments
 (0)