Skip to content

Commit 48ef3b6

Browse files
author
unknown
committed
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev
2 parents cc4f049 + 76e6148 commit 48ef3b6

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public class NewAzureRedisCache : RedisCacheCmdletBase
3636

3737
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Location where want to create cache.")]
3838
[ValidateNotNullOrEmpty]
39-
[ValidateSet("North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
40-
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East", "Australia Southeast", IgnoreCase = false)]
4139
public string Location { get; set; }
4240

4341
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "Redis version.")]

src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ public virtual void NewPaaSDeploymentProcess()
123123
}
124124
else
125125
{
126+
if (string.IsNullOrEmpty(storageName))
127+
{
128+
throw new ArgumentException(Resources.CurrentStorageAccountIsNotSet);
129+
}
130+
126131
var progress = new ProgressRecord(0, Resources.WaitForUploadingPackage, Resources.UploadingPackage);
127132
WriteProgress(progress);
128133
removePackage = true;
@@ -265,11 +270,6 @@ protected virtual void ValidateParameters()
265270
{
266271
this.Label = this.Name;
267272
}
268-
269-
if (string.IsNullOrEmpty(this.CurrentContext.Subscription.GetProperty(AzureSubscription.Property.StorageAccount)))
270-
{
271-
throw new ArgumentException(Resources.CurrentStorageAccountIsNotSet);
272-
}
273273
}
274274
}
275275
}

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/GetAzureVMDscExtension.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions
3232
OutputType(typeof(VirtualMachineDscExtensionContext))]
3333
public class GetAzureVMDscExtensionCommand : VirtualMachineDscExtensionCmdletBase
3434
{
35-
36-
[Parameter(Position = 1, ValueFromPipelineByPropertyName = true)]
37-
public override string Version { get; set; }
38-
3935
internal void ExecuteCommand()
4036
{
4137
List<ResourceExtensionReference> extensionRefs = GetPredicateExtensionList();

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private ConfigurationUris UploadConfigurationDataToBlob()
271271
{
272272
SharedAccessExpiryTime =
273273
DateTime.UtcNow.AddHours(1),
274-
Permissions = SharedAccessBlobPermissions.Read
274+
Permissions = SharedAccessBlobPermissions.Read | SharedAccessBlobPermissions.Delete
275275
};
276276

277277
var configurationBlobName = this.ConfigurationArchive;

0 commit comments

Comments
 (0)