From 01172f6d91e4617a19d1756908025e17c265f5aa Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 4 Aug 2015 12:48:18 -0500 Subject: [PATCH 1/2] Fix CDN WaitForServiceDeleted It was ignoring all the timeout and progress parameters. --- .../v1/ContentDeliveryNetworkServiceExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceExtensions.cs b/src/corelib/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceExtensions.cs index caed86f68..286e93491 100644 --- a/src/corelib/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceExtensions.cs +++ b/src/corelib/ContentDeliveryNetworks/v1/ContentDeliveryNetworkServiceExtensions.cs @@ -173,7 +173,7 @@ public static Service WaitForServiceDeployed(this IContentDeliveryNetworkService /// If the API call returns a bad . public static void WaitForServiceDeleted(this IContentDeliveryNetworkService cdnService, string serviceId, TimeSpan? refreshDelay = null, TimeSpan? timeout = null, IProgress progress = null) { - cdnService.WaitForServiceDeletedAsync(serviceId).ForceSynchronous(); + cdnService.WaitForServiceDeletedAsync(serviceId, refreshDelay, timeout, progress).ForceSynchronous(); } } } From 8776c01b5983569c3a0c2e7b8c7de08bf77bea76 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 4 Aug 2015 13:45:24 -0500 Subject: [PATCH 2/2] Bump to 1.4.1 Switching to semver, which means that the next number is 1.4.1 instead of the previous pattern 1.4.0.3 --- build/build.proj | 2 +- src/corelib/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.proj b/build/build.proj index 77e7fc032..b36091ae7 100644 --- a/build/build.proj +++ b/build/build.proj @@ -3,7 +3,7 @@ Debug - 1.4.0.2 + 1.4.1.0 $(LocalAppData)\NuGet\NuGet.exe "$(MSBuildToolsPath)\MSBuild.exe" diff --git a/src/corelib/Properties/AssemblyInfo.cs b/src/corelib/Properties/AssemblyInfo.cs index 55adcdad0..1be92b664 100644 --- a/src/corelib/Properties/AssemblyInfo.cs +++ b/src/corelib/Properties/AssemblyInfo.cs @@ -25,8 +25,8 @@ // Refer to the following issue before changing these version numbers: // https://github.com/JSIStudios/SimpleRestServices/issues/53 [assembly: AssemblyVersion("1.4.0.0")] -[assembly: AssemblyFileVersion("1.4.0.2")] -[assembly: AssemblyInformationalVersion("1.4.0.2")] +[assembly: AssemblyFileVersion("1.4.1.0")] +[assembly: AssemblyInformationalVersion("1.4.1.0")] [assembly: InternalsVisibleTo("OpenStackNet.Testing.Integration, PublicKey=002400000480000094000000060200000024000052534131000400000100010097de8570a3c78aa87191a604e55b95acf1a5075a317d622ab84287f8267b45755a46894b653c8b72d6d38815d2fa2dde8ba5d61c26ce8d5f398dc74ac3eb945fe1c3447753bdf4a3bfc1de3a489c4b5fb82f4cdc67681efffbd627ceca15531f638db991a702d7b8ad6825b51a151db543bad746a157b59ef325e0f44fe1bed1")] [assembly: InternalsVisibleTo("OpenStackNet.Testing.Unit, PublicKey=002400000480000094000000060200000024000052534131000400000100010097de8570a3c78aa87191a604e55b95acf1a5075a317d622ab84287f8267b45755a46894b653c8b72d6d38815d2fa2dde8ba5d61c26ce8d5f398dc74ac3eb945fe1c3447753bdf4a3bfc1de3a489c4b5fb82f4cdc67681efffbd627ceca15531f638db991a702d7b8ad6825b51a151db543bad746a157b59ef325e0f44fe1bed1")]