Skip to content

Commit

Permalink
fixing some issues with the summary docs and adding back 452/46 - man…
Browse files Browse the repository at this point in the history 
…aging rearranging some depdnencies in the nuspec file
  • Loading branch information
@slorello89
slorello89 committed May 28, 2020
1 parent b577430 commit 4d7b36e
Show file tree
Hide file tree
Showing 15 changed files with 4,823 additions and 155 deletions.
2 changes: 1 addition & 1 deletion Nexmo.Api/ApplicationV2.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public static AppResponse Get(string appId, Credentials credentials = null)
/// List all of the applications associated with this account
/// </summary>
/// <param name="pageSize">Set the number of items returned on each call to this endpoint. The default is 10 records.</param>
/// <param name="page">Set the offset from the first page. The default value is 0, calls to this endpoint return a page of <page_size>. For example, set page_index to 3 to retrieve items 31 - 40 when page_size is the default value.</param>
/// <param name="page">Set the offset from the first page. The default value is 0, calls to this endpoint return a page of page_size. For example, set page_index to 3 to retrieve items 31 - 40 when page_size is the default value.</param>
/// <param name="AppId">Optional id of specific application to retrieve</param>
/// <param name="credentials">(Optional) Overridden credentials for only this request</param>
/// <returns></returns>
Expand Down
2 changes: 1 addition & 1 deletion Nexmo.Api/Client/ApplicationV2.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public AppResponse Get(string appId, Credentials credentials = null)
/// List all of the applications associated with this account
/// </summary>
/// <param name="pageSize">Set the number of items returned on each call to this endpoint. The default is 10 records.</param>
/// <param name="page">Set the offset from the first page. The default value is 0, calls to this endpoint return a page of <page_size>. For example, set page_index to 3 to retrieve items 31 - 40 when page_size is the default value.</param>
/// <param name="page">Set the offset from the first page. The default value is 0, calls to this endpoint return a page of page_size. For example, set page_index to 3 to retrieve items 31 - 40 when page_size is the default value.</param>
/// <param name="AppId">Optional id of specific application to retrieve</param>
/// <param name="credentials">(Optional) Overridden credentials for only this request</param>
/// <returns></returns>
Expand Down
2 changes: 1 addition & 1 deletion Nexmo.Api/Messaging/SmsClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public SmsClient(Credentials creds)
/// </summary>
/// <param name="request">The SMS message request</param>
/// <param name="creds">(Optional) Overridden credentials for only this request</param>
/// <exception cref="NexmSmsResponseException">Thrown when the status of a message is non-zero or response is empty</exception>
/// <exception cref="NexmoSmsResponseException">Thrown when the status of a message is non-zero or response is empty</exception>
/// <returns></returns>
public SendSmsResponse SendAnSms(SendSmsRequest request, Credentials creds = null)
{
Expand Down
95 changes: 22 additions & 73 deletions Nexmo.Api/Nexmo.Api.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<PropertyGroup>
<VersionPrefix>3.0.0</VersionPrefix>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net452;net46</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>Nexmo.Api</AssemblyName>
<PackageId>Nexmo.Csharp.Client</PackageId>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.0</NetStandardImplicitPackageVersion>
Expand All @@ -14,94 +15,42 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<Version>4.3.1</Version>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Version>5.0.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageLicenseExpression></PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Nexmo/nexmo-dotnet</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/Nexmo/nexmo-dotnet/releases/tag/v3.3.1</PackageReleaseNotes>
<PackageTags>SMS voice telephony phone nexmo</PackageTags>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<NoWarn>1701;1702;1591;1572;1573;0618</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NET452</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
<DefineConstants></DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
<DefineConstants>TRACE;DEBUG;LIBLOG_PORTABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DefineConstants>TRACE;DEBUG;LIBLOG_PORTABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
<DefineConstants>LIBLOG_PORTABLE</DefineConstants>
</PropertyGroup>


<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<DefineConstants>LIBLOG_PORTABLE</DefineConstants>
<DocumentationFile>C:\Users\slore\Documents\projects\nexmo\nexmo-dotnet\Nexmo.Api\Nexmo.Api.xml</DocumentationFile>

</PropertyGroup>
<ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.2.*" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="jose-jwt" Version="2.3.*" />
<PackageReference Include="System.Collections.Immutable" Version="1.2.*" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="System.Diagnostics.Process" Version="4.1.*" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Security.Cryptography.OpenSsl" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.4.0" />
</ItemGroup>

</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Diagnostics.Process" Version="4.1.*" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
<PackageReference Include="jose-jwt" Version="2.3.*" />
<PackageReference Include="System.Collections.Immutable" Version="1.2.*" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Diagnostics.Process" Version="4.1.*" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Security.Cryptography.OpenSsl" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.4.0" />
Expand Down
72 changes: 6 additions & 66 deletions Nexmo.Api/Nexmo.Api.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,85 +15,28 @@
* Fixed bug where loop parameter would be truncated if set to 0
* Fixed bug that would cause certain User Agent's to throw errors on certain Operating Systems
</releaseNotes>
<copyright>© Nexmo 2018</copyright>
<tags>SMS voice telephony phone nexmo</tags>
<copyright>© Nexmo 2020</copyright>
<tags>SMS voice telephony phone nexmo vonage</tags>
<dependencies>
<group targetFramework="net452">
<!-- Default dependencies -->
<dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />
</group>
<group targetFramework="net46">
<!-- Default dependencies -->
<dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />
</group>
<group targetFramework="net461">
<!-- Default dependencies -->
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />
</group>
<group targetFramework="net462">
<!-- Default dependencies -->
<dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />
</group>
<group targetFramework="net471">
<!-- Default dependencies -->
<dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
<group targetFramework="net46">
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />
</group>



<group targetFramework="netstandard1.6">
<!-- (copied from above as NuGet doesn't cascade deps) -->
<!-- Default dependencies -->
<dependency id="Microsoft.AspNetCore.Mvc" version="1.1.8"/>
<dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />

<!-- Additional .NET Standard dependencies -->
<dependency id="System.Diagnostics.Process" version="4.1.0" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.3.1" />
<dependency id="System.Security.Cryptography.OpenSsl" version="4.4.0" />
<dependency id="System.Security.Cryptography.Cng" version="4.4.0" />
</group>
<group targetFramework="netstandard2.0">
<!-- (copied from above as NuGet doesn't cascade deps) -->
Expand All @@ -103,13 +46,14 @@
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration" version="1.1.2" />
<dependency id="Microsoft.Extensions.Configuration.Json" version="1.1.2" />
<dependency id="NETStandard.Library" version="1.6.1" />
<!--<dependency id="NETStandard.Library" version="1.6.1" />-->
<dependency id="System.Collections.Immutable" version="1.2.0"/>
<!-- non-MS -->
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="jose-jwt" version="2.3.0" />

<!-- Additional .NET Standard dependencies -->
<dependency id="System.ComponentModel.Annotations" version="4.7.0" />
<dependency id="System.Diagnostics.Process" version="4.1.0" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.3.1" />
<dependency id="System.Security.Cryptography.OpenSsl" version="4.4.0" />
Expand All @@ -119,11 +63,7 @@
</metadata>
<files>
<file src="bin\Release\net452\Nexmo.Api.dll" target="lib\net452\Nexmo.Api.dll" />
<file src="bin\Release\net46\Nexmo.Api.dll" target="lib\net46\Nexmo.Api.dll" />
<file src="bin\Release\net461\Nexmo.Api.dll" target="lib\net461\Nexmo.Api.dll" />
<file src="bin\Release\net462\Nexmo.Api.dll" target="lib\net462\Nexmo.Api.dll" />
<file src="bin\Release\net471\Nexmo.Api.dll" target="lib\net471\Nexmo.Api.dll" />
<file src="bin\Release\netstandard1.6\Nexmo.Api.dll" target="lib\netstandard1.6\Nexmo.Api.dll" />
<file src="bin\Release\net46\Nexmo.Api.dll" target="lib\net46\Nexmo.Api.dll" />
<file src="bin\Release\netstandard2.0\Nexmo.Api.dll" target="lib\netstandard2.0\Nexmo.Api.dll" />
</files>
</package>
Loading

0 comments on commit 4d7b36e

Please sign in to comment.