Support for 4.5.2-4.6.1; housekeeping

Vonage · Mar 19, 2016 · a470e35 · a470e35
1 parent f314bc3
commit a470e35
Show file tree

Hide file tree

Showing 9 changed files with 165 additions and 68 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Robert Smith
+Copyright (c) 2015-2016 Robert Smith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/Nexmo.Api.Test.Integration/Nexmo.Api.Test.Integration.csproj b/Nexmo.Api.Test.Integration/Nexmo.Api.Test.Integration.csproj
@@ -21,13 +21,34 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release452|AnyCPU' ">
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\net452\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release46|AnyCPU'">
+    <OutputPath>bin\net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release461|AnyCPU'">
+    <OutputPath>bin\net461\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">

diff --git a/Nexmo.Api.Test.Unit/Nexmo.Api.Test.Unit.csproj b/Nexmo.Api.Test.Unit/Nexmo.Api.Test.Unit.csproj
@@ -21,13 +21,34 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release452|AnyCPU' ">
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\net452\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release46|AnyCPU'">
+    <OutputPath>bin\net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release461|AnyCPU'">
+    <OutputPath>bin\net461\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">

diff --git a/Nexmo.Api.sln b/Nexmo.Api.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nexmo.Api", "Nexmo.Api\Nexmo.Api.csproj", "{EE7DA727-2AE3-4C76-809A-56B7433004FE}"
 EndProject
@@ -21,25 +21,43 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		net452|Any CPU = net452|Any CPU
+		net46|Any CPU = net46|Any CPU
+		net461|Any CPU = net461|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.net452|Any CPU.ActiveCfg = Release452|Any CPU
+		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.net452|Any CPU.Build.0 = Release452|Any CPU
+		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.net46|Any CPU.ActiveCfg = Release46|Any CPU
+		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.net46|Any CPU.Build.0 = Release46|Any CPU
+		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.net461|Any CPU.ActiveCfg = Release461|Any CPU
+		{EE7DA727-2AE3-4C76-809A-56B7433004FE}.net461|Any CPU.Build.0 = Release461|Any CPU
 		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.net452|Any CPU.ActiveCfg = Release452|Any CPU
