Develop

Build.proj

@@ -8,19 +8,20 @@
 		<ToolsFolder>tools</ToolsFolder>
 		<BuildFolder>build</BuildFolder>
 		<ReleasePkgFolder>$(BuildFolder)/pkg</ReleasePkgFolder>
-		<TestAssemblies>src/CallfireApiClient.Tests/bin/Release/callfire-api-client-tests.dll</TestAssemblies>
-		<TestResultsFolder>src/CallfireApiClient.Tests/TestResults</TestResultsFolder>
+		<TestAssemblies>src\CallfireApiClient.Tests\bin\Release\callfire-api-client-tests.dll</TestAssemblies>
+		<TestResultsFolder>src\CallfireApiClient.Tests\TestResults</TestResultsFolder>
 		<PackagesFolder>packages</PackagesFolder>
 		<NuSpecFile>CallfireApiClient.nuspec</NuSpecFile>
-		<NuGetExec>tools/nuget/nuget.exe</NuGetExec>
-		<NUnitExec>packages/NUnit.Runners.Net4.2.6.4/tools/nunit-console.exe -work=$(TestResultsFolder) $(TestAssemblies)</NUnitExec>
+		<NuGetExec>tools\nuget\nuget.exe</NuGetExec>
+		<MonoInstallation>$(MONO_HOME)</MonoInstallation>
+		<MonoMdbGenerator>\bin\pdb2mdb.bat</MonoMdbGenerator>
+		<NUnitExec>packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console.exe -work=$(TestResultsFolder) $(TestAssemblies)</NUnitExec>
 	</PropertyGroup>
 	<Target Name="Run">
 		<CallTarget Targets="Clean" />
 		<CallTarget Targets="Restore" />
 		<CallTarget Targets="Build-Release" />
 		<CallTarget Targets="Build-Debug" />
-		<CallTarget Targets="Test" />
 		<CallTarget Targets="UpdateNuspecVersion" />
 		<CallTarget Targets="PackageZip" />
 		<CallTarget Targets="PackageNuGet" />
@@ -42,16 +43,16 @@
 	</Target>
 	<Target Name="Build-Release" DependsOnTargets="Restore">
 		<ItemGroup>
-			<ProjectToBuild Include="src/CallfireApiClient/CallfireApiClient.csproj" />
-			<ProjectToBuild Include="src/CallfireApiClient.Tests/CallfireApiClient.Tests.csproj" />
-			<ProjectToBuild Include="src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj" />
+			<ProjectToBuild Include="src\CallfireApiClient\CallfireApiClient.csproj" />
+			<ProjectToBuild Include="src\CallfireApiClient.Tests\CallfireApiClient.Tests.csproj" />
+			<ProjectToBuild Include="src\CallfireApiClient.IntegrationTests\CallfireApiClient.IntegrationTests.csproj" />
 		</ItemGroup>
 		<Message Text="building project" />
 		<MSBuild Projects="@(ProjectToBuild)" Properties="Configuration=Release" ContinueOnError="False" />
 	</Target>
   <Target Name="Build-Debug" DependsOnTargets="Restore">
 		<ItemGroup>
-			<ProjectToBuild Include="src/CallfireApiClient/CallfireApiClient.csproj" />
+			<ProjectToBuild Include="src\CallfireApiClient\CallfireApiClient.csproj" />
 		</ItemGroup>
 		<Message Text="building project" />
 		<MSBuild Projects="@(ProjectToBuild)" Properties="Configuration=Debug" ContinueOnError="False" />
@@ -61,33 +62,37 @@
 		<Exec Command="$(NUnitExec)" Condition="'$(OS)' != 'Unix'" />
 		<Exec Command="mono $(NUnitExec)" Condition="'$(OS)' == 'Unix'" />
 	</Target>
