.

src/Common/Storage/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs

@@ -173,7 +173,7 @@ public string SrcContainer
         [Parameter(HelpMessage = "Source Azure Storage Context Object", ValueFromPipeline = true, ValueFromPipelineByPropertyName = true, ParameterSetName = FileParameterSet)]
         [Parameter(HelpMessage = "Source Azure Storage Context Object", ValueFromPipeline = true, ValueFromPipelineByPropertyName = true, ParameterSetName = FileToBlobParameterSet)]
         [Parameter(HelpMessage = "Source Azure Storage Context Object", ParameterSetName = UriParameterSet)]
-        public new AzureStorageContext Context { get; set; }
+        public override AzureStorageContext Context { get; set; }
 
         [Parameter(HelpMessage = "Destination Storage context object", Mandatory = false)]
         public AzureStorageContext DestContext { get; set; }

src/Common/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs

@@ -43,7 +43,7 @@ public class StorageCloudCmdletBase<T> : CloudBaseCmdlet<T>
     {
         [Parameter(HelpMessage = "Azure Storage Context Object",
             ValueFromPipelineByPropertyName = true)]
-        public AzureStorageContext Context { get; set; }
+        public virtual AzureStorageContext Context { get; set; }
 
         [Parameter(HelpMessage = "The server time out for each request in seconds.")]
         public virtual int? ServerTimeoutPerRequest { get; set; }

src/Common/Storage/Commands.Storage/File/AzureStorageFileCmdletBase.cs

@@ -34,7 +34,7 @@ public abstract class AzureStorageFileCmdletBase : StorageCloudCmdletBase<IStora
             ValueFromPipeline = true,
             ParameterSetName = Constants.SpecificParameterSetName,
             HelpMessage = "Azure Storage Context Object")]
-        public new AzureStorageContext Context { get; set; }
+        public override AzureStorageContext Context { get; set; }
 
         protected FileRequestOptions RequestOptions
         {

src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageFileSasToken.cs

@@ -121,7 +121,7 @@ public string Policy
             ValueFromPipeline = true,
             HelpMessage = "Azure Storage Context Object",
             ParameterSetName = NameSasPolicyParmeterSet)]
-        public new AzureStorageContext Context { get; set; }
+        public override AzureStorageContext Context { get; set; }
 
         /// <summary>
         /// Execute command

src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareSasToken.cs

@@ -68,7 +68,7 @@ public string Policy
         [Parameter(
             ValueFromPipeline = true,
             HelpMessage = "Azure Storage Context Object")]
-        public new AzureStorageContext Context { get; set; }
+        public override AzureStorageContext Context { get; set; }
 
         // Overwrite the useless parameter
         public override int? ServerTimeoutPerRequest { get; set; }

src/Common/Storage/Commands.Storage/File/Cmdlet/StartAzureStorageFileCopy.cs

@@ -120,7 +120,7 @@ public class StartAzureStorageFileCopyCommand : StorageFileDataManagementCmdletB
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             ParameterSetName = ShareNameParameterSet)]
-        public new AzureStorageContext Context { get; set; }
+        public override AzureStorageContext Context { get; set; }
 
         [Parameter(HelpMessage = "Destination Storage context object", ParameterSetName = ContainerNameParameterSet)]
         [Parameter(HelpMessage = "Destination Storage context object", ParameterSetName = ContainerParameterSet)]

src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.types.ps1xml

@@ -1,37 +1,3 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Types>
-  <Type>
-    <Name>Microsoft.WindowsAzure.Storage.File.CloudFile</Name>
-    <Members>
-      <ScriptProperty>
-        <Name>DirectoryTag</Name>
-        <GetScriptBlock>[string]::Empty</GetScriptBlock>
-      </ScriptProperty>
-      <ScriptProperty>
-        <Name>IsDirectory</Name>
-        <GetScriptBlock>$false</GetScriptBlock>
-      </ScriptProperty>
-      <ScriptProperty>
-        <Name>Length</Name>
-        <GetScriptBlock>$_.Properties.Length</GetScriptBlock>
-      </ScriptProperty>
-    </Members>
-  </Type>
-  <Type>
-    <Name>Microsoft.WindowsAzure.Storage.File.CloudFileDirectory</Name>
-    <Members>
-      <ScriptProperty>
-        <Name>DirectoryTag</Name>
-        <GetScriptBlock>"DIR"</GetScriptBlock>
-      </ScriptProperty>
-      <ScriptProperty>
-        <Name>IsDirectory</Name>
-        <GetScriptBlock>$true</GetScriptBlock>
-      </ScriptProperty>
-      <ScriptProperty>
-        <Name>Length</Name>
-        <GetScriptBlock>[string]::Empty</GetScriptBlock>
-      </ScriptProperty>
-    </Members>
-  </Type>
 </Types>

