Skip to content

Commit e30fd3f

Browse files
ramon-tomas-cramon-tomas-c
authored
Merge pull request dotnet-architecture#850 from erikpique/feature/net22preview3
Feature/net22preview3
2 parents 7b10b57 + 6aaa718 commit e30fd3f

49 files changed

Lines changed: 115 additions & 116 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.401"
3+
"version": "2.2.100"
44
}
55
}

‎src/ApiGateways/ApiGw-Base/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
1+
FROM microsoft/dotnet:2.2.0-preview3-aspnetcore-runtime AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM microsoft/dotnet:2.1-sdk AS build
5+
FROM microsoft/dotnet:2.2.100-preview3-sdk AS build
66
WORKDIR /src
77
COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
88
RUN dotnet restore src/ApiGateways/ApiGw-Base/

‎src/ApiGateways/ApiGw-Base/OcelotApiGw.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.Web">
22

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

77
<ItemGroup>

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
1+
FROM microsoft/dotnet:2.2.0-preview3-aspnetcore-runtime AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM microsoft/dotnet:2.1-sdk AS build
5+
FROM microsoft/dotnet:2.2.100-preview3-sdk AS build
66
WORKDIR /src
77
COPY . .
88
WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator

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

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
66
<RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
77
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.AspNetCore.App" />
1616
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
17+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0-preview3-35497" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
1+
FROM microsoft/dotnet:2.2.0-preview3-aspnetcore-runtime AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM microsoft/dotnet:2.1-sdk AS build
5+
FROM microsoft/dotnet:2.2.100-preview3-sdk AS build
66
WORKDIR /src
77
COPY . .
88
WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator

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

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

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

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0-preview3-35497" />
1616
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
17+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0-preview3-35497" />
1818
</ItemGroup>
1919

2020
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="Autofac" Version="4.6.2" />
1010
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0-preview3-35497" />
1212
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1313
<PackageReference Include="Polly" Version="6.0.1" />
1414
<PackageReference Include="RabbitMQ.Client" Version="5.0.1" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="Autofac" Version="4.6.2" />
1010
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.0.0" />
1111
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0-preview3-35497" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

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

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

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0-preview3-35497" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0-preview3-35497" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.0-preview3-35497" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0-preview3-35497" />
1313
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1414
</ItemGroup>
1515
<ItemGroup>

0 commit comments

Comments
 (0)