Skip to content

Commit a0f62a7

Browse files
Update dependencies to fix known critical severity vulnerabilities
1 parent 68a5de6 commit a0f62a7

File tree

4 files changed

+42
-10
lines changed

4 files changed

+42
-10
lines changed

CSharpInteractive.HostApi/CSharpInteractive.HostApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="NuGet.Versioning" Version="6.4.0"/>
18+
<PackageReference Include="NuGet.Versioning" Version="6.8.1"/>
1919
<PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
2020
<InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
2121
<InternalsVisibleTo Include="dotnet-csi"/>

CSharpInteractive/CSharpInteractive.Tool.csproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0-3.final" />
32-
<PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
33-
<PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
34-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
3532
<PackageReference Include="Pure.DI" Version="2.1.38">
3633
<PrivateAssets>all</PrivateAssets>
3734
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -43,11 +40,30 @@
4340
<PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
4441
<ProjectReference Include="..\CSharpInteractive.HostApi\CSharpInteractive.HostApi.csproj" PrivateAssets="all"/>
4542
<PackageReference Include="TeamCity.DotNet.Integration" Version="1.0.33" PrivateAssets="all" GeneratePathProperty="true" ExcludeAssets="All" IncludeAssets="none" />
46-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
4743
<InternalsVisibleTo Include="CSharpInteractive.Tests"/>
4844
<InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
4945
</ItemGroup>
5046

47+
<Choose>
48+
<When Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">
49+
<ItemGroup>
50+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
51+
<PackageReference Include="NuGet.Build.Tasks" Version="6.8.1"/>
52+
<PackageReference Include="Microsoft.Build.Framework" Version="16.11.0" IncludeAssets="all"/>
53+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" IncludeAssets="all"/>
54+
</ItemGroup>
55+
</When>
56+
<Otherwise>
57+
<ItemGroup>
58+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
59+
<PackageReference Include="NuGet.Build.Tasks" Version="6.11.1"/>
60+
<PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" IncludeAssets="all"/>
61+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" IncludeAssets="all"/>
62+
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" IncludeAssets="all"/>
63+
</ItemGroup>
64+
</Otherwise>
65+
</Choose>
66+
5167
<PropertyGroup>
5268
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
5369
</PropertyGroup>

CSharpInteractive/CSharpInteractive.csproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.12.0-3.final" />
25-
<PackageReference Include="NuGet.Build.Tasks" Version="6.4.0"/>
26-
<PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" IncludeAssets="all"/>
27-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" IncludeAssets="all"/>
2825
<PackageReference Include="Pure.DI" Version="2.1.38">
2926
<PrivateAssets>all</PrivateAssets>
3027
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -34,13 +31,32 @@
3431
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3532
</PackageReference>
3633
<PackageReference Include="TeamCity.ServiceMessages" Version="4.1.1"/>
37-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
3834
<ProjectReference Include="..\CSharpInteractive.HostApi\CSharpInteractive.HostApi.csproj" PrivateAssets="all" GeneratePathProperty="true" IncludeAssets="All"/>
3935
<PackageReference Include="TeamCity.DotNet.Integration" Version="1.0.33" PrivateAssets="all" GeneratePathProperty="true" ExcludeAssets="All" IncludeAssets="none" />
4036
<InternalsVisibleTo Include="CSharpInteractive.Tests"/>
4137
<InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
4238
</ItemGroup>
4339

40+
<Choose>
41+
<When Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">
42+
<ItemGroup>
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
44+
<PackageReference Include="NuGet.Build.Tasks" Version="6.8.1"/>
45+
<PackageReference Include="Microsoft.Build.Framework" Version="16.11.0" IncludeAssets="all"/>
46+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" IncludeAssets="all"/>
47+
</ItemGroup>
48+
</When>
49+
<Otherwise>
50+
<ItemGroup>
51+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
52+
<PackageReference Include="NuGet.Build.Tasks" Version="6.11.1"/>
53+
<PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" IncludeAssets="all"/>
54+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.4" IncludeAssets="all"/>
55+
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" IncludeAssets="all"/>
56+
</ItemGroup>
57+
</Otherwise>
58+
</Choose>
59+
4460
<PropertyGroup>
4561
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
4662
</PropertyGroup>

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
6-
<NoWarn>NETSDK1057;NETSDK1215;NU1605;NU5118;NU5100;NU5131;NU5104;NU5105;NU1902;NU1903;NU1904;CS2008;CS1591</NoWarn>
6+
<NoWarn>NETSDK1138;NETSDK1057;NETSDK1215;NU1605;NU5118;NU5100;NU5131;NU5104;NU5105;NU1902;NU1903;NU1904;CS2008;CS1591</NoWarn>
77
<Version>1.0.0-dev</Version>
88
<Authors>NikolayP</Authors>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>

0 commit comments

Comments
 (0)