src/ResourceManager/Storage/Commands.Management.Storage/Microsoft.Azure.Commands.Management.Storage.dll-Help.xml

@@ -121,7 +121,7 @@
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
 			<dev:code>PS C:\&gt; #Get one storage account
-          Get-AzureRmStorageAccount -ResourceGroupName &quot;RG1&quot; -AccountName &quot;myStorageAccount&quot;</dev:code>
+          Get-AzureRmStorageAccount -ResourceGroupName &quot;rg1&quot; -AccountName &quot;mystorageaccount&quot;</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -304,7 +304,7 @@
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
 			<dev:code>#Get keys
-          Get-AzureRmStorageAccountKey -ResourceGroupName &quot;RG1&quot; -AccountName &quot;myStorageAccount&quot;</dev:code>
+          Get-AzureRmStorageAccountKey -ResourceGroupName &quot;rg1&quot; -AccountName &quot;mystorageaccount&quot;</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -375,6 +375,13 @@
 				</maml:description>
 				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			</command:parameter>
+			<command:parameter required="false" variableLength="true" globbing="false" pipelineInput="true (ByPropertyName)" position="4">
+				<maml:name>Tags</maml:name>
+				<maml:description>
+					<maml:para>Tags to set on the storage account.</maml:para>
+				</maml:description>
+				<command:parameterValue required="true" variableLength="true">Hashtable[]</command:parameterValue>
+			</command:parameter>
 			<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
 				<maml:name>Profile</maml:name>
 				<maml:description>
@@ -437,6 +444,18 @@
 			</dev:type>
 			<dev:defaultValue></dev:defaultValue>
 		</command:parameter>
+		<command:parameter required="false" variableLength="true" globbing="false" pipelineInput="true (ByPropertyName)" position="4">
+			<maml:name>Tags</maml:name>
+			<maml:description>
+				<maml:para>Tags to set on the storage account.</maml:para>
+			</maml:description>
+			<command:parameterValue required="true" variableLength="true">Hashtable[]</command:parameterValue>
+			<dev:type>
+				<maml:name>Hashtable[]</maml:name>
+				<maml:uri/>
+			</dev:type>
+			<dev:defaultValue></dev:defaultValue>
+		</command:parameter>
 		<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
 			<maml:name>Profile</maml:name>
 			<maml:description>
@@ -490,7 +509,7 @@
 			<maml:introduction>
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
-			<dev:code>New-AzureRmStorageAccount -ResourceGroupName &quot;myResourceGroup&quot; -AccountName &quot;myStorageAccount&quot; -Location &quot;US West&quot; -Type &quot;Standard_GRS&quot;</dev:code>
+			<dev:code>New-AzureRmStorageAccount -ResourceGroupName &quot;myresourcegroup&quot; -AccountName &quot;mystorageaccount&quot; -Location &quot;US West&quot; -Type &quot;Standard_GRS&quot;</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -654,7 +673,7 @@
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
 			<dev:code>#Regenerate a key
-New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountName &quot;myStorageAccount&quot; -keyName &quot;key1&quot;</dev:code>
+New-AzureRmStorageKey -ResourceGroupName &quot;myresourcegroup&quot; -AccountName &quot;mystorageaccount&quot; -keyName &quot;key1&quot;</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -794,7 +813,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 			<maml:introduction>
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
-			<dev:code>PS C:\&gt; Remove-AzureRmStorageAccount -ResourceGroupName &quot;RG1&quot; -AccountName &quot;myStorageAccount&quot;</dev:code>
+			<dev:code>PS C:\&gt; Remove-AzureRmStorageAccount -ResourceGroupName &quot;rg1&quot; -AccountName &quot;mystorageaccount&quot;</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -894,7 +913,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 			<command:parameter required="false" variableLength="true" globbing="false" pipelineInput="true (ByPropertyName)" position="3">
 				<maml:name>UseSubDomain</maml:name>
 				<maml:description>
