Skip to content

Commit

Permalink
Merge pull request #244 from avadev/jwenger/241
Browse files Browse the repository at this point in the history
Update to Newtonsoft.Json 13.0.1 to address security concerns
  • Loading branch information
svc-developer authored Jul 8, 2024
2 parents 9725a46 + 88e7b62 commit 55040dc
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 91 deletions.
4 changes: 2 additions & 2 deletions src/Avalara.AvaTax.RestClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Avalara.AvaTax.RestClient.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
</group>
<group targetFramework=".NETStandard1.6">
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="Newtonsoft.Json" version="12.0.1" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
<dependency id="System.Net.Http" version="4.3.2" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NETStandard.Library" version="2.0.0" />
<dependency id="Newtonsoft.Json" version="12.0.1" />
<dependency id="Newtonsoft.Json" version="13.0.1" />
<dependency id="System.Net.Http" version="4.3.2" />
</group>
</dependencies>
Expand Down
174 changes: 87 additions & 87 deletions tests/Avalara.AvaTax.RestClient.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,88 +1,88 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net451;net45;net461;net472;netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
</PropertyGroup>
<ItemGroup>
<Compile Remove="**\*.*" />
<None Remove="**" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Reference Include="System.Net.Http" />
<Compile Include="net20\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net20</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Reference Include="System.Net.Http" />
<Compile Include="net45\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net45</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Reference Include="System.Net.Http" />
<Compile Include="net461\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Compile Include="net472\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<Compile Include="netstandard\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=netstandard1.6</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<Compile Include="netstandard20\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net451;net45;net461;net472;netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
</PropertyGroup>
<ItemGroup>
<Compile Remove="**\*.*" />
<None Remove="**" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Reference Include="System.Net.Http" />
<Compile Include="net20\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net20</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Reference Include="System.Net.Http" />
<Compile Include="net45\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net45</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Reference Include="System.Net.Http" />
<Compile Include="net461\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net461</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<Compile Include="net472\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=net472</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<Compile Include="netstandard\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=netstandard1.6</SetTargetFramework>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<Compile Include="netstandard20\*.cs" />
<ProjectReference Include="..\src\Avalara.AvaTax.RestClient.csproj">
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
</ProjectReference>
</ItemGroup>
</Project>

0 comments on commit 55040dc

Please sign in to comment.