Skip to content

Commit d78f4b5

Browse files
ysyrotaYuriy Syrota
ysyrota
and
Yuriy Syrota
authored
Updated System.Text.Json to address CVE-2024-43485 (#39)
Co-authored-by: Yuriy Syrota <yuriy.syrota@motorolasolutions.com>
1 parent b6d7e44 commit d78f4b5

File tree

5 files changed

+8
-17
lines changed

5 files changed

+8
-17
lines changed

‎duo_api_csharp/duo_api_csharp.csproj‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5959
<HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
6060
</Reference>
61-
<Reference Include="System.Text.Json, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62-
<HintPath>..\packages\System.Text.Json.6.0.2\lib\net461\System.Text.Json.dll</HintPath>
61+
<Reference Include="System.Text.Json, Version=6.0.0.10, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62+
<HintPath>..\packages\System.Text.Json.6.0.10\lib\net461\System.Text.Json.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
6565
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -88,11 +88,4 @@
8888
<ProjectExtensions>
8989
<VisualStudio AllowExistingFolder="true" />
9090
</ProjectExtensions>
91-
<Import Project="..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets')" />
92-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
93-
<PropertyGroup>
94-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
95-
</PropertyGroup>
96-
<Error Condition="!Exists('..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets'))" />
97-
</Target>
98-
</Project>
91+
</Project>

‎duo_api_csharp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
77
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
88
<package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net48" />
9-
<package id="System.Text.Json" version="6.0.2" targetFramework="net48" />
9+
<package id="System.Text.Json" version="6.0.10" targetFramework="net48" />
1010
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
1111
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
1212
</packages>

‎examples/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />

‎test/DuoApiTest.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5858
<HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
5959
</Reference>
60-
<Reference Include="System.Text.Json, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
61-
<HintPath>..\packages\System.Text.Json.6.0.2\lib\net461\System.Text.Json.dll</HintPath>
60+
<Reference Include="System.Text.Json, Version=6.0.0.10, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
61+
<HintPath>..\packages\System.Text.Json.6.0.10\lib\net461\System.Text.Json.dll</HintPath>
6262
</Reference>
6363
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
6464
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -110,11 +110,9 @@
110110
</PropertyGroup>
111111
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
112112
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
113-
<Error Condition="!Exists('..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets'))" />
114113
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
115114
</Target>
116115
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
117-
<Import Project="..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets')" />
118116
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
119117
Other similar extension points exist, see Microsoft.Common.targets.
120118
<Target Name="BeforeBuild">

‎test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
77
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
88
<package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net48" />
9-
<package id="System.Text.Json" version="6.0.2" targetFramework="net48" />
9+
<package id="System.Text.Json" version="6.0.10" targetFramework="net48" />
1010
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
1111
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
1212
<package id="xunit" version="2.4.1" targetFramework="net48" />

0 commit comments

Comments
 (0)