-					<maml:para />
+					<maml:para>Indicates whether indirect CName validation is enabled.</maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="true">Nullable`1[Boolean]</command:parameterValue>
 			</command:parameter>
@@ -925,7 +944,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 			<command:parameter required="true" variableLength="true" globbing="false" pipelineInput="true (ByPropertyName)" position="2">
 				<maml:name>Tags</maml:name>
 				<maml:description>
-					<maml:para />
+					<maml:para>Tags to set on the storage account.</maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="true">Hashtable[]</command:parameterValue>
 			</command:parameter>
@@ -1008,7 +1027,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 		<command:parameter required="false" variableLength="true" globbing="false" pipelineInput="true (ByPropertyName)" position="3">
 			<maml:name>UseSubDomain</maml:name>
 			<maml:description>
-				<maml:para />
+				<maml:para>Indicates whether indirect CName validation is enabled.</maml:para>
 			</maml:description>
 			<command:parameterValue required="true" variableLength="true">Nullable`1[Boolean]</command:parameterValue>
 			<dev:type>
@@ -1020,7 +1039,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 		<command:parameter required="true" variableLength="true" globbing="false" pipelineInput="true (ByPropertyName)" position="2">
 			<maml:name>Tags</maml:name>
 			<maml:description>
-				<maml:para />
+				<maml:para>Tags to set on the storage account.</maml:para>
 			</maml:description>
 			<command:parameterValue required="true" variableLength="true">Hashtable[]</command:parameterValue>
 			<dev:type>
@@ -1029,18 +1048,6 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 			</dev:type>
 			<dev:defaultValue></dev:defaultValue>
 		</command:parameter>
-		<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByValue, ByPropertyName)" position="3">
-			<maml:name>UseSubDomainName</maml:name>
-			<maml:description>
-				<maml:para />
-			</maml:description>
-			<command:parameterValue required="true" variableLength="false">nullable`1[boolean]</command:parameterValue>
-			<dev:type>
-				<maml:name>nullable`1[boolean]</maml:name>
-				<maml:uri/>
-			</dev:type>
-			<dev:defaultValue></dev:defaultValue>
-		</command:parameter>
 	</command:parameters>
 	<command:inputTypes>
 		<command:inputType>
@@ -1083,7 +1090,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
 			<dev:code>PS C:\&gt; # Set account type
-          Set-AzureRmStorageAccount -ResourceGroupName &quot;myResourceGroup&quot; -AccountName &quot;myStorageAccount&quot; -Type &quot;Standard_RAGRS&quot;</dev:code>
+          Set-AzureRmStorageAccount -ResourceGroupName &quot;myresourcegroup&quot; -AccountName &quot;mystorageaccount&quot; -Type &quot;Standard_RAGRS&quot;</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -1104,7 +1111,7 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 				<maml:paragraph>PS C:\&gt;</maml:paragraph>
 			</maml:introduction>
 			<dev:code>PS C:\&gt; #Set custom domain
-          Set-AzureRmStorageAccount -ResourceGroupName &quot;myResourceGroup&quot; -AccountName &quot;myStorageAccount&quot; -CustomDomainName &quot;domain name&quot; –UseSubDomain “true”</dev:code>
+          Set-AzureRmStorageAccount -ResourceGroupName &quot;myresourcegroup&quot; -AccountName &quot;mystorageaccount&quot; -CustomDomainName &quot;www.domainname.com&quot; –UseSubDomain $true</dev:code>
 			<dev:remarks>
 				<maml:para />
 				<maml:para />
@@ -1123,4 +1130,4 @@ New-AzureRmStorageKey -ResourceGroupName &quot;myResourceGroup&quot; -AccountNam
 	<maml:relatedLinks>
 	</maml:relatedLinks>
 </command:command>
-</helpItems>
+</helpItems>

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/NewAzureStorageAccount.cs

@@ -12,7 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System.Collections;
 using System.Management.Automation;
+using Microsoft.Azure.Commands.Tags.Model;
 using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Management.Storage.Models;
 
