Skip to content

Commit 185a5dc

Browse files
Igor_SychevIgor_Sychev
Igor_Sychev
authored and
Igor_Sychev
committed
minor packages update
replace preview apis with production replace EnableKubernetes with AddApplicationInsightsKubernetesEnricher replace loggerFactory.AddAzureWebAppDiagnostics(); with loggerBuilder.AddAzureWebAppDiagnostics();
1 parent b2d7f8b commit 185a5dc

45 files changed

Lines changed: 170 additions & 141 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.0" />
12+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.2" />
1313
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.0" />
1414
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
1515
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />

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

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

1414
<ItemGroup>
1515
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.0" />
16-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.0" />
16+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.2" />
1717
<PackageReference Include="Microsoft.AspNetCore.App" />
1818
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
1919
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.2.0" />
2020
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
2121
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
2222
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0-preview3-35497" />
23+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
2424
</ItemGroup>
2525

2626
</Project>

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

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

1414
<ItemGroup>
1515
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.0" />
16-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.0" />
16+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.2" />
1717
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
1818
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
1919
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
2020
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
2121
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0-preview3-35497" />
22+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0" />
2323
</ItemGroup>
2424

2525
</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.2.0-preview3-35497" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
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.2.0-preview3-35497" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
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.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" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.2" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.2" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.2" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.2" />
1313
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1414
</ItemGroup>
1515
<ItemGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.0" />
16+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.2" />
1717
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="2.2.0" />
1818
<PackageReference Include="AspNetCore.HealthChecks.AzureServiceBus" Version="2.2.0" />
1919
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="2.2.0" />
2020
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
2121
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
22-
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
23-
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
22+
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.2" />
23+
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.2.2" />
2424
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.2.0" />
2626
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
2727
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" />
2828
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.2.0" />
2929
<PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
30+
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.2.0" />
3131
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
3232
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3333
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />

‎src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ public void Apply(Operation operation, OperationFilterContext context)
1919
operation.Responses.Add("401", new Response { Description = "Unauthorized" });
2020
operation.Responses.Add("403", new Response { Description = "Forbidden" });
2121

22-
operation.Security = new List<IDictionary<string, IEnumerable<string>>>();
23-
operation.Security.Add(new Dictionary<string, IEnumerable<string>>
22+
operation.Security = new List<IDictionary<string, IEnumerable<string>>>
2423
{
25-
{ "oauth2", new [] { "basketapi" } }
26-
});
24+
new Dictionary<string, IEnumerable<string>>
25+
{
26+
{ "oauth2", new [] { "basketapi" } }
27+
}
28+
};
2729
}
2830
}
2931
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
179179

180180

181181
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
182-
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
182+
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder)
183183
{
184-
loggerFactory.AddAzureWebAppDiagnostics();
184+
loggerBuilder.AddAzureWebAppDiagnostics();
185185
loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
186186

187187
var pathBase = Configuration["PATH_BASE"];
@@ -228,7 +228,7 @@ private void RegisterAppInsights(IServiceCollection services)
228228
if (orchestratorType?.ToUpper() == "K8S")
229229
{
230230
// Enable K8s telemetry initializer
231-
services.EnableKubernetes();
231+
services.AddApplicationInsightsKubernetesEnricher();
232232
}
233233
if (orchestratorType?.ToUpper() == "SF")
234234
{

‎src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
2121
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
22-
<PackageReference Include="xunit" Version="2.3.1" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
22+
<PackageReference Include="xunit" Version="2.4.1" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
24+
<PrivateAssets>all</PrivateAssets>
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
26+
</PackageReference>
2427
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
25-
<PackageReference Include="Moq" Version="4.8.1" />
28+
<PackageReference Include="Moq" Version="4.10.1" />
2629
</ItemGroup>
2730

2831
<ItemGroup>

0 commit comments

Comments
 (0)