Skip to content

Commit d1b6bc8

Browse files
unaizorrillaunaizorrilla
committed
Migrated projects and references to use 2.1 rc1 libraries
1 parent 1d2fc6c commit d1b6bc8

38 files changed

Lines changed: 170 additions & 210 deletions

File tree

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"sdk": {
3-
"version": "2.1.4"
4-
}
5-
}
1+
// {
2+
// "sdk": {
3+
// "version": "2.1.4"
4+
// }
5+
// }

‎src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Folder Include="wwwroot\" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
12+
<PackageReference Include="Microsoft.AspNetCore.App" />
1313
<PackageReference Include="Ocelot" Version="3.0.0" />
1414
</ItemGroup>
15-
1615
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
66
<RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
77
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -12,14 +12,10 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
15+
<PackageReference Include="Microsoft.AspNetCore.App" />
1616
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
1717
</ItemGroup>
1818

19-
<ItemGroup>
20-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
21-
</ItemGroup>
22-
2319
<ItemGroup>
2420
<ProjectReference Include="..\..\..\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj" />
2521
</ItemGroup>

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
129129
app.UseSwagger().UseSwaggerUI(c =>
130130
{
131131
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Purchase BFF V1");
132-
c.ConfigureOAuth2("Microsoft.eShopOnContainers.Web.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");
132+
//c.ConfigureOAuth2("Microsoft.eShopOnContainers.Web.Shopping.HttpAggregatorwaggerui", "", "", "Purchase BFF Swagger UI");
133133
});
134134

135135

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

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<AssemblyName>Web.Shopping.HttpAggregator</AssemblyName>
66
<RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace>
77
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -12,12 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
16-
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
15+
<PackageReference Include="Microsoft.AspNetCore.App" version="2.1.0-rc1-final" />
16+
<PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
17+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" />
2118
</ItemGroup>
2219

2320
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
9+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1010
</ItemGroup>
1111

1212
</Project>

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

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

88
<ItemGroup>
99
<PackageReference Include="Autofac" Version="4.6.2" />
10-
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
12-
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
13-
<PackageReference Include="Polly" Version="5.8.0" />
10+
<PackageReference Include="Microsoft.CSharp" Version="4.5.0-rc1" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0-rc1-final" />
12+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
13+
<PackageReference Include="Polly" Version="6.0.1" />
1414
<PackageReference Include="RabbitMQ.Client" Version="5.0.1" />
15-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
15+
<PackageReference Include="System.ValueTuple" Version="4.5.0-rc1" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

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

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

88
<ItemGroup>
99
<PackageReference Include="Autofac" Version="4.6.2" />
10-
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="2.0.0" />
11-
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
10+
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
11+
<PackageReference Include="Microsoft.CSharp" Version="4.5.0-rc1" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0-rc1-final" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" />
14-
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
15-
</ItemGroup>
16-
17-
<ItemGroup>
18-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
19-
</ItemGroup>
20-
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0-rc1-final" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0-rc1-final" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0-rc1-final" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0-rc1-final" />
13+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
14+
</ItemGroup>
2115
<ItemGroup>
2216
<ProjectReference Include="..\EventBus\EventBus.csproj" />
2317
</ItemGroup>

‎src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.1" />
16+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0-rc1-final" />
1717
</ItemGroup>
1818

1919
</Project>

0 commit comments

Comments
 (0)