Skip to content

Commit c90f442

Browse files
ramon-tomas-cramon-tomas-c
authored
Merge branch 'dev' into latest3rdpartydep
2 parents abb9bcf + 3e8df7f commit c90f442

15 files changed

Lines changed: 11 additions & 16 deletions

File tree

‎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.0.2"
3+
"version":"2.1.2"
44
}
55
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
1717
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
1818
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
19-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
19+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
2020
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
2121
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
2222
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
3939
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
4040
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
41-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
41+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
4242
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
4343
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
4444
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />

‎src/Services/Identity/Identity.API/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ COPY eShopOnContainers-ServicesAndWebApps.sln ./
88
COPY src/Services/Identity/Identity.API/Identity.API.csproj src/Services/Identity/Identity.API/
99
COPY src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/
1010
COPY src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/
11-
COPY src/BuildingBlocks/DataProtection/DataProtection/DataProtection.csproj src/BuildingBlocks/DataProtection/DataProtection/
1211
COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj src/BuildingBlocks/WebHostCustomization/WebHost.Customization/
1312
COPY src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/
1413
RUN dotnet restore

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
2020
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
2121
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
22-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
22+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
2323
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
2424
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.0.0" />
2525
<PackageReference Include="IdentityServer4.EntityFramework" Version="2.1.0" />

‎src/Services/Location/Locations.API/Locations.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
1212
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
1313
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
14-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
14+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
1515
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
1616
<PackageReference Include="mongocsharpdriver" Version="2.4.4" />
1717
<PackageReference Include="MongoDB.Bson" Version="2.4.4" />

‎src/Services/Marketing/Marketing.API/Marketing.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
2525
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
2626
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
27-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
27+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
2828
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
2929
<PackageReference Include="mongocsharpdriver" Version="2.4.4" />
3030
<PackageReference Include="MongoDB.Bson" Version="2.4.4" />

‎src/Services/Ordering/Ordering.API/Ordering.API.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
3737
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
3838
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
39-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
39+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
4040
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
4141
<PackageReference Include="MediatR" Version="3.0.1" />
4242
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />

‎src/Services/Payment/Payment.API/Payment.API.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
1212
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.4.1" />
1313
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta1" />
14-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.0-beta1" />
14+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.0.1-beta1" />
1515
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
16-
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
1716
</ItemGroup>
1817
<ItemGroup>
1918
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />

‎src/Services/Payment/Payment.API/Startup.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using RabbitMQ.Client;
1717
using System;
1818
using System.Threading.Tasks;
19-
using Swashbuckle.AspNetCore.Swagger;
2019
using Microsoft.ApplicationInsights.Extensibility;
2120
using Microsoft.ApplicationInsights.ServiceFabric;
2221

0 commit comments

Comments
 (0)