Skip to content

Commit

Permalink
Merge pull request #67 from Umbrava/restsharp-108
Browse files Browse the repository at this point in the history
Upgrade RestSharp to 108.0.3, Newtonsoft.Json to 13.0.3, and TFM to netstandard2.0
  • Loading branch information
smolentzov-stripe authored Nov 7, 2023
2 parents c6c1ffa + 98ff67d commit 8454813
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 103 deletions.
2 changes: 1 addition & 1 deletion src/Taxjar.Tests/Client.cs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void returns_exception_with_timeout()

var systemException = Assert.Throws<Exception>(() => Bootstrap.client.Categories());

Assert.AreEqual("The operation has timed out.", systemException.Message);
Assert.AreEqual("A task was canceled.", systemException.Message);
}
}
}
70 changes: 35 additions & 35 deletions src/Taxjar.Tests/TaxJar.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
<RootNamespace>Taxjar.Tests</RootNamespace>
<AssemblyName>TaxJar.Tests</AssemblyName>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<ReleaseVersion>3.3.2</ReleaseVersion>
<OutputType>Library</OutputType>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>

<ItemGroup>
<Folder Include="Fixtures\" />
<Folder Include="Infrastructure\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="RestSharp" Version="106.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="WireMock.Net.StandAlone" Version="1.0.19.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TaxJar\TaxJar.csproj" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>Taxjar.Tests</RootNamespace>
<AssemblyName>TaxJar.Tests</AssemblyName>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<ReleaseVersion>3.3.2</ReleaseVersion>
<OutputType>Library</OutputType>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>

<ItemGroup>
<Folder Include="Fixtures\" />
<Folder Include="Infrastructure\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="RestSharp" Version="108.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="WireMock.Net.StandAlone" Version="1.0.19.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TaxJar\TaxJar.csproj" />
</ItemGroup>

</Project>
7 changes: 3 additions & 4 deletions src/Taxjar/Taxjar.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>TaxJar makes sales tax filing easier for online sellers and merchants. See local jurisdictional tax reports, get payment reminders, and more. You can use our API to access TaxJar API endpoints, which can get information on sales tax rates, categories or upload transactions.</Description>
<AssemblyTitle>TaxJar</AssemblyTitle>
<Version>3.3.2</Version>
Expand All @@ -13,7 +13,6 @@
<PackageProjectUrl>https://github.com/taxjar/taxjar.net</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/taxjar/taxjar.net/blob/master/LICENSE.txt</PackageLicenseUrl>
<ReleaseVersion>3.3.2</ReleaseVersion>
<DefineConstants Condition=" '$(TargetFramework)' == 'net452' ">NET452</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -27,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="RestSharp" Version="106.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="RestSharp" Version="108.0.3" />
</ItemGroup>

</Project>
Loading

0 comments on commit 8454813

Please sign in to comment.