Skip to content

Commit 4e37f0d

Browse files
Unai Zorrilla CastroUnai Zorrilla Castro
Unai Zorrilla Castro
authored and
Unai Zorrilla Castro
committed
Migrate Building Blocks to .NETStandard2.0 and .NETCoreApp2.0. Fix packages references. Update Basket.API to new templates on .NETCoreApp2.0
1 parent 789d7e4 commit 4e37f0d

30 files changed

Lines changed: 109 additions & 171 deletions

File tree

‎src/BuildingBlocks/DataProtection/DataProtection/DataProtection.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.5</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks</RootNamespace>
6-
<!--
7-
<NetStandardImplicitPackageVersion>2.0.0-preview1-25301-01</NetStandardImplicitPackageVersion>
8-
-->
96
</PropertyGroup>
107

118
<ItemGroup>
129
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="1.1.2" />
13-
<!--
14-
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.0.0-preview2-final" />
15-
-->
16-
<PackageReference Include="StackExchange.Redis" Version="1.2.3" />
10+
<PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.4" />
1711
</ItemGroup>
18-
12+
1913
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.5</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
99
<PackageReference Include="xunit" Version="2.2.0" />
1010
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1111
</ItemGroup>

‎src/BuildingBlocks/EventBus/EventBus/EventBus.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.5</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBus</RootNamespace>
66
</PropertyGroup>
77

‎src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
using RabbitMQ.Client.Events;
1212
using RabbitMQ.Client.Exceptions;
1313
using System;
14-
using System.Collections.Generic;
15-
using System.Linq;
1614
using System.Net.Sockets;
17-
using System.Reflection;
1815
using System.Text;
1916
using System.Threading.Tasks;
2017

@@ -184,7 +181,7 @@ private IModel CreateConsumerChannel()
184181
};
185182

186183
channel.BasicConsume(queue: _queueName,
187-
noAck: true,
184+
autoAck: false,
188185
consumer: consumer);
189186

190187
channel.CallbackException += (sender, ea) =>

‎src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.5</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Autofac" Version="4.5.0" />
10-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
9+
<PackageReference Include="Autofac" Version="4.6.1" />
10+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
1111
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
12-
<PackageReference Include="Polly" Version="5.2.0" />
13-
<PackageReference Include="RabbitMQ.Client" Version="4.1.3" />
14-
<PackageReference Include="System.ValueTuple" Version="4.3.1" />
12+
<PackageReference Include="Polly" Version="5.3.1" />
13+
<PackageReference Include="RabbitMQ.Client" Version="5.0.1" />
14+
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/BuildingBlocks/EventBus/EventBusServiceBus/DefaultServiceBusPersisterConnection.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Microsoft.Azure.ServiceBus;
22
using Microsoft.Extensions.Logging;
33
using System;
4-
using System.IO;
54

65
namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus
76
{

‎src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Newtonsoft.Json;
1010
using Newtonsoft.Json.Linq;
1111
using System;
12-
using System.Reflection;
1312
using System.Text;
1413
using System.Threading.Tasks;
1514

‎src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Autofac" Version="4.5.0" />
9+
<PackageReference Include="Autofac" Version="4.6.1" />
1010
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="1.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/BuildingBlocks/EventBus/EventBusServiceBus/IServiceBusPersisterConnection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus
22
{
3-
using System;
43
using Microsoft.Azure.ServiceBus;
4+
using System;
55

66
public interface IServiceBusPersisterConnection : IDisposable
77
{

‎src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0-preview2-final" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0-preview2-final" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0-preview2-final" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0-preview2-final" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="2.0.0-preview1-final" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0-preview2-final" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
1514
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1615
</ItemGroup>
1716

1817
<ItemGroup>
19-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0-preview2-final" />
18+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
2019
</ItemGroup>
2120

2221
<ItemGroup>

0 commit comments

Comments
 (0)