Skip to content

Commit 9e75504

Browse files
author
igorsych
committed
Newtonsoft.Json and MediatR with fixes of all based on MediatR classes
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
1 parent 85b61a2 commit 9e75504

28 files changed

Lines changed: 40 additions & 84 deletions

File tree

src/BuildingBlocks/EventBus/EventBus/EventBus.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
65
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBus</RootNamespace>
76
</PropertyGroup>
87

@@ -11,7 +10,7 @@
1110
</ItemGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
13+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
1514
</ItemGroup>
1615

1716
</Project>

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj

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

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
65
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ</RootNamespace>
76
</PropertyGroup>
87

98
<ItemGroup>
109
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
11-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
12-
<PackageReference Include="Polly" Version="5.0.6" />
10+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
11+
<PackageReference Include="Polly" Version="5.1.0" />
1312
<PackageReference Include="RabbitMQ.Client" Version="4.1.3" />
1413
<PackageReference Include="System.ValueTuple" Version="4.3.1" />
1514
</ItemGroup>

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
65
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF</RootNamespace>
76
</PropertyGroup>
87

@@ -13,7 +12,7 @@
1312
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
1413
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
1514
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />
16-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
15+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
1716
</ItemGroup>
1817

1918
<ItemGroup>

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
13-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
13+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
1414
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
1515
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
1616
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />

src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj

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

88
<ItemGroup>
99
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
10-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
11-
<PackageReference Include="Polly" Version="5.0.6" />
10+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
11+
<PackageReference Include="Polly" Version="5.1.0" />
1212
</ItemGroup>
1313

1414
</Project>

src/Services/Basket/Basket.API/Basket.API.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<DebugType>portable</DebugType>
6-
<PreserveCompilationContext>true</PreserveCompilationContext>
7-
<AssemblyName>Basket.API</AssemblyName>
85
<OutputType>Exe</OutputType>
9-
<PackageId>Basket.API</PackageId>
10-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
116
<PackageTargetFallback>$(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8</PackageTargetFallback>
127
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
138
</PropertyGroup>
@@ -35,7 +30,7 @@
3530
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
3631
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
3732
<PackageReference Include="StackExchange.Redis" Version="1.2.3" />
38-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
33+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
3934
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.2.0" />
4035
</ItemGroup>
4136

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<DebugType>portable</DebugType>
6-
<PreserveCompilationContext>true</PreserveCompilationContext>
7-
<AssemblyName>Catalog.API</AssemblyName>
85
<OutputType>Exe</OutputType>
9-
<PackageId>Catalog.API</PackageId>
106
<UserSecretsId>aspnet-Catalog.API-20161122013618</UserSecretsId>
11-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
127
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
138
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
149
</PropertyGroup>
@@ -47,7 +42,7 @@
4742
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.2" />
4843
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
4944
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
50-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
45+
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
5146
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
5247
</ItemGroup>
5348

src/Services/Identity/Identity.API/Identity.API.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<DebugType>portable</DebugType>
6-
<PreserveCompilationContext>true</PreserveCompilationContext>
7-
<AssemblyName>Identity.API</AssemblyName>
85
<OutputType>Exe</OutputType>
9-
<PackageId>Identity.API</PackageId>
106
<UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId>
11-
<RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion>
127
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
138
<DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
149
</PropertyGroup>

src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands
1717

1818
[DataContract]
1919
public class CreateOrderCommand
20-
:IAsyncRequest<bool>
20+
: IRequest<bool>
2121
{
2222
[DataMember]
2323
private readonly List<OrderItemDTO> _orderItems;

src/Services/Ordering/Ordering.API/Application/Commands/IdentifiedCommand.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
using MediatR;
22
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Threading.Tasks;
63

74
namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands
85
{
9-
public class IdentifiedCommand<T, R> : IAsyncRequest<R>
10-
where T : IAsyncRequest<R>
6+
public class IdentifiedCommand<T, R> : IRequest<R>
7+
where T : IRequest<R>
118
{
129
public T Command { get; }
1310
public Guid Id { get; }

0 commit comments

Comments
 (0)