Update Fluent to support an overload for creating a cloud service with custom package and configuration.

Author: isaacabraham

Elastacloud.AzureManagement.Fluent.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Elastacloud.AzureManagement.Fluent</id>
-        <version>0.5.1.2</version>
+        <version>0.5.1.3</version>
         <title>Azure Fluent Management Library</title>
         <authors>Elastacloud Limited (@azurecoder,@andybareweb,@isaac_abraham)</authors>
         <owners>Elastacloud Limited</owners>

Elastacloud.AzureManagement.Fluent/Clients/ServiceClient.cs

@@ -7,10 +7,6 @@
  * Email: [email protected]                                                                              *
  ************************************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
 using Elastacloud.AzureManagement.Fluent.Clients.Interfaces;
 using Elastacloud.AzureManagement.Fluent.Commands.Certificates;
 using Elastacloud.AzureManagement.Fluent.Commands.Services;
@@ -20,6 +16,10 @@
 using Elastacloud.AzureManagement.Fluent.Services;
 using Elastacloud.AzureManagement.Fluent.Services.Classes;
 using Elastacloud.AzureManagement.Fluent.Types;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 
 namespace Elastacloud.AzureManagement.Fluent.Clients
 {
@@ -272,13 +272,15 @@ public void DeployServiceToAzure(PaaSDeploymentSettings settings)
             manager.GetDeploymentManager()
                 .AddCertificate(ManagementCertificate)
                 .ForNewDeployment(settings.CloudServiceName)
-                .SetCspkgEndpoint(settings.CspkgStorageEndpoint)
-                .WithNewHostedService(settings.CscfgConfig)
+                .SetCspkgEndpoint(settings.CspkgStorageEndpoint, settings.CscfgConfig)
+                .WithNewHostedService(settings.CloudServiceName)
                 .WithStorageAccount(settings.StorageAccountName)
                 .AddEnvironment(DeploymentSlot.Production)
                 .AddLocation(settings.Location)
                 .AddParams(DeploymentParams.StartImmediately)
-                .WaitUntilAllRoleInstancesAreRunning();
+                .WaitUntilAllRoleInstancesAreRunning()
+                .Go()
+                .Commit();
         }
 
         private CertificateGenerator BuildCertGenerator(string name, string password)

Elastacloud.AzureManagement.Fluent/Fluent API/Services/Classes/BuildActivity.cs

@@ -7,10 +7,11 @@
  * Email: [email protected]                                                                              *
  ************************************************************************************************************/
 
+using Elastacloud.AzureManagement.Fluent.Types;
 using System;
 using System.Diagnostics;
 using System.IO;
-using Elastacloud.AzureManagement.Fluent.Types;
+using System.Xml.Linq;
 
 namespace Elastacloud.AzureManagement.Fluent.Services.Classes
 {
@@ -64,6 +65,14 @@ IHostedServiceActivity IBuildActivity.SetCspkgEndpoint(string uriEndpoint, strin
             return _manager;
         }
 
+        public IHostedServiceActivity SetCspkgEndpoint(Uri uriEndpoint, XDocument configuration)
+        {
+            UseExistingBuild = true;
+            _manager.CspkgEndpoint = uriEndpoint.ToString();
+            _manager.CscfgFileInstance = CscfgFile.GetAdHocInstance(configuration);
+            return _manager;
+        }
+
         /// <summary>
         /// Creates a buildactivity if one does not already exist and sets the ccproj file for msbuild
         /// </summary>
@@ -209,5 +218,7 @@ internal Process StartMsBuildProcess()
             msbuildProcess.WaitForExit();
             return msbuildProcess;
         }
+
+
     }
 }

Elastacloud.AzureManagement.Fluent/Fluent API/Services/DeploymentManager.cs

@@ -7,17 +7,17 @@
  * Email: [email protected]                                                                              *
  ************************************************************************************************************/
 
+using Elastacloud.AzureManagement.Fluent.Commands.Services;
+using Elastacloud.AzureManagement.Fluent.Helpers;
+using Elastacloud.AzureManagement.Fluent.Helpers.PublishSettings;
+using Elastacloud.AzureManagement.Fluent.Services.Classes;
+using Elastacloud.AzureManagement.Fluent.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Xml.Linq;
-using Elastacloud.AzureManagement.Fluent.Commands.Services;
-using Elastacloud.AzureManagement.Fluent.Helpers;
-using Elastacloud.AzureManagement.Fluent.Helpers.PublishSettings;
-using Elastacloud.AzureManagement.Fluent.Services.Classes;
-using Elastacloud.AzureManagement.Fluent.Types;
 
 namespace Elastacloud.AzureManagement.Fluent.Services
 {
@@ -596,6 +596,14 @@ IHostedServiceActivity IBuildActivity.SetCspkgEndpoint(string uriEndpoint, strin
             return this;
         }
 
+        public IHostedServiceActivity SetCspkgEndpoint(Uri uriEndpoint, XDocument configuration)
+        {
+            if (BuildActivity == null)
+                BuildActivity = new BuildActivity(this);
+            ((IBuildActivity)BuildActivity).SetCspkgEndpoint(uriEndpoint, configuration);
+            return this;
+        }
+
         /// <summary>
         /// Sets the root path to .ccproj 
         /// </summary>
@@ -625,6 +633,5 @@ IServiceCertificate IRemoteDesktop.WithUsernameAndPassword(string username, stri
         }
 
         #endregion
-
     }
 }

Elastacloud.AzureManagement.Fluent/Fluent API/Services/IBuildActivity.cs

@@ -7,6 +7,8 @@
  * Email: [email protected]                                                                              *
  ************************************************************************************************************/
 
+using System;
+using System.Xml.Linq;
 namespace Elastacloud.AzureManagement.Fluent.Services
 {
     /// <summary>
@@ -19,6 +21,13 @@ public interface IBuildActivity
         /// </summary>
         IHostedServiceActivity SetCspkgEndpoint(string uriEndpoint, string cscfgFilePath = null);
 
+        /// <summary>
+        /// Sets the cspkg endpoint in blob storage
+        /// <param name="uriEndpoint">URI to the cloud package in blob storage.</param>
+        /// <param name="configuration">The .cscfg configuration.</param>
+        /// </summary>
+        IHostedServiceActivity SetCspkgEndpoint(Uri uriEndpoint, XDocument configuration);
+
         /// <summary>
         /// Sets the build root directory
         /// </summary>

Elastacloud.AzureManagement.Fluent/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@
 
 // Make internal interfaces visible to Moq and the testing library
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2"), InternalsVisibleTo("Elastacloud.AzureManagement.Fluent.Tests")]
-[assembly: AssemblyVersion("0.5.1.2")]
-[assembly: AssemblyFileVersion("0.5.1.2")]
+[assembly: AssemblyVersion("0.5.1.3")]
+[assembly: AssemblyFileVersion("0.5.1.3")]

Elastacloud.AzureManagement.Fluent/Types/RoleInstanceStatus.cs

@@ -11,7 +11,6 @@ namespace Elastacloud.AzureManagement.Fluent.Types
     public enum RoleInstanceStatus
     {
         Unknown,
-        RoleStateUnknown,
         CreatingVM,
         StartingVM,
         CreatingRole,
@@ -29,7 +28,8 @@ public enum RoleInstanceStatus
         UnresponsiveRole,
         StoppedDeallocated,
         Preparing,
-        Provisioning
+        Provisioning,
+        RoleStateUnknown,
     }