Skip to content

Commit e703aca

Browse files
azurecoderazurecoder
committed
Release 0.5.1.11
1 parent d48a5a7 commit e703aca

9 files changed

+40
-23
lines changed

‎Elastacloud.AzureManagement.Fluent.0.5.0.72.nupkg

-152 KB
Binary file not shown.

‎Elastacloud.AzureManagement.Fluent.0.5.1.11.nupkg

156 KB
Binary file not shown.

‎Elastacloud.AzureManagement.Fluent.0.5.1.2.nupkg

-153 KB
Binary file not shown.

‎Elastacloud.AzureManagement.Fluent.0.5.1.8.nupkg

-154 KB
Binary file not shown.

‎Elastacloud.AzureManagement.Fluent.0.5.1.9.nupkg

-154 KB
Binary file not shown.

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

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,17 @@ public class DeploymentManager : IAzureManager, IDeploymentActivity, IDeployment
7474

7575
#endregion
7676

77-
internal DeploymentManager(string subscriptionId)
77+
internal DeploymentManager(string subscriptionId, string defaultLocation = LocationConstants.NorthEurope)
7878
{
7979
SubscriptionId = subscriptionId;
8080
RolesInstances = new Dictionary<string, int>();
8181
CloudConfigChanges = new List<ICloudConfig>();
8282
EnableSsl = EnableRemoteDesktop = false;
83+
DefaultLocation = defaultLocation;
8384
}
8485

86+
public string DefaultLocation { get; set; }
87+
8588
#region Implementation of IDefinitionActivity
8689

8790
/// <summary>
@@ -455,7 +458,8 @@ List<CloudService> IQueryCloudService.GetHostedServiceList()
455458
var command = new GetHostedServiceListCommand
456459
{
457460
SubscriptionId = SubscriptionId,
458-
Certificate = ManagementCertificate
461+
Certificate = ManagementCertificate,
462+
Location = DefaultLocation
459463
};
460464
command.Execute();
461465
return command.HostedServices;
@@ -472,7 +476,8 @@ List<CloudService> IQueryCloudService.GetCloudServiceListWithDeployments()
472476
var command = new GetCloudServicePropertiesCommand(cloudService.Name)
473477
{
474478
SubscriptionId = SubscriptionId,
475-
Certificate = ManagementCertificate
479+
Certificate = ManagementCertificate,
480+
Location = DefaultLocation
476481
};
477482
command.Execute();
478483
cloudService.Deployments = command.CloudServiceDeployments;
@@ -491,7 +496,8 @@ List<string> IQueryCloudService.GetRoleNamesForProductionDeploymentForServiceWit
491496
var command = new GetDeploymenRoleNamesCommand(serviceName)
492497
{
493498
SubscriptionId = SubscriptionId,
494-
Certificate = ManagementCertificate
499+
Certificate = ManagementCertificate,
500+
Location = DefaultLocation
495501
};
496502
command.Execute();
497503
return command.RoleNames;
@@ -508,7 +514,8 @@ CscfgFile IQueryCloudService.GetConfigurationForProductionDeploymentForServiceWi
508514
var command = new GetDeploymenConfigurationCommand(serviceName)
509515
{
510516
SubscriptionId = SubscriptionId,
511-
Certificate = ManagementCertificate
517+
Certificate = ManagementCertificate,
518+
Location = DefaultLocation
512519
};
513520
command.Execute();
514521
return command.Configuration;
@@ -526,7 +533,8 @@ List<CloudService> IQueryCloudService.GetHostedServiceListContainingProductionDe
526533
var command = new GetHostedServiceListCommand
527534
{
528535
SubscriptionId = SubscriptionId,
529-
Certificate = ManagementCertificate
536+
Certificate = ManagementCertificate,
537+
Location = DefaultLocation
530538
};
531539
command.Execute();
532540
// enumerate the collection to see whether any of the hosted services
@@ -535,7 +543,8 @@ List<CloudService> IQueryCloudService.GetHostedServiceListContainingProductionDe
535543
var serviceCommand = new GetHostedServiceContainsDeploymentCommand(a.Name)
536544
{
537545
SubscriptionId = SubscriptionId,
538-
Certificate = ManagementCertificate
546+
Certificate = ManagementCertificate,
547+
Location = DefaultLocation
539548
};
540549
serviceCommand.Execute();
541550
if (serviceCommand.ContainsProductionDeployment)

‎Elastacloud.AzureManagement.Fluent/Fluent API/Subscriptions/SubscriptionDetailsManager.cs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Collections.Generic;
1111
using System.Security.Cryptography.X509Certificates;
1212
using Elastacloud.AzureManagement.Fluent.Commands.Subscriptions;
13+
using Elastacloud.AzureManagement.Fluent.Helpers;
1314
using Elastacloud.AzureManagement.Fluent.Helpers.PublishSettings;
1415
using Elastacloud.AzureManagement.Fluent.Types;
1516

