Skip to content

Commit 0a1ee47

Browse files
author
Timothy Mothra
authored
[SDL] update packages (#2243)
* update packages * update test dependencies * testing fix for version conflicts * Update IntegrationTests.Tests.csproj * cleanup * cleanup
1 parent cd3aeac commit 0a1ee47

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,29 @@
3737
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
3838
</ItemGroup>
3939

40+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net461' ">
41+
<!--
42+
Microsoft.AspNetCore.Http has a vulnerability https://msrc.microsoft.com/update-guide/vulnerability/CVE-2020-1045
43+
System.Text.Encodings.Web has a vulnerability https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-26701
44+
45+
These are both implicit dependencies from Microsoft.AspNetCore.Hosting.
46+
(Microsoft.AspNetCore.Hosting > Microsoft.AspNetCore.Http)
47+
(Microsoft.AspNetCore.Hosting > Microsoft.AspNetCore.Hosting.Abstractions > Microsoft.AspNetCore.Http.Abstractions > System.Text.Encodings.Web)
48+
-->
49+
50+
<!--
51+
Taking a dependency on Microsoft.AspNetCore.Hosting v2.2.0 would resolve this issue, but would also break support for NetCore v2.1.
52+
Instead I'm taking a direct dependency on the fixed version Microsoft.AspNetCore.Http.
53+
We can remove this when NetCore v2.1 reaches EOL on August 21, 2021.
54+
-->
55+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.22" />
56+
57+
<!--
58+
We must take a temporary dependency on this newer version until Microsoft.AspNetCore.Hosting updates their dependencies.
59+
-->
60+
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" />
61+
</ItemGroup>
62+
4063
<ItemGroup>
4164
<AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Shipped.txt" />
4265
<AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Unshipped.txt" />

NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
2222

2323
<ProjectReference Include="..\IntegrationTests.WebApp\IntegrationTests.WebApp.csproj" />
24+
25+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
26+
<PackageReference Include="System.Security.Permissions" Version="4.7.0" />
2427
</ItemGroup>
2528

2629
<ItemGroup>
@@ -38,7 +41,7 @@
3841
</ItemGroup>
3942

4043
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
41-
<PackageReference Include="Microsoft.AspNetCore.App" />
44+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.27" />
4245
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.1" />
4346
</ItemGroup>
4447

NETCORE/test/IntegrationTests.WebApp/IntegrationTests.WebApp.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
</ItemGroup>
1010

1111
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
12-
<PackageReference Include="Microsoft.AspNetCore.App" />
12+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.27" />
1313
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
14+
15+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
16+
<PackageReference Include="System.Security.Permissions" Version="4.7.0" />
1417
</ItemGroup>
1518

1619
</Project>

0 commit comments

Comments
 (0)