-	<Target Name="UpdateNuspecVersion" DependsOnTargets="Test">
-		<VersionTask AssemblyPath="src/CallfireApiClient/bin/Release/callfire-api-client.dll">
+	<Target Name="UpdateNuspecVersion" DependsOnTargets="Build-Release">
+		<VersionTask AssemblyPath="src\CallfireApiClient\bin\Release\callfire-api-client.dll">
 			<Output TaskParameter="Version" PropertyName="Version" />
 		</VersionTask>
 		<Message Text="updating version: to $(Version)" />
 		<XmlTask XmlFileName="$(NuSpecFile)" XPath="//metadata/version" Value="$(Version)" />
 		<XmlTask XmlFileName="$(NuSpecFile)" XPath="//metadata/releaseNotes" Value="$([System.IO.File]::ReadAllText('Changelog'))" />
 		<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'"/>
-		<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'"/>
+		<CallTarget Targets="GenerateMonoSymbols" Condition=" Exists('src\CallfireApiClient\bin\Debug\callfire-api-client.pdb')" />
+		<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')" />
 	</Target>
-	<Target Name="PackageZip" DependsOnTargets="Test">
+	<Target Name="GenerateMonoSymbols">
+		<Exec Command="&quot;$(MonoInstallation)$(MonoMdbGenerator)&quot; src\CallfireApiClient\bin\Debug\callfire-api-client.dll" Condition="'$(MonoInstallation)'!=''"/>
+	</Target>
+	<Target Name="PackageZip" DependsOnTargets="Build-Release">
 		<Message Text="creating zip package ..." />
 		<ItemGroup>
-			<ZipFiles Include="src/CallfireApiClient/bin/Release/callfire-api-client.dll" />
-			<ZipFiles Include="src/CallfireApiClient/bin/Release/callfire-api-client.dll.config" />
-			<ZipFiles Include="src/CallfireApiClient/bin/Release/callfire-api-client.xml" />
+			<ZipFiles Include="src\CallfireApiClient\bin\Release\callfire-api-client.dll" />
+			<ZipFiles Include="src\CallfireApiClient\bin\Release\callfire-api-client.dll.config" />
+			<ZipFiles Include="src\CallfireApiClient\bin\Release\callfire-api-client.xml" />
 			<ZipFiles Include="LICENSE" />
 			<ZipFiles Include="Changelog" />
 		</ItemGroup>
-		<VersionTask AssemblyPath="src/CallfireApiClient/bin/Release/callfire-api-client.dll">
+		<VersionTask AssemblyPath="src\CallfireApiClient\bin\Release\callfire-api-client.dll">
 			<Output TaskParameter="Version" PropertyName="Version" />
 		</VersionTask>
-		<ZipTask Files="@(ZipFiles)" ZipFileName="$(ReleasePkgFolder)/CallfireApiClient.$(Version).zip" />
+		<ZipTask Files="@(ZipFiles)" ZipFileName="$(ReleasePkgFolder)\CallfireApiClient.$(Version).zip" />
 	</Target>
 	<Target Name="PackageNuGet" DependsOnTargets="UpdateNuspecVersion">
 		<Message Text="creating NuGet package(s) ..." Importance="high" />
 		<Exec Command="$(NuGetExec) pack $(NuSpecFile) -symbols -o $(ReleasePkgFolder)" Condition="'$(OS)' != 'Unix'" />
-		<Exec Command="mono $(NuGetExec) pack $(NuSpecFile) -symbols -o $(ReleasePkgFolder)" Condition="'$(OS)' == 'Unix'" />
+		<Exec Command="mono $(NuGetExec) pack $(NuSpecFile) -o $(ReleasePkgFolder)" Condition="'$(OS)' == 'Unix'" />
 	</Target>
 </Project>

CallfireApiClient.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>CallfireApiClient</id>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <title>CallFire API v2 client</title>
     <authors>
 			Vladimir Mikhailov
@@ -16,6 +16,9 @@
     <description>C# client library for integration with Callfire REST API v2 services</description>
     <releaseNotes>Callfire API client Changelog
 =============================
+Version 1.1.6 - Mar 25 2016
+    - added mono debug files generation on Windows platform
+
 Version 1.1.5 - Mar 14 2016
     - added debug support for Mono platform
     - fixed issue with uploading mp3 media
@@ -50,8 +53,8 @@ Version 1.0.0 - Dec 29 2015
     <file src="**/*.cs" target="src" />
     <file src="LICENSE" />
     <file src="Changelog" />
