diff --git a/Build.proj b/Build.proj
index 39d0469..c44bdc4 100644
--- a/Build.proj
+++ b/Build.proj
@@ -8,19 +8,20 @@
tools
build
$(BuildFolder)/pkg
- src/CallfireApiClient.Tests/bin/Release/callfire-api-client-tests.dll
- src/CallfireApiClient.Tests/TestResults
+ src\CallfireApiClient.Tests\bin\Release\callfire-api-client-tests.dll
+ src\CallfireApiClient.Tests\TestResults
packages
CallfireApiClient.nuspec
- tools/nuget/nuget.exe
- packages/NUnit.Runners.Net4.2.6.4/tools/nunit-console.exe -work=$(TestResultsFolder) $(TestAssemblies)
+ tools\nuget\nuget.exe
+ $(MONO_HOME)
+ \bin\pdb2mdb.bat
+ packages\NUnit.Runners.Net4.2.6.4\tools\nunit-console.exe -work=$(TestResultsFolder) $(TestAssemblies)
-
@@ -42,16 +43,16 @@
-
-
-
+
+
+
-
+
@@ -61,33 +62,37 @@
-
-
+
+
-
+
+
-
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/CallfireApiClient.nuspec b/CallfireApiClient.nuspec
index 36f37e9..ef2e2db 100644
--- a/CallfireApiClient.nuspec
+++ b/CallfireApiClient.nuspec
@@ -2,7 +2,7 @@
CallfireApiClient
- 1.1.5
+ 1.1.6
CallFire API v2 client
Vladimir Mikhailov
@@ -16,6 +16,9 @@
C# client library for integration with Callfire REST API v2 services
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
-
+
-
+
\ No newline at end of file
diff --git a/Changelog b/Changelog
index 3ff327c..11c5f89 100644
--- a/Changelog
+++ b/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
diff --git a/docs/GettingStarted.adoc b/docs/GettingStarted.adoc
index 7393142..6ccdf43 100644
--- a/docs/GettingStarted.adoc
+++ b/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
diff --git a/src/CallfireApiClient.Tests/Api/ProxyIntegrationTest.cs b/src/CallfireApiClient.IntegrationTests/Api/ProxyIntegrationTest.cs
similarity index 92%
rename from src/CallfireApiClient.Tests/Api/ProxyIntegrationTest.cs
rename to src/CallfireApiClient.IntegrationTests/Api/ProxyIntegrationTest.cs
index 07bf0be..0ab788f 100644
--- a/src/CallfireApiClient.Tests/Api/ProxyIntegrationTest.cs
+++ b/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
diff --git a/src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj b/src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj
index 24bb616..8802b0a 100644
--- a/src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj
+++ b/src/CallfireApiClient.IntegrationTests/CallfireApiClient.IntegrationTests.csproj
@@ -53,6 +53,7 @@
+
diff --git a/src/CallfireApiClient.Tests/Api/AbstractApiTest.cs b/src/CallfireApiClient.Tests/Api/AbstractApiTest.cs
index 22e7221..47f8380 100644
--- a/src/CallfireApiClient.Tests/Api/AbstractApiTest.cs
+++ b/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";
diff --git a/src/CallfireApiClient.Tests/Utilities/VersionTask.cs b/src/CallfireApiClient.Tests/Utilities/VersionTask.cs
index c9dfae1..c54e448 100644
--- a/src/CallfireApiClient.Tests/Utilities/VersionTask.cs
+++ b/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)
diff --git a/src/CallfireApiClient/Properties/AssemblyInfo.cs b/src/CallfireApiClient/Properties/AssemblyInfo.cs
index 58f3c40..49bc050 100644
--- a/src/CallfireApiClient/Properties/AssemblyInfo.cs
+++ b/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.