@@ -23,13 +24,15 @@ public class SubscriptionDetailsManager : IAzureManager, ICertificateActivity, I
2324
/// <summary>
2425
/// Sets the subscription id with the manager class
2526
/// </summary>
26-
internal SubscriptionDetailsManager(string subscriptionId)
27+
internal SubscriptionDetailsManager(string subscriptionId, string defaultLocation = LocationConstants.NorthEurope)
2728
{
2829
SubscriptionId = subscriptionId;
30+
Location = defaultLocation;
2931
}
3032

3133
#region Implementation of IAzureManager
3234

35+
public string Location { get; set; }
3336
/// <summary>
3437
/// Event used to capture any trace information for long running async processes
3538
/// </summary>
@@ -96,10 +99,11 @@ ISubscriptionQuery ICertificateActivity.AddCertificateFromStore(string thumbprin
9699
SubscriptionInformation ISubscriptionQuery.GetSubscriptionInformation()
97100
{
98101
var subscriptionCommand = new GetSubscriptionCommand
99-
{
100-
SubscriptionId = SubscriptionId,
101-
Certificate = ManagementCertificate
102-
};
102+
{
103+
SubscriptionId = SubscriptionId,
104+
Certificate = ManagementCertificate,
105+
Location = Location
106+
};
103107
subscriptionCommand.Execute();
104108
return subscriptionCommand.SubscriptionInformation;
105109
}
@@ -112,10 +116,11 @@ SubscriptionInformation ISubscriptionQuery.GetSubscriptionInformation()
112116
List<LocationInformation> ISubscriptionQuery.GetSubscriberLocations()
113117
{
114118
var subscriptionCommand = new GetSubscriberLocationsCommand
115-
{
116-
SubscriptionId = SubscriptionId,
117-
Certificate = ManagementCertificate
118-
};
119+
{
120+
SubscriptionId = SubscriptionId,
121+
Certificate = ManagementCertificate,
122+
Location = Location
123+
};
119124
subscriptionCommand.Execute();
120125
return subscriptionCommand.Locations;
121126
}

‎Elastacloud.AzureManagement.Fluent/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
[assembly: GuidAttribute("909b2b8c-10bf-4f0d-a94e-208ef3bdca52")]
1313
[assembly: InternalsVisibleToAttribute("DynamicProxyGenAssembly2")]
1414
[assembly: InternalsVisibleToAttribute("Elastacloud.AzureManagement.Fluent.Tests")]
15-
[assembly: AssemblyVersionAttribute("0.5.1.10")]
16-
[assembly: AssemblyFileVersionAttribute("0.5.1.10")]
15+
[assembly: AssemblyVersionAttribute("0.5.1.11")]
16+
[assembly: AssemblyFileVersionAttribute("0.5.1.11")]
1717
namespace System {
1818
internal static class AssemblyVersionInformation {
19-
internal const string Version = "0.5.1.10";
19+
internal const string Version = "0.5.1.11";
2020
}
2121
}

‎Elastacloud.AzureManagement.Fluent/SubscriptionManager.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,24 @@ public class SubscriptionManager
3131
/// </summary>
3232
private readonly string _subscriptionId;
3333

34-
/// <summary>
34+
/// <summary>,
3535
/// Constructs a subscription manager which can be used to get other managers specific to the operations being requested
3636
/// </summary>
3737
/// <param name="subscriptionId">the subscription id</param>
38-
public SubscriptionManager(string subscriptionId)
38+
public SubscriptionManager(string subscriptionId, string defaultLocation = LocationConstants.NorthEurope)
3939
{
4040
_subscriptionId = subscriptionId;
41+
Location = defaultLocation;
4142
}
4243

44+
public string Location { get; set; }
45+
4346
/// <summary>
4447
/// Gets a manager to use on all types of deployment for PaaS
4548
/// </summary>
4649
public Services.ICertificateActivity GetDeploymentManager()
4750
{
48-
return new DeploymentManager(_subscriptionId);
51+
return new DeploymentManager(_subscriptionId, Location);
4952
}
5053

5154
/// <summary>
@@ -71,7 +74,7 @@ public StorageManager GetStorageManager()
7174
/// <returns>A SubscriptionDetailsManager instance</returns>
7275
public Subscriptions.ICertificateActivity GetSubscriptionDetailsManager()
7376
{
74-
return new SubscriptionDetailsManager(_subscriptionId);
77+
return new SubscriptionDetailsManager(_subscriptionId, Location);
7578
}
7679

7780
/// <summary>

0 commit comments

Comments
 (0)