Skip to content

Updated to RestSharp 112 / JsonSubTypes 1.8.0 / NewtonSoft.Json 13.0.3 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jaxom-ClickSend merged 38 commits into from
Apr 23, 2025
Merged

Updated to RestSharp 112 / JsonSubTypes 1.8.0 / NewtonSoft.Json 13.0.3 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
570e0dc
Update for RestSharp 112
MichaelSharich Apr 11, 2025
dce06ce
Update build.bat for RestSharp 112
MichaelSharich Apr 11, 2025
92f7a35
Update packages.config for RestSharp 112
MichaelSharich Apr 11, 2025
7781057
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
89856a5
Update packages.config for RestSharp 112
MichaelSharich Apr 11, 2025
5ec8c1c
Update IO.ClickSend.Test.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
ed4acdb
Update build.bat for RestSharp 112
MichaelSharich Apr 11, 2025
4acca08
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
cd0cded
Update packages.config for RestSharp 112
MichaelSharich Apr 11, 2025
dfbbc06
Update IO.ClickSend.Test.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
7b6228c
Update packages.config for RestSharp 112
MichaelSharich Apr 11, 2025
e70e469
Update packages.config for RestSharp 112
MichaelSharich Apr 11, 2025
e9cafc9
Update packages.config for RestSharp 112
MichaelSharich Apr 11, 2025
3cc059a
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
c923a2a
Update build.bat for RestSharp 112
MichaelSharich Apr 11, 2025
6e91691
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
1d491bb
Update IO.ClickSend.Test.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
b9c0e44
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
eabfbdd
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
ab5594c
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
e1ddd3d
Update build.bat for RestSharp 112
MichaelSharich Apr 11, 2025
c8d0d8c
Update IO.ClickSend.Test.csproj for RestSharp 112
MichaelSharich Apr 11, 2025
8560385
Update IO.ClickSend.Test.csproj for RestSharp112
MichaelSharich Apr 11, 2025
0669f30
Update packages.config for RestSharp 112
MichaelSharich Apr 14, 2025
5bf84d2
Update packages.config for RestSharp 112
MichaelSharich Apr 14, 2025
1666edf
Update build.bat for RestSharp 112
MichaelSharich Apr 14, 2025
8f7e05b
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 14, 2025
69bce36
Update IO.ClickSend.Test.csproj for RestSharp 112
MichaelSharich Apr 14, 2025
8d3f365
Update packages.config for RestSharp
MichaelSharich Apr 14, 2025
ee9ece6
Update packages.config for RestSharp
MichaelSharich Apr 14, 2025
77bc3fd
Update build.bat for RestSharp
MichaelSharich Apr 14, 2025
d4b2faf
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 14, 2025
295de10
Update packages.config for RestSharp 112
MichaelSharich Apr 14, 2025
6819c1f
Update build.bat for RestSharp 112
MichaelSharich Apr 15, 2025
631fa7b
Update build.bat for RestSharp 112
MichaelSharich Apr 15, 2025
78ee491
Update build.bat for RestSharp 112
MichaelSharich Apr 15, 2025
f1d421d
Update build.bat for RestSharp 112
MichaelSharich Apr 15, 2025
e7690c6
Update IO.ClickSend.csproj for RestSharp 112
MichaelSharich Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions IO.ClickSend.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
VisualStudioVersion = 12.0.0.0
MinimumVisualStudioVersion = 10.0.0.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}"
# Visual Studio Version 17
VisualStudioVersion = 17.7.34003.232
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend.Test", "src\IO.ClickSend.Test\IO.ClickSend.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
EndProject
Expand All @@ -12,10 +12,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Release|Any CPU.Build.0 = Release|Any CPU
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Release|Any CPU.Build.0 = Release|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -24,4 +24,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
EndGlobal
16 changes: 11 additions & 5 deletions build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@

@echo off

SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319

if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '.\nuget.exe')"
.\nuget.exe install src\IO.ClickSend\packages.config -o packages

if not exist ".\bin" mkdir bin

copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
copy packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll bin\JsonSubTypes.dll
copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
%CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\JsonSubTypes.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll /target:library /out:bin\IO.ClickSend.dll /recurse:src\IO.ClickSend\*.cs /doc:bin\IO.ClickSend.xml
dotnet --version >nul 2>&1
IF ERRORLEVEL 1 (
echo .NET SDK not found. Please install it from https://dotnet.microsoft.com/download
pause
exit /b
)

copy packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
copy packages\RestSharp.112.1.0\lib\net48\RestSharp.dll bin\RestSharp.dll
copy packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll bin\JsonSubTypes.dll

dotnet build src/IO.ClickSend/IO.ClickSend.csproj --configuration Debug -o bin\IO.ClickSend --source packages
57 changes: 31 additions & 26 deletions src/IO.ClickSend.Test/IO.ClickSend.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
ClickSend v3 API

Expand All @@ -16,8 +16,9 @@ Contact: support@clicksend.com
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IO.ClickSend.Test</RootNamespace>
<AssemblyName>IO.ClickSend.Test</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -47,43 +48,47 @@ Contact: support@clicksend.com
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="JsonSubTypes">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
</Reference>
<Reference Include="RestSharp">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\packages\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\packages\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs"
Exclude="obj\**"/>
<Compile Include="**\*.cs" Exclude="obj\**" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\IO.ClickSend\IO.ClickSend.csproj">
<Project>{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}</Project>
<Name>IO.ClickSend</Name>
</ProjectReference>
<ProjectReference Include="..\IO.ClickSend\IO.ClickSend.csproj">
<Project>{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}</Project>
<Name>IO.ClickSend</Name>
</ProjectReference>
</ItemGroup>
</Project>

9 changes: 5 additions & 4 deletions src/IO.ClickSend.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
<package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
<package id="NUnit" version="2.6.4" targetFramework="net48" />
<package id="JsonSubTypes" version="2.0.1" targetFramework="net48" developmentDependency="true" requireReinstallation="true" />
<package id="NuGet.Frameworks" version="6.13.2" taramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="RestSharp" version="112.1.0" targetFramework="net48" developmentDependency="true" requireReinstallation="true" />
</packages>
Loading