Skip to content

Commit

Permalink
[587] Dependency Bumps (#657)
Browse files Browse the repository at this point in the history
* [587] chore: dependency bumps

* bump serilog core only

* bump swashbuckle

* bump polly

* bump serilog sinks

* maui windows to 190401 build version

* update prometheus

* update havit

* json, swashbuckle, some serilog

* migrate to garmin sdk nuget package

* update release notes
  • Loading branch information
philosowaffle authored Aug 18, 2024
1 parent 9763534 commit c9dd650
Show file tree
Hide file tree
Showing 781 changed files with 543 additions and 203,300 deletions.
3 changes: 2 additions & 1 deletion .github/actions/publish-ui-dist/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ runs:
echo "BUILD_VERSION=$Env:GITHUB_RUN_NUMBER-$Env:GITHUB_RUN_ID" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
echo "RUNNER_TOOL_CACHE=$Env:RUNNER_TOOL_CACHE" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
shell: pwsh


# dotnet publish src/ClientUI/ClientUI.csproj -c Release -f net7.0-windows10.0.19041.0 -p:RuntimeIdentifierOverride=win10-x64 -p:PublishSingleFile=true -p:SelfContained=true
- name: Publish ${{ inputs.os }}
run: dotnet publish ${{ github.workspace }}/src/ClientUI/ClientUI.csproj -c Release -f ${{ inputs.framework }} -p:RuntimeIdentifierOverride=${{ inputs.os }} -p:PublishSingleFile=true -p:SelfContained=true
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
dotnet: [ '7.0.401' ]
framework: ['net7.0-windows10.0.22621.0']
framework: ['net7.0-windows10.0.19041.0']
os: [ 'win10-x64' ]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
matrix:
dotnet: [ '7.0.400' ]
framework: ['net7.0-windows10.0.22621.0']
framework: ['net7.0-windows10.0.19041.0']
os: [ 'win10-x64' ]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
matrix:
dotnet: [ '7.0.400' ]
framework: ['net7.0-windows10.0.22621.0']
framework: ['net7.0-windows10.0.19041.0']
os: [ 'win10-x64' ]

steps:
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 1 addition & 9 deletions src/ClientUI/ClientUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!--<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>-->
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.22621.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
Expand Down Expand Up @@ -60,14 +60,6 @@
<Content Remove="Resources\Raw\configuration.local.json" />
</ItemGroup>

<ItemGroup>
<!-- Pinning this version fixes a dependency downgrade issue with Havit -->
<!--https://github.com/dotnet/maui/issues/10775-->
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1">
<NoWarn>NU1603,NETSDK1023</NoWarn>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SharedUI\SharedUI.csproj" />
<ProjectReference Include="..\Api.Service\Api.Service.csproj" />
Expand Down
20 changes: 10 additions & 10 deletions src/Common/Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@

<ItemGroup>
<PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="Handlebars.Net" Version="2.1.4" />
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
<PackageReference Include="JsonFlatFileDataStore" Version="2.4.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9" />
<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.4" />
<PackageReference Include="prometheus-net" Version="8.1.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.1.0" />
<PackageReference Include="Polly" Version="8.4.1" />
<PackageReference Include="prometheus-net" Version="8.2.1" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
<PackageReference Include="Serilog.Sinks.File.Header" Version="1.0.2" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />

<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog" Version="4.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="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.2.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
</ItemGroup>

</Project>
12 changes: 5 additions & 7 deletions src/ConsoleClient/ConsoleClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,15 @@
<ItemGroup>
<PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="JsonFlatFileDataStore" Version="2.4.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Philosowaffle.Capability.ReleaseChecks" Version="2.0.0" />
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.4.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog" Version="4.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="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.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.2.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions src/Conversion/Conversion.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Garmin.FIT.Sdk" Version="21.141.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Garmin\Garmin.csproj" />
</ItemGroup>
Expand Down
14 changes: 0 additions & 14 deletions src/Garmin/FitSdk/Cookbook/ActivityDecode/.vscode/extensions.json

This file was deleted.

27 changes: 0 additions & 27 deletions src/Garmin/FitSdk/Cookbook/ActivityDecode/.vscode/launch.json

This file was deleted.

42 changes: 0 additions & 42 deletions src/Garmin/FitSdk/Cookbook/ActivityDecode/.vscode/tasks.json

This file was deleted.

12 changes: 0 additions & 12 deletions src/Garmin/FitSdk/Cookbook/ActivityDecode/ActivityDecode.csproj

This file was deleted.

96 changes: 0 additions & 96 deletions src/Garmin/FitSdk/Cookbook/ActivityDecode/ActivityParser.cs

This file was deleted.

Loading

0 comments on commit c9dd650

Please sign in to comment.