-    <file src="src/CallfireApiClient/bin/Release/callfire-api-client.dll" target="lib" />
+    <file src="src/CallfireApiClient/bin/Debug/callfire-api-client.dll" target="lib" />
     <file src="src/CallfireApiClient/bin/Release/callfire-api-client.dll.config" target="lib" />
     <file src="src/CallfireApiClient/bin/Release/callfire-api-client.xml" target="lib" />
   </files>
-</package>
+</package>

Changelog

@@ -1,5 +1,8 @@
 Callfire API client Changelog
 =============================
+Version 1.1.6 - Mar 25 2016
+    - added mono debug files generation on Windows platform
+
 Version 1.1.5 - Mar 14 2016
     - added debug support for Mono platform
     - fixed issue with uploading mp3 media

docs/GettingStarted.adoc

@@ -10,9 +10,16 @@ or using nuget console tool:
 [source]
 $ nuget install CallfireApiClient
 
-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]
+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].
 After these steps *CallfireApiClient* should appear in your project dependencies along with other transitive ones.
 
+* Note for Visual Studio installation: to be able to use api client please manually copy callfire-api-client.dll.config from your
+solutionFolder\packages\CallfireApiClient.?.?.? folder to target dir.
+You can use post-build event for that (https://msdn.microsoft.com/en-us/library/ke5z92ks.aspx).
+Command example for post-build event:
+[source]
+xcopy "$(SolutionDir)packages\CallfireApiClient.?.?.?\lib\callfire-api-client.dll.config" "$(TargetDir)" /i /R /Y
+
 In case you want to build it yourself:
 [source]
     $ git clone https://github.com/CallFire/callfire-api-client-csharp.git

src/CallfireApiClient.Tests/Api/ProxyIntegrationTest.cs → src/CallfireApiClient.IntegrationTests/Api/ProxyIntegrationTest.cs

@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace CallfireApiClient.Tests.Api
+namespace CallfireApiClient.IntegrationTests.Api
 {
     [TestFixture, Ignore]
     public class ProxyIntegrationTest

src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj

@@ -53,6 +53,7 @@
     <Compile Include="Api\Account\MeApiIntegrationTest.cs" />
     <Compile Include="Api\Account\OrdersApiIntegrationTest.cs" />
     <Compile Include="Api\AbstractIntegrationTest.cs" />
+    <Compile Include="Api\ProxyIntegrationTest.cs" />
     <Compile Include="Api\Webhooks\WebhooksApiIntegrationTest.cs" />
     <Compile Include="Api\Contacts\ContactsApiIntegrationTest.cs" />
     <Compile Include="Api\Numbers\NumberLeasesApiIntegrationTest.cs" />

src/CallfireApiClient.Tests/Api/AbstractApiTest.cs

@@ -13,7 +13,7 @@ public class AbstractApiTest
         protected const long TEST_LONG = 100500;
         protected const string TEST_STRING = "test";
         protected const string FIELDS = "id,name,created";
-        protected string ENCODED_FIELDS = "fields=" + WebUtility.UrlEncode(FIELDS);
+        protected string ENCODED_FIELDS = "fields=" + Uri.EscapeUriString(FIELDS);
         protected const string BASE_PATH = "../../JsonMocks";
         protected const string EMPTY_ID_MSG = "id cannot be null";
         protected const string EMPTY_REQUEST_ID_MSG = "request.id cannot be null";

src/CallfireApiClient.Tests/Utilities/VersionTask.cs

@@ -1,8 +1,8 @@
 using System;
 using Microsoft.Build.Utilities;
 using Microsoft.Build.Framework;
-using System.Xml;
 using System.Reflection;
+using System.IO;
 
 namespace CallfireApiClient.Tests.Utilities
 {
@@ -18,7 +18,7 @@ public override bool Execute()
         {
             try
             {
-                var _version = Assembly.LoadFile(AssemblyPath).GetName().Version;
+                var _version = Assembly.LoadFile(Path.GetFullPath(AssemblyPath)).GetName().Version;
                 Version = string.Format("{0}.{1}.{2}", _version.Major, _version.Minor, _version.Build);
             }
             catch (Exception ex)

src/CallfireApiClient/Properties/AssemblyInfo.cs

@@ -13,7 +13,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.1.5.*")]
+[assembly: AssemblyVersion("1.1.6.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.