Skip to content

Commit 323c49b

Browse files
vmalinovskiyvmalinovskiy
committed
Merge pull request #28 from CallFire/develop
Develop
2 parents 8f584d0 + 1e9aaaf commit 323c49b

File tree

9 files changed

+47
-28
lines changed

9 files changed

+47
-28
lines changed

‎Build.proj‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@
88
<ToolsFolder>tools</ToolsFolder>
99
<BuildFolder>build</BuildFolder>
1010
<ReleasePkgFolder>$(BuildFolder)/pkg</ReleasePkgFolder>
11-
<TestAssemblies>src/CallfireApiClient.Tests/bin/Release/callfire-api-client-tests.dll</TestAssemblies>
12-
<TestResultsFolder>src/CallfireApiClient.Tests/TestResults</TestResultsFolder>
11+
<TestAssemblies>src\CallfireApiClient.Tests\bin\Release\callfire-api-client-tests.dll</TestAssemblies>
12+
<TestResultsFolder>src\CallfireApiClient.Tests\TestResults</TestResultsFolder>
1313
<PackagesFolder>packages</PackagesFolder>
1414
<NuSpecFile>CallfireApiClient.nuspec</NuSpecFile>
15-
<NuGetExec>tools/nuget/nuget.exe</NuGetExec>
16-
<NUnitExec>packages/NUnit.Runners.Net4.2.6.4/tools/nunit-console.exe -work=$(TestResultsFolder) $(TestAssemblies)</NUnitExec>
15+
<NuGetExec>tools\nuget\nuget.exe</NuGetExec>
16+
<MonoInstallation>$(MONO_HOME)</MonoInstallation>
17+
<MonoMdbGenerator>\bin\pdb2mdb.bat</MonoMdbGenerator>
18+
<NUnitExec>packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console.exe -work=$(TestResultsFolder) $(TestAssemblies)</NUnitExec>
1719
</PropertyGroup>
1820
<Target Name="Run">
1921
<CallTarget Targets="Clean" />
2022
<CallTarget Targets="Restore" />
2123
<CallTarget Targets="Build-Release" />
2224
<CallTarget Targets="Build-Debug" />
23-
<CallTarget Targets="Test" />
2425
<CallTarget Targets="UpdateNuspecVersion" />
2526
<CallTarget Targets="PackageZip" />
2627
<CallTarget Targets="PackageNuGet" />
@@ -42,16 +43,16 @@
4243
</Target>
4344
<Target Name="Build-Release" DependsOnTargets="Restore">
4445
<ItemGroup>
45-
<ProjectToBuild Include="src/CallfireApiClient/CallfireApiClient.csproj" />
46-
<ProjectToBuild Include="src/CallfireApiClient.Tests/CallfireApiClient.Tests.csproj" />
47-
<ProjectToBuild Include="src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj" />
46+
<ProjectToBuild Include="src\CallfireApiClient\CallfireApiClient.csproj" />
47+
<ProjectToBuild Include="src\CallfireApiClient.Tests\CallfireApiClient.Tests.csproj" />
48+
<ProjectToBuild Include="src\CallfireApiClient.IntegrationTests\CallfireApiClient.IntegrationTests.csproj" />
4849
</ItemGroup>
4950
<Message Text="building project" />
5051
<MSBuild Projects="@(ProjectToBuild)" Properties="Configuration=Release" ContinueOnError="False" />
5152
</Target>
5253
<Target Name="Build-Debug" DependsOnTargets="Restore">
5354
<ItemGroup>
54-
<ProjectToBuild Include="src/CallfireApiClient/CallfireApiClient.csproj" />
55+
<ProjectToBuild Include="src\CallfireApiClient\CallfireApiClient.csproj" />
5556
</ItemGroup>
5657
<Message Text="building project" />
5758
<MSBuild Projects="@(ProjectToBuild)" Properties="Configuration=Debug" ContinueOnError="False" />
@@ -61,33 +62,37 @@
6162
<Exec Command="$(NUnitExec)" Condition="'$(OS)' != 'Unix'" />
6263
<Exec Command="mono $(NUnitExec)" Condition="'$(OS)' == 'Unix'" />
6364
</Target>
64-
<Target Name="UpdateNuspecVersion" DependsOnTargets="Test">
65-
<VersionTask AssemblyPath="src/CallfireApiClient/bin/Release/callfire-api-client.dll">
65+
<Target Name="UpdateNuspecVersion" DependsOnTargets="Build-Release">
66+
<VersionTask AssemblyPath="src\CallfireApiClient\bin\Release\callfire-api-client.dll">
6667
<Output TaskParameter="Version" PropertyName="Version" />
6768
</VersionTask>
6869
<Message Text="updating version: to $(Version)" />
6970
<XmlTask XmlFileName="$(NuSpecFile)" XPath="//metadata/version" Value="$(Version)" />
7071
<XmlTask XmlFileName="$(NuSpecFile)" XPath="//metadata/releaseNotes" Value="$([System.IO.File]::ReadAllText('Changelog'))" />
7172
<XmlTask XmlFileName="$(NuSpecFile)" XPath="//files" Value="&lt;file src=&quot;src/CallfireApiClient/bin/Debug/callfire-api-client.pdb&quot; target=&quot;lib&quot; /&gt;" AddValueAsChildNode="true" Condition="'$(OS)' != 'Unix'"/>
72-
<XmlTask XmlFileName="$(NuSpecFile)" XPath="//files" Value="&lt;file src=&quot;src/CallfireApiClient/bin/Debug/callfire-api-client.dll.mdb&quot; target=&quot;lib&quot; /&gt;" AddValueAsChildNode="true" Condition="'$(OS)' == 'Unix'"/>
73+
<CallTarget Targets="GenerateMonoSymbols" Condition=" Exists('src\CallfireApiClient\bin\Debug\callfire-api-client.pdb')" />
74+
<XmlTask XmlFileName="$(NuSpecFile)" XPath="//files" Value="&lt;file src=&quot;src/CallfireApiClient/bin/Debug/callfire-api-client.dll.mdb&quot; target=&quot;lib&quot; /&gt;" AddValueAsChildNode="true" Condition=" Exists('src\CallfireApiClient\bin\Debug\callfire-api-client.dll.mdb')" />
7375
</Target>
74-
<Target Name="PackageZip" DependsOnTargets="Test">
76+
<Target Name="GenerateMonoSymbols">
77+
<Exec Command="&quot;$(MonoInstallation)$(MonoMdbGenerator)&quot; src\CallfireApiClient\bin\Debug\callfire-api-client.dll" Condition="'$(MonoInstallation)'!=''"/>
78+
</Target>
79+
<Target Name="PackageZip" DependsOnTargets="Build-Release">
7580
<Message Text="creating zip package ..." />
7681
<ItemGroup>
77-
<ZipFiles Include="src/CallfireApiClient/bin/Release/callfire-api-client.dll" />
78-
<ZipFiles Include="src/CallfireApiClient/bin/Release/callfire-api-client.dll.config" />
79-
<ZipFiles Include="src/CallfireApiClient/bin/Release/callfire-api-client.xml" />
82+
<ZipFiles Include="src\CallfireApiClient\bin\Release\callfire-api-client.dll" />
83+
<ZipFiles Include="src\CallfireApiClient\bin\Release\callfire-api-client.dll.config" />
84+
<ZipFiles Include="src\CallfireApiClient\bin\Release\callfire-api-client.xml" />
8085
<ZipFiles Include="LICENSE" />
8186
<ZipFiles Include="Changelog" />
8287
</ItemGroup>
83-
<VersionTask AssemblyPath="src/CallfireApiClient/bin/Release/callfire-api-client.dll">
88+
<VersionTask AssemblyPath="src\CallfireApiClient\bin\Release\callfire-api-client.dll">
8489
<Output TaskParameter="Version" PropertyName="Version" />
8590
</VersionTask>
86-
<ZipTask Files="@(ZipFiles)" ZipFileName="$(ReleasePkgFolder)/CallfireApiClient.$(Version).zip" />
91+
<ZipTask Files="@(ZipFiles)" ZipFileName="$(ReleasePkgFolder)\CallfireApiClient.$(Version).zip" />
8792
</Target>
8893
<Target Name="PackageNuGet" DependsOnTargets="UpdateNuspecVersion">
8994
<Message Text="creating NuGet package(s) ..." Importance="high" />
9095
<Exec Command="$(NuGetExec) pack $(NuSpecFile) -symbols -o $(ReleasePkgFolder)" Condition="'$(OS)' != 'Unix'" />
91-
<Exec Command="mono $(NuGetExec) pack $(NuSpecFile) -symbols -o $(ReleasePkgFolder)" Condition="'$(OS)' == 'Unix'" />
96+
<Exec Command="mono $(NuGetExec) pack $(NuSpecFile) -o $(ReleasePkgFolder)" Condition="'$(OS)' == 'Unix'" />
9297
</Target>
9398
</Project>

