Skip to content

Commit 06237c6

Browse files
Jaxom-ClickSendJaxom-ClickSend
authored
Merge pull request #21 from MichaelSharich/master
Updated to RestSharp 112 / JsonSubTypes 1.8.0 / NewtonSoft.Json 13.0.3
2 parents d44f9ea + e7690c6 commit 06237c6

46 files changed

Lines changed: 938 additions & 876 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎IO.ClickSend.sln‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2012
3-
VisualStudioVersion = 12.0.0.0
4-
MinimumVisualStudioVersion = 10.0.0.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}"
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.7.34003.232
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend.Test", "src\IO.ClickSend.Test\IO.ClickSend.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
88
EndProject
@@ -12,10 +12,10 @@ Global
1212
Release|Any CPU = Release|Any CPU
1313
EndGlobalSection
1414
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16-
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Debug|Any CPU.Build.0 = Debug|Any CPU
17-
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Release|Any CPU.ActiveCfg = Release|Any CPU
18-
{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}.Release|Any CPU.Build.0 = Release|Any CPU
15+
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16+
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Debug|Any CPU.Build.0 = Debug|Any CPU
17+
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Release|Any CPU.ActiveCfg = Release|Any CPU
18+
{40073990-79D7-4D2B-A39C-2B1EDCFAC85F}.Release|Any CPU.Build.0 = Release|Any CPU
1919
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2020
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
2121
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -24,4 +24,4 @@ Global
2424
GlobalSection(SolutionProperties) = preSolution
2525
HideSolutionNode = FALSE
2626
EndGlobalSection
27-
EndGlobal
27+
EndGlobal

‎build.bat‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,21 @@
33

44
@echo off
55

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

87
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')"
98
.\nuget.exe install src\IO.ClickSend\packages.config -o packages
109

1110
if not exist ".\bin" mkdir bin
1211

13-
copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
14-
copy packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll bin\JsonSubTypes.dll
15-
copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll
16-
%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
12+
dotnet --version >nul 2>&1
13+
IF ERRORLEVEL 1 (
14+
echo .NET SDK not found. Please install it from https://dotnet.microsoft.com/download
15+
pause
16+
exit /b
17+
)
1718

19+
copy packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll
20+
copy packages\RestSharp.112.1.0\lib\net48\RestSharp.dll bin\RestSharp.dll
21+
copy packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll bin\JsonSubTypes.dll
22+
23+
dotnet build src/IO.ClickSend/IO.ClickSend.csproj --configuration Debug -o bin\IO.ClickSend --source packages

‎src/IO.ClickSend.Test/IO.ClickSend.Test.csproj‎

Lines changed: 31 additions & 26 deletions
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
<!--
33
ClickSend v3 API
44
@@ -16,8 +16,9 @@ Contact: support@clicksend.com
1616
<AppDesignerFolder>Properties</AppDesignerFolder>
1717
<RootNamespace>IO.ClickSend.Test</RootNamespace>
1818
<AssemblyName>IO.ClickSend.Test</AssemblyName>
19-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
2020
<FileAlignment>512</FileAlignment>
21+
<TargetFrameworkProfile />
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<DebugSymbols>true</DebugSymbols>
@@ -47,43 +48,47 @@ Contact: support@clicksend.com
4748
<Reference Include="System.Runtime.Serialization" />
4849
<Reference Include="System.Xml" />
4950
<Reference Include="Newtonsoft.Json">
50-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
51-
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
52-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
53-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
51+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
52+
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
53+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
54+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.13.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
5455
</Reference>
5556
<Reference Include="JsonSubTypes">
56-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
57-
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
58-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
59-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
57+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
58+
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
59+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
60+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.2.0.1\lib\netstandard2.0\JsonSubTypes.dll</HintPath>
6061
</Reference>
6162
<Reference Include="RestSharp">
62-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
63-
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
64-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
65-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
63+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
64+
<HintPath Condition="Exists('..\packages')">..\packages\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
65+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
66+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.112.1.0\lib\net48\RestSharp.dll</HintPath>
6667
</Reference>
68+
<Reference Include="System.Text.Json">
69+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
70+
<HintPath Condition="Exists('..\packages')">..\packages\packages\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
71+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\packages\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
72+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\System.Text.Json.9.0.4\lib\netstandard2.0\System.Text.Json.dll</HintPath>
73+
</Reference>
6774
<Reference Include="nunit.framework">
68-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
69-
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
70-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
71-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
75+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
76+
<HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
77+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
78+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
7279
</Reference>
7380
</ItemGroup>
7481
<ItemGroup>
75-
<Compile Include="**\*.cs"
76-
Exclude="obj\**"/>
82+
<Compile Include="**\*.cs" Exclude="obj\**" />
7783
</ItemGroup>
7884
<ItemGroup>
79-
<None Include="packages.config" />
85+
<None Include="packages.config" />
8086
</ItemGroup>
8187
<Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
8288
<ItemGroup>
83-
<ProjectReference Include="..\IO.ClickSend\IO.ClickSend.csproj">
84-
<Project>{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}</Project>
85-
<Name>IO.ClickSend</Name>
86-
</ProjectReference>
89+
<ProjectReference Include="..\IO.ClickSend\IO.ClickSend.csproj">
90+
<Project>{82E3D3C9-B6A1-45CF-A61E-4A8E7068CF04}</Project>
91+
<Name>IO.ClickSend</Name>
92+
</ProjectReference>
8793
</ItemGroup>
8894
</Project>
89-

‎src/IO.ClickSend.Test/packages.config‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
4-
<package id="RestSharp" version="105.1.0" targetFramework="net45" developmentDependency="true" />
5-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" developmentDependency="true" />
6-
<package id="JsonSubTypes" version="1.2.0" targetFramework="net45" developmentDependency="true" />
3+
<package id="NUnit" version="2.6.4" targetFramework="net48" />
4+
<package id="JsonSubTypes" version="2.0.1" targetFramework="net48" developmentDependency="true" requireReinstallation="true" />
5+
<package id="NuGet.Frameworks" version="6.13.2" taramework="net48" />
6+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
7+
<package id="RestSharp" version="112.1.0" targetFramework="net48" developmentDependency="true" requireReinstallation="true" />
78
</packages>

0 commit comments

Comments
 (0)