Skip to content

Commit

Permalink
Merge pull request #1546 from qdraw/snyk-fix-377889287e755807396886dd…
Browse files Browse the repository at this point in the history
…ad970e44

Desktop and nuget update
  • Loading branch information
qdraw authored Apr 16, 2024
2 parents 7566b2e + 4042c53 commit d8607dc
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 100 deletions.
2 changes: 1 addition & 1 deletion starsky/build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0"/>
<PackageReference Include="Nuke.Common" Version="8.0.0"/>
<PackageReference Include="ReportGenerator.Core" Version="5.2.2"/>
<PackageReference Include="ReportGenerator.Core" Version="5.2.4" />
<PackageReference Include="SimpleExec" Version="12.0.0"/>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions starsky/starsky.feature.health/starsky.feature.health.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="8.0.0"/>
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="8.0.0"/>
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="8.0.1"/>
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<ItemGroup>
<PackageReference Include="RazorLight" Version="2.3.1"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3"/>
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.4" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.1"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.4"/>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2"/>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0"/>
</ItemGroup>

Expand Down Expand Up @@ -83,9 +83,9 @@
</ItemGroup>

<ItemGroup>
<Content Include="..\..\documentation\docs\developer-guide\migrations\migrations.md">
<Link>migrations.md</Link>
</Content>
<Content Include="..\..\documentation\docs\developer-guide\migrations\migrations.md">
<Link>migrations.md</Link>
</Content>
</ItemGroup>

<PropertyGroup Condition=" '$(noSonar)' == 'true' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3"/>
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
</ItemGroup>

<PropertyGroup Condition=" '$(noSonar)' == 'true' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="MetadataExtractor" Version="2.8.1"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
</ItemGroup>

<PropertyGroup Condition=" '$(noSonar)' == 'true' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<!-- instead of : Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0-->
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="OpenTelemetry" Version="1.7.0"/>
<PackageReference Include="OpenTelemetry.Api" Version="1.7.0"/>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0"/>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0"/>
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1"/>
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.10"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0"/>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0"/>
<PackageReference Include="System.Text.Json" Version="8.0.2"/>
<PackageReference Include="OpenTelemetry" Version="1.8.0"/>
<PackageReference Include="OpenTelemetry.Api" Version="1.8.0"/>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.0"/>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0"/>
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1"/>
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.3" />
</ItemGroup>

<PropertyGroup Condition=" '$(noSonar)' == 'true' ">
Expand Down
14 changes: 7 additions & 7 deletions starsky/starskytest/starskytest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"/>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"/>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4"/>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2"/>
<PackageReference Include="MSTest.TestFramework" Version="3.2.2"/>
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.3.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
78 changes: 16 additions & 62 deletions starskydesktop/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions starskydesktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
},
"dependencies": {
"chokidar": "^3.6.0",
"electron-settings": "^4.0.2",
"electron-settings": "^4.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"wait-on": "^7.2.0",
Expand All @@ -99,7 +99,7 @@
"@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.4.0",
"cross-env": "^7.0.3",
"electron": "^29.1.6",
"electron": "^29.3.0",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^18.0.0",
Expand Down

0 comments on commit d8607dc

Please sign in to comment.