+		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.net452|Any CPU.Build.0 = Release452|Any CPU
+		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.net46|Any CPU.ActiveCfg = Release46|Any CPU
+		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.net46|Any CPU.Build.0 = Release46|Any CPU
+		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.net461|Any CPU.ActiveCfg = Release461|Any CPU
+		{3B32C093-EBED-4D60-B2FC-046F8FCE11D9}.net461|Any CPU.Build.0 = Release461|Any CPU
 		{826FCF13-1B74-4404-B523-E59AF6F344C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{826FCF13-1B74-4404-B523-E59AF6F344C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{826FCF13-1B74-4404-B523-E59AF6F344C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{826FCF13-1B74-4404-B523-E59AF6F344C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{826FCF13-1B74-4404-B523-E59AF6F344C3}.net452|Any CPU.ActiveCfg = Release452|Any CPU
+		{826FCF13-1B74-4404-B523-E59AF6F344C3}.net452|Any CPU.Build.0 = Release452|Any CPU
+		{826FCF13-1B74-4404-B523-E59AF6F344C3}.net46|Any CPU.ActiveCfg = Release46|Any CPU
+		{826FCF13-1B74-4404-B523-E59AF6F344C3}.net46|Any CPU.Build.0 = Release46|Any CPU
+		{826FCF13-1B74-4404-B523-E59AF6F344C3}.net461|Any CPU.ActiveCfg = Release461|Any CPU
+		{826FCF13-1B74-4404-B523-E59AF6F344C3}.net461|Any CPU.Build.0 = Release461|Any CPU
 		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.net452|Any CPU.ActiveCfg = Release452|Any CPU
+		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.net452|Any CPU.Build.0 = Release452|Any CPU
+		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.net46|Any CPU.ActiveCfg = Release46|Any CPU
+		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.net46|Any CPU.Build.0 = Release46|Any CPU
+		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.net461|Any CPU.ActiveCfg = Release461|Any CPU
+		{62C64008-D7DF-4647-8C2B-4F8A15A21631}.net461|Any CPU.Build.0 = Release461|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Nexmo.Api/Nexmo.Api.csproj b/Nexmo.Api/Nexmo.Api.csproj
@@ -22,13 +22,34 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release452|AnyCPU' ">
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\net452\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release46|AnyCPU'">
+    <OutputPath>bin\net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release461|AnyCPU'">
+    <OutputPath>bin\net461\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/Nexmo.Api/Nexmo.Api.nuspec b/Nexmo.Api/Nexmo.Api.nuspec
@@ -2,17 +2,27 @@
 <package >
   <metadata>
     <id>Nexmo.Csharp.Client</id>
-    <version>$version$</version>
+    <version>1.0.0</version>
     <title>Nexmo API Client</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
+    <authors>Nexmo</authors>
+    <owners>Nexmo</owners>
     <licenseUrl>https://github.com/Nexmo/csharp-client/blob/master/LICENSE.md</licenseUrl>
     <projectUrl>https://github.com/Nexmo/csharp-client</projectUrl>
     <iconUrl>https://dashboard.nexmo.com/apple-touch-icon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
+    <description>Official C#/.NET wrapper for the nexmo API</description>
     <releaseNotes>Initial release.</releaseNotes>
     <copyright>© Nexmo 2016</copyright>
     <tags>SMS voice telephony phone nexmo</tags>
+    <dependencies>
+      <group>
+        <dependency id="Newtonsoft.Json" version="8.0.3" />
+      </group>
+    </dependencies>
   </metadata>
+  <files>
+    <file src="bin\net452\Nexmo.Api.dll" target="lib\net452\Nexmo.Api.dll" />
+    <file src="bin\net46\Nexmo.Api.dll" target="lib\net46\Nexmo.Api.dll" />
+    <file src="bin\net461\Nexmo.Api.dll" target="lib\net461\Nexmo.Api.dll" />
+  </files>
 </package>
diff --git a/Nexmo.Web.Sample/Nexmo.Web.Sample.csproj b/Nexmo.Web.Sample/Nexmo.Web.Sample.csproj
@@ -31,13 +31,34 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release452|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release46|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release461|AnyCPU' ">
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -223,6 +244,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release46|AnyCPU'">
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

diff --git a/Nexmo.Web.Sample/Web.config.example b/Nexmo.Web.Sample/Web.config.example
@@ -58,7 +58,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />

diff --git a/README.md b/README.md
@@ -2,15 +2,24 @@ Official C#/.NET wrapper for the nexmo API (http://nexmo.com/)
 
 For full API documentation please refer to https://docs.nexmo.com/
 
-Usage Instructions: 
+Installation:
 ===========================
-_NOTE: NuGet package coming soon!_
+* To install Nexmo API Client, run the following command in the Package Manager Console:
+
+```
+Install-Package Nexmo.Csharp.Client
+```
+
+Alternatively:
 
 * Download or build (see developer instructions) the Nexmo.Api.dll.
 * If you have downloaded a release, ensure you are referencing the
 Newtonsoft.Json.dll dependency by either including it with your project's
 NuGet dependencies or manually referencing it.
 * Reference the assembly in your code.
+
+Configuration:
+===========================
 * Provide your API key, secret, and nexmo URLs in appSettings:
 
 ```XML
@@ -20,6 +29,8 @@ NuGet dependencies or manually referencing it.
 <add key="Nexmo.api_secret" value="<YOUR SECRET>" />
 ```
 
+Usage:
+===========================
 * Use the methods provided to exercise the API. Example:
 
 ```C#
@@ -36,45 +47,10 @@ Make sure to copy web.config.example to web.config and enter your key/secret.
 Developer Instructions: 
 ===========================
 
-We are currently targeting the 4.5.2 framework and using Visual Studio 2013 Update 5.
+We are currently targeting the 4.5.2 - 4.6.1 frameworks and using Visual Studio 2015 Update 1.
 
-1. Get latest code either by cloning the repository or downloading a snapshot of the source
+1. Get latest code either by cloning the repository or downloading a snapshot of the source.
 2. Open "Nexmo.Api.sln"
 3. Build! NuGet dependencies should be brought down automatically; check your settings if they are not.
 
-API support status:
-===================
-
-* Account
-  * [x] Balance
-  * [x] Pricing
-  * [X] Settings
-  * [X] Top Up
-  * [X] Numbers
-* Number
-  * [X] Search
-  * [X] Buy
-  * [X] Cancel
-  * [X] Update
-* NumberInsight
-  * [x] Request
-  * [x] Response
-* NumberVerify
-  * [x] Verify
-  * [x] Check
-  * [x] Search
-* Search
-  * [X] Message
-  * [X] Messages
-  * [X] Rejections
-* Short Code
-  * [X] 2FA
-  * [X] Alerts
-  * [ ] Marketing
-* SMS
-  * [X] Send
-  * [X] Receipt
-  * [X] Inbound
-* Voice
-  * [X] Call
-  * [X] TTS/TTS Prompt
+Pull requests are welcome!