Skip to content

Commit ac97aef

Browse files
authored
chore: fix vulnerable packages (#4757)
* chore: fix vulnerable packages * chore: use NuGet feed for Microsoft.CodeAnalysis.Testing * build: Package Source Mapping allows prefix-patterns only * build: add missing "Microsoft.CodeAnalysis.Testing" package source mappings * revert: use NuGet feed for Microsoft.CodeAnalysis.Testing * chore: update Sentry.Analyzers.Tests to net10.0 * style: revert nuget.config
1 parent c90143a commit ac97aef

File tree

8 files changed

+28
-36
lines changed

8 files changed

+28
-36
lines changed

samples/Sentry.Samples.EntityFramework/Sentry.Samples.EntityFramework.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
<PackageReference Include="EntityFramework" Version="6.5.1" />
1919
<PackageReference Include="Effort.EF6" Version="2.2.16" />
20-
21-
<!-- this is needed because the version that is brought in transitively has a vulnerability warning -->
22-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
2320
</ItemGroup>
2421

2522
</Project>

src/Sentry/Sentry.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,7 @@
8383

8484
<!-- Ensure at least version 6 of System.Text.Json so we have JsonSerializationContext available -->
8585
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netstandard'))">
86-
<PackageReference Include="System.Text.Json" Version="8.0.5" >
87-
<!--
88-
Ignoring the vulnerability warning: https://github.com/advisories/GHSA-hh2w-p6rv-4g7w
89-
The app can/should pin to the latest version. We will bump once a patch on v6 (still LTS until Nov 24) is out
90-
-->
91-
<NoWarn>NU1903</NoWarn>
92-
</PackageReference>
86+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
9387
</ItemGroup>
9488

9589
<!--

test/Directory.Build.props

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,9 @@
7272
<PackageReference Include="coverlet.collector" Version="6.0.4" />
7373
</ItemGroup>
7474

75-
<!-- these are needed because the versions that are brought in transitively have vulnerability warnings -->
76-
<ItemGroup>
77-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
78-
</ItemGroup>
7975
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
8076
<PackageReference Include="System.Net.Http" Version="4.3.4" />
8177
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
8278
</ItemGroup>
79+
8380
</Project>

test/Sentry.Analyzers.Tests/Sentry.Analyzers.Tests.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>$(PreviousTfm)</TargetFramework>
5-
<Nullable>enable</Nullable>
3+
<PropertyGroup>
4+
<TargetFramework>$(LatestTfm)</TargetFramework>
5+
<Nullable>enable</Nullable>
66

7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2"/>
12-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2"/>
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0"/>
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0"/>
15-
</ItemGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
12+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />
15+
</ItemGroup>
1616

17-
<ItemGroup>
18-
<ProjectReference Include="..\..\src\Sentry.Analyzers\Sentry.Analyzers.csproj" />
19-
</ItemGroup>
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\src\Sentry.Analyzers\Sentry.Analyzers.csproj" />
19+
</ItemGroup>
2020

2121
<ItemGroup>
2222
<Using Remove="Sentry.*" />

test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,35 @@
1818
<PackageReference Include="Verify.EntityFramework" Version="9.0.0" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
2020
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
21+
<!-- https://github.com/advisories/GHSA-m5vv-6r4h-3vj9 -->
22+
<PackageReference Include="Azure.Identity" Version="1.11.4" />
2123
</ItemGroup>
2224

2325
<!-- Test EF Core 8 on .NET 8 -->
2426
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
2527
<PackageReference Include="Verify.EntityFramework" Version="8.0.0" />
2628
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
2729
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
30+
<!-- https://github.com/advisories/GHSA-m5vv-6r4h-3vj9 -->
31+
<PackageReference Include="Azure.Identity" Version="1.11.4" />
32+
<!-- https://github.com/advisories/GHSA-qj66-m88j-hmgj -->
33+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
2834
</ItemGroup>
2935

3036
<!-- Test EF Core 3.1 on .NET Framework -->
31-
<ItemGroup Condition="'$(TargetFramework)' == 'net48' ">
37+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
3238
<ProjectReference Include="..\..\src\Sentry.DiagnosticSource\Sentry.DiagnosticSource.csproj" />
3339
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.32" />
3440
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.32" />
41+
<!-- https://github.com/advisories/GHSA-m5vv-6r4h-3vj9 -->
42+
<PackageReference Include="Azure.Identity" Version="1.11.4" />
3543
</ItemGroup>
3644

3745
<ItemGroup>
3846
<PackageReference Include="LocalDb" Version="18.0.1" />
3947
</ItemGroup>
4048

4149
<ItemGroup>
42-
<!-- this is needed because the version that is brought in transitively has a vulnerability warning -->
43-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
44-
4550
<ProjectReference Include="..\..\src\Sentry.Extensions.Logging\Sentry.Extensions.Logging.csproj" />
4651
<ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" />
4752
<ProjectReference Include="..\..\src\Sentry\Sentry.csproj" />

test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
2323
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
2424
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
25+
<!-- https://github.com/advisories/GHSA-qj66-m88j-hmgj -->
26+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
2527
</ItemGroup>
2628

2729
<!-- Test .NET Framework -->

test/Sentry.Extensions.Logging.Tests/Sentry.Extensions.Logging.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.1" />
1414
<ProjectReference Include="..\..\src\Sentry.Extensions.Logging\Sentry.Extensions.Logging.csproj" />
1515
<ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" />
1616
</ItemGroup>

test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
7474
<PackageReference Include="Microsoft.Maui.Core" Version="$(MauiVersion)"/>
7575
<PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)"/>
76-
77-
<!-- https://github.com/advisories/GHSA-5f2m-466j-3848 -->
78-
<PackageReference Include="System.Private.Uri" Version="4.3.2"/>
7976
</ItemGroup>
8077

8178
<!-- Configure XUnit -->

0 commit comments

Comments
 (0)