diff --git a/IO.ClickSend.sln b/IO.ClickSend.sln index e90843f..b30a661 100644 --- a/IO.ClickSend.sln +++ b/IO.ClickSend.sln @@ -1,10 +1,10 @@ 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", "{D80ACF4B-17FC-45C7-B593-34233ED4FC31}" +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.902 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IO.ClickSend", "src\IO.ClickSend\IO.ClickSend.csproj", "{D80ACF4B-17FC-45C7-B593-34233ED4FC31}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.ClickSend.Test", "src\IO.ClickSend.Test\IO.ClickSend.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IO.ClickSend.Test", "src\IO.ClickSend.Test\IO.ClickSend.Test.csproj", "{C6AC5D48-725F-4B0F-97F7-8D39395F7656}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,12 +16,15 @@ Global {D80ACF4B-17FC-45C7-B593-34233ED4FC31}.Debug|Any CPU.Build.0 = Debug|Any CPU {D80ACF4B-17FC-45C7-B593-34233ED4FC31}.Release|Any CPU.ActiveCfg = Release|Any CPU {D80ACF4B-17FC-45C7-B593-34233ED4FC31}.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 - {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU + {C6AC5D48-725F-4B0F-97F7-8D39395F7656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6AC5D48-725F-4B0F-97F7-8D39395F7656}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6AC5D48-725F-4B0F-97F7-8D39395F7656}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6AC5D48-725F-4B0F-97F7-8D39395F7656}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection -EndGlobal \ No newline at end of file + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0C6420BA-DAA7-45EB-B0A9-5837B4DDCB18} + EndGlobalSection +EndGlobal diff --git a/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj b/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj index 1eeed6b..b99e2ea 100644 --- a/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj +++ b/src/IO.ClickSend.Test/IO.ClickSend.Test.csproj @@ -1,89 +1,19 @@ - - - - Debug - AnyCPU - {19F1DEBC-DE5E-4517-8062-F000CD499087} - Library - Properties - IO.ClickSend.Test - IO.ClickSend.Test - v4.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp2.1 + + false + - - - - - - - - - - - $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - $(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - ..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - ..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - ..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - - - $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll - - - $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll - - - - - - - + + + - + - - {D80ACF4B-17FC-45C7-B593-34233ED4FC31} - IO.ClickSend - + - + diff --git a/src/IO.ClickSend.Test/packages.config b/src/IO.ClickSend.Test/packages.config deleted file mode 100644 index ac390c1..0000000 --- a/src/IO.ClickSend.Test/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/IO.ClickSend/Client/ApiClient.cs b/src/IO.ClickSend/Client/ApiClient.cs index 48e2d63..f618626 100644 --- a/src/IO.ClickSend/Client/ApiClient.cs +++ b/src/IO.ClickSend/Client/ApiClient.cs @@ -134,7 +134,7 @@ private RestRequest PrepareRequest( // add file parameter, if any foreach(var param in fileParams) { - request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType); + request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentLength, param.Value.ContentType); } if (postBody != null) // http body (model or byte[]) parameter diff --git a/src/IO.ClickSend/IO.ClickSend.csproj b/src/IO.ClickSend/IO.ClickSend.csproj index 41d9f5e..5a3e1e6 100644 --- a/src/IO.ClickSend/IO.ClickSend.csproj +++ b/src/IO.ClickSend/IO.ClickSend.csproj @@ -1,85 +1,13 @@ - - - - IO.ClickSend - $version$ - $version$ - ClickSend - ClickSend - Debug - AnyCPU - {40073990-79D7-4D2B-A39C-2B1EDCFAC85F} - Library - Properties - IO.ClickSend - IO.ClickSend - v4.5 - 512 - bin\Package - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 + netstandard2.0 - - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - $(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - ..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - ..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - ..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll - - - $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll - - - ..\..\packages\NuGet.Frameworks.5.3.1\lib\net40\NuGet.Frameworks.dll - - - - - - + + + + + - - - + \ No newline at end of file diff --git a/src/IO.ClickSend/IO.ClickSend.nuspec b/src/IO.ClickSend/IO.ClickSend.nuspec deleted file mode 100644 index 23787b3..0000000 --- a/src/IO.ClickSend/IO.ClickSend.nuspec +++ /dev/null @@ -1,42 +0,0 @@ - - - - - $id$ - ClickSend Library - - - $version$ - - - $author$ - - - $author$ - false - false - - - A library generated from a ClickSend doc - https://www.clicksend.com/au/legal/terms-of-service/ - - - - - - - - - - - - - - - - - - - diff --git a/src/IO.ClickSend/Properties/AssemblyInfo.cs b/src/IO.ClickSend/Properties/AssemblyInfo.cs deleted file mode 100644 index 0204784..0000000 --- a/src/IO.ClickSend/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ClickSend Library")] -[assembly: AssemblyDescription("A library generated from a ClickSend doc")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("ClickSend")] -[assembly: AssemblyProduct("ClickSendLibrary")] -[assembly: AssemblyCopyright("No Copyright")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.56")] -[assembly: AssemblyFileVersion("5.0.56")] diff --git a/src/IO.ClickSend/packages.config b/src/IO.ClickSend/packages.config deleted file mode 100644 index 3caf34e..0000000 --- a/src/IO.ClickSend/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -