Skip to content

Commit

Permalink
[509][housekeeping] dependency bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
philosowaffle committed Jul 26, 2023
1 parent bbee02e commit e49dac2
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 31 deletions.
6 changes: 3 additions & 3 deletions src/Api/Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

<ItemGroup>
<PackageReference Include="Philosowaffle.Capability.ReleaseChecks" Version="1.0.0" />
<PackageReference Include="prometheus-net" Version="8.0.0" />
<PackageReference Include="prometheus-net" Version="8.0.1" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
Expand Down
5 changes: 3 additions & 2 deletions src/Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using Serilog;
using Serilog.Enrichers.Span;
using Serilog.Events;
using Serilog.Settings.Configuration;
using Sync;
using System.Reflection;

Expand Down Expand Up @@ -45,7 +46,7 @@
builder.Host.UseSerilog((ctx, logConfig) =>
{
logConfig
.ReadFrom.Configuration(ctx.Configuration, sectionName: $"{nameof(Observability)}:Serilog")
.ReadFrom.Configuration(ctx.Configuration, new ConfigurationReaderOptions() { SectionName = $"{nameof(Observability)}:Serilog" })
.Enrich.WithSpan()
.Enrich.FromLogContext();
});
Expand Down Expand Up @@ -113,7 +114,7 @@
Tracing.EnableApiTracing(builder.Services, config.Observability.Jaeger);

Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(builder.Configuration, sectionName: $"{nameof(Observability)}:Serilog")
.ReadFrom.Configuration(builder.Configuration, new ConfigurationReaderOptions() { SectionName = $"{nameof(Observability)}:Serilog" })
.Enrich.FromLogContext()
.CreateLogger();

Expand Down
17 changes: 8 additions & 9 deletions src/Common/Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@

<ItemGroup>
<PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="JsonFlatFileDataStore" Version="2.4.1" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
<PackageReference Include="JsonFlatFileDataStore" Version="2.4.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="prometheus-net" Version="8.0.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.0" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="prometheus-net" Version="8.0.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.1" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="System.Text.Json" Version="7.0.2" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/PelotonToGarminConsole/PelotonToGarminConsole.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@

<ItemGroup>
<PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="JsonFlatFileDataStore" Version="2.4.1" />
<PackageReference Include="JsonFlatFileDataStore" Version="2.4.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
<PackageReference Include="Philosowaffle.Capability.ReleaseChecks" Version="1.0.0" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/PelotonToGarminConsole/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using Common.Stateful;
using Philosowaffle.Capability.ReleaseChecks;
using Garmin.Auth;
using Serilog.Settings.Configuration;

Statics.AppType = Constants.ConsoleAppName;
Statics.MetricPrefix = Constants.ConsoleAppName;
Expand Down Expand Up @@ -48,7 +49,7 @@ static IHostBuilder CreateHostBuilder(string[] args)
.UseSerilog((ctx, logConfig) =>
{
logConfig
.ReadFrom.Configuration(ctx.Configuration, sectionName: "Observability:Serilog")
.ReadFrom.Configuration(ctx.Configuration, new ConfigurationReaderOptions() { SectionName = "Observability:Serilog" })
.Enrich.WithSpan()
.Enrich.FromLogContext();
})
Expand Down
2 changes: 1 addition & 1 deletion src/Sync/Sync.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/WebUI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Common.Observe;
using Common.Stateful;
using Common.Http;
using Serilog.Settings.Configuration;

///////////////////////////////////////////////////////////
/// STATICS
Expand All @@ -34,7 +35,7 @@
builder.Host.UseSerilog((ctx, logConfig) =>
{
logConfig
.ReadFrom.Configuration(ctx.Configuration, sectionName: $"{nameof(Observability)}:Serilog")
.ReadFrom.Configuration(ctx.Configuration, new ConfigurationReaderOptions() { SectionName = $"{nameof(Observability)}:Serilog" })
.Enrich.WithSpan()
.Enrich.FromLogContext();
});
Expand All @@ -55,7 +56,7 @@
Tracing.EnableWebUITracing(builder.Services, config.Observability.Jaeger);

Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(builder.Configuration, sectionName: $"{nameof(Observability)}:Serilog")
.ReadFrom.Configuration(builder.Configuration, new ConfigurationReaderOptions() { SectionName = $"{nameof(Observability)}:Serilog" })
.Enrich.FromLogContext()
.CreateLogger();

Expand Down
8 changes: 4 additions & 4 deletions src/WebUI/WebUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
<ItemGroup>
<PackageReference Include="Flurl" Version="3.0.7" />
<PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="Havit.Blazor.Components.Web.Bootstrap" Version="3.2.14" />
<PackageReference Include="Havit.Blazor.Components.Web.Bootstrap" Version="4.0.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="prometheus-net" Version="8.0.0" />
<PackageReference Include="prometheus-net" Version="8.0.1" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.1.0" />
Expand Down
7 changes: 6 additions & 1 deletion vNextReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@
- [#510] Bear Crawl

## Fixes
- `All converters were skipped.` - confusing log message when no workouts needed to be synced

- `All converters were skipped.` - confusing log message when no workouts needed to be synced

## Housekeeping

- [#509] Various dependency bumps

0 comments on commit e49dac2

Please sign in to comment.