@@ -60,14 +62,23 @@ public class NewAzureStorageAccountCommand : StorageAccountBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 
+        [Parameter(
+            Position = 4,
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Storage Account Tags.")]
+        [ValidateNotNull]
+        public Hashtable[] Tags { get; set; }
+
         protected override void ProcessRecord()
         {
             base.ProcessRecord();
 
             StorageAccountCreateParameters createParameters = new StorageAccountCreateParameters()
             {
                 Location = this.Location,
-                AccountType = ParseAccountType(this.Type)
+                AccountType = ParseAccountType(this.Type),
+                Tags = TagsConversionHelper.CreateTagDictionary(Tags, validate: true)
             };
 
             var createAccountResponse = this.StorageClient.StorageAccounts.Create(

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/SetAzureStorageAccount.cs

@@ -69,7 +69,8 @@ public class SetAzureStorageAccountCommand : StorageAccountBaseCmdlet
             ParameterSetName = UpdateCustomDomainParamSet,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Storage Account Custom Domain Name.")]
-        [ValidateNotNullOrEmpty]
+        [AllowEmptyString]
+        [ValidateNotNull]
         public string CustomDomainName { get; set; }
 
         [Parameter(
@@ -86,7 +87,8 @@ public class SetAzureStorageAccountCommand : StorageAccountBaseCmdlet
             ParameterSetName = UpdateTagsParamSet,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Storage Account Tags.")]
-        [ValidateNotNullOrEmpty]
+        [AllowEmptyCollection]
+        [ValidateNotNull]
         public Hashtable[] Tags { get; set; }
 
         protected override void ProcessRecord()
@@ -120,7 +122,7 @@ protected override void ProcessRecord()
 
                 updateParameters = new StorageAccountUpdateParameters
                     {
-                        Tags = tagDictionary
+                        Tags = tagDictionary ?? new Dictionary<string, string>()
                     };
             }
 

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/DscExtension/DscExtensionTests.ps1

@@ -11,12 +11,13 @@ function Test-GetAzureVMDscExtension
 	Set-StrictMode -Version latest; $ErrorActionPreference = 'Stop'
 
 	# Publish DSC Configuration
-	$configPath = '.\Resources\DscExtension\DummyConfig.ps1'
-	$StorageAccountName = "dscextensiontest"
+	# Publish doesnt work on some CI build machines (Still running WMF 4)
+	#$configPath = '.\Resources\DscExtension\DummyConfig.ps1'
+	#$StorageAccountName = "dscextensiontest"
 
-	$StorageAccountKey = Get-AzureStorageKey -StorageAccountName $StorageAccountName
-    $Ctx = New-AzureStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey.Primary
-	Publish-AzureVMDscConfiguration -ConfigurationPath $configPath -StorageContext $Ctx -Force -Verbose
+	#$StorageAccountKey = Get-AzureStorageKey -StorageAccountName $StorageAccountName
+    #$Ctx = New-AzureStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey.Primary
+	#Publish-AzureVMDscConfiguration -ConfigurationPath $configPath -StorageContext $Ctx -Force -Verbose
 
 	# Setup
 	$location = Get-DefaultLocation
@@ -38,7 +39,9 @@ function Test-GetAzureVMDscExtension
 		$vm = Get-AzureVM -ServiceName $svcName -Name $vmName
 
 		# Install DSC Extension Handler
-		$vm = Set-AzureVMDSCExtension -VM $vm -ConfigurationArchive 'DummyConfig.ps1.zip' -ConfigurationName 'DummyConfig' -Verbose 
+		$version = '2.3'
+		#$vm = Set-AzureVMDSCExtension -VM $vm -ConfigurationArchive 'DummyConfig.ps1.zip' -ConfigurationName 'DummyConfig' -Verbose 
+		$vm = Set-AzureVMDSCExtension -VM $vm -ConfigurationArchive '' -Version $version -Verbose 
 		$vm | Update-AzureVM -Verbose
 
 		# Call Get-AzureVMDscExtensionStatus to check the status of the installation
@@ -72,8 +75,6 @@ function Test-GetAzureVMDscExtension
 		Assert-NotNull $extension.ExtensionName
 		Assert-NotNull $extension.Publisher
 		Assert-NotNull $extension.Version
-		Assert-NotNull $extension.ModulesUrl
-		Assert-NotNull $extension.ConfigurationFunction
 
 		# Remove Extension
 		Remove-AzureVMDscExtension -VM $vm -Verbose 

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

@@ -93,7 +93,11 @@ private void ExecuteCommand()
                     {
                         context.ModulesUrl = extensionPublicSettings.ModulesUrl;
                         context.ConfigurationFunction = extensionPublicSettings.ConfigurationFunction;
-                        context.Properties = new Hashtable(extensionPublicSettings.Properties.ToDictionary( x => x.Name, x => x.Value ));
+                        if (extensionPublicSettings.Properties != null)
+                        {
+                            context.Properties =
+                                new Hashtable(extensionPublicSettings.Properties.ToDictionary(x => x.Name, x => x.Value));
+                        }
                     }
 
                     return context;