‎CallfireApiClient.nuspec‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>CallfireApiClient</id>
5-
<version>1.1.5</version>
5+
<version>1.1.6</version>
66
<title>CallFire API v2 client</title>
77
<authors>
88
Vladimir Mikhailov
@@ -16,6 +16,9 @@
1616
<description>C# client library for integration with Callfire REST API v2 services</description>
1717
<releaseNotes>Callfire API client Changelog
1818
=============================
19+
Version 1.1.6 - Mar 25 2016
20+
- added mono debug files generation on Windows platform
21+
1922
Version 1.1.5 - Mar 14 2016
2023
- added debug support for Mono platform
2124
- fixed issue with uploading mp3 media
@@ -50,8 +53,8 @@ Version 1.0.0 - Dec 29 2015
5053
<file src="**/*.cs" target="src" />
5154
<file src="LICENSE" />
5255
<file src="Changelog" />
53-
<file src="src/CallfireApiClient/bin/Release/callfire-api-client.dll" target="lib" />
56+
<file src="src/CallfireApiClient/bin/Debug/callfire-api-client.dll" target="lib" />
5457
<file src="src/CallfireApiClient/bin/Release/callfire-api-client.dll.config" target="lib" />
5558
<file src="src/CallfireApiClient/bin/Release/callfire-api-client.xml" target="lib" />
5659
</files>
57-
</package>
60+
</package>

‎Changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Callfire API client Changelog
22
=============================
3+
Version 1.1.6 - Mar 25 2016
4+
- added mono debug files generation on Windows platform
5+
36
Version 1.1.5 - Mar 14 2016
47
- added debug support for Mono platform
58
- fixed issue with uploading mp3 media

‎docs/GettingStarted.adoc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@ or using nuget console tool:
1010
[source]
1111
$ nuget install CallfireApiClient
1212

13-
it will install the latest public version, other releases you can find at link:https://github.com/CallFire/callfire-api-client-csharp/releases[releases page]
13+
it will install the latest public version, other releases you can find at link:https://github.com/CallFire/callfire-api-client-csharp/releases[releases page].
1414
After these steps *CallfireApiClient* should appear in your project dependencies along with other transitive ones.
1515

16+
* Note for Visual Studio installation: to be able to use api client please manually copy callfire-api-client.dll.config from your
17+
solutionFolder\packages\CallfireApiClient.?.?.? folder to target dir.
18+
You can use post-build event for that (https://msdn.microsoft.com/en-us/library/ke5z92ks.aspx).
19+
Command example for post-build event:
20+
[source]
21+
xcopy "$(SolutionDir)packages\CallfireApiClient.?.?.?\lib\callfire-api-client.dll.config" "$(TargetDir)" /i /R /Y
22+
1623
In case you want to build it yourself:
1724
[source]
1825
$ git clone https://github.com/CallFire/callfire-api-client-csharp.git

src/CallfireApiClient.Tests/Api/ProxyIntegrationTest.cs renamed to src/CallfireApiClient.IntegrationTests/Api/ProxyIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using NUnit.Framework;
33

4-
namespace CallfireApiClient.Tests.Api
4+
namespace CallfireApiClient.IntegrationTests.Api
55
{
66
[TestFixture, Ignore]
77
public class ProxyIntegrationTest

‎src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<Compile Include="Api\Account\MeApiIntegrationTest.cs" />
5454
<Compile Include="Api\Account\OrdersApiIntegrationTest.cs" />
5555
<Compile Include="Api\AbstractIntegrationTest.cs" />
56+
<Compile Include="Api\ProxyIntegrationTest.cs" />
5657
<Compile Include="Api\Webhooks\WebhooksApiIntegrationTest.cs" />
5758
<Compile Include="Api\Contacts\ContactsApiIntegrationTest.cs" />
5859
<Compile Include="Api\Numbers\NumberLeasesApiIntegrationTest.cs" />

‎src/CallfireApiClient.Tests/Api/AbstractApiTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class AbstractApiTest
1313
protected const long TEST_LONG = 100500;
1414
protected const string TEST_STRING = "test";
1515
protected const string FIELDS = "id,name,created";
16-
protected string ENCODED_FIELDS = "fields=" + WebUtility.UrlEncode(FIELDS);
16+
protected string ENCODED_FIELDS = "fields=" + Uri.EscapeUriString(FIELDS);
1717
protected const string BASE_PATH = "../../JsonMocks";
1818
protected const string EMPTY_ID_MSG = "id cannot be null";
1919
protected const string EMPTY_REQUEST_ID_MSG = "request.id cannot be null";

‎src/CallfireApiClient.Tests/Utilities/VersionTask.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using Microsoft.Build.Utilities;
33
using Microsoft.Build.Framework;
4-
using System.Xml;
54
using System.Reflection;
5+
using System.IO;
66

77
namespace CallfireApiClient.Tests.Utilities
88
{
@@ -18,7 +18,7 @@ public override bool Execute()
1818
{
1919
try
2020
{
21-
var _version = Assembly.LoadFile(AssemblyPath).GetName().Version;
21+
var _version = Assembly.LoadFile(Path.GetFullPath(AssemblyPath)).GetName().Version;
2222
Version = string.Format("{0}.{1}.{2}", _version.Major, _version.Minor, _version.Build);
2323
}
2424
catch (Exception ex)

‎src/CallfireApiClient/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1414
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1515

16-
[assembly: AssemblyVersion("1.1.5.*")]
16+
[assembly: AssemblyVersion("1.1.6.*")]
1717

1818
// The following attributes are used to specify the signing key for the assembly,
1919
// if desired. See the Mono documentation for more information about signing.

0 commit comments

Comments
 (0)