Merge pull request #3966 from Azure/master

Master => preview for release-4.0.1

Author: cormacpayne

AzurePowershell.Test.targets

@@ -65,7 +65,8 @@
 			<AsmXUnitTests Include=".\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
 			<AsmXUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
 			<AsmXUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
-		</ItemGroup>	
+      <AsmXUnitTests Include=".\src\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll"/>
+    </ItemGroup>	
 		<ItemGroup Condition=" '$(scope)' == 'all' ">
 			<XUnitTests Include=".\tools\StaticAnalysis\StaticAnalysis.Test\bin\Debug\StaticAnalysis.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>

ChangeLog.md

@@ -1,4 +1,7 @@
-## 2017.05.10 - Version 4.0.0
+## 2017.05.12 - Version 4.0.1
+ * Fix issue with New-AzureStorageContext in offline scenarios: https://github.com/Azure/azure-powershell/issues/3939
+ 
+ ## 2017.05.10 - Version 4.0.0
 * This release contains breaking changes. Please see [the migration guide](https://aka.ms/azps-migration-guide) for change details and the impact on existing scripts.
 * ApiManagement
     * Added support for configuring external groups in New-AzureRmApiManagementGroup.
@@ -3211,4 +3214,4 @@ Virtual Network cmdlets
  * iisnode 0.1.13
 
 2011.12.09 Version 0.5.0
- * Initial Release
+ * Initial Release

setup/azurecmd.wxs

@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="4.0.0" ?>
+  <?define version="4.0.1" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

src/ResourceManager/Storage/AzureRM.Storage.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '3.0.0'
+ModuleVersion = '3.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -52,7 +52,7 @@ CLRVersion = '4.0'
 
 # Modules that must be imported into the global environment prior to importing this module
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'; }, 
-               @{ModuleName = 'Azure.Storage'; ModuleVersion = '3.0.0'; })
+               @{ModuleName = 'Azure.Storage'; ModuleVersion = '3.0.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/Websites/Commands.Websites/help/Swap-AzureRmWebAppSlot.md

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.0.0'
+ModuleVersion = '4.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '3.0.0'; })
+RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '3.0.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ServiceManagement/Services/Commands.Utilities/Azure.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '3.0.0'
+ModuleVersion = '3.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -151,9 +151,10 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Upgrade to Azure Storage Client Library 8.1.1 and Azure Storage DataMovement Library 0.5.1
-* Add a new cmdlet to support blob Incremental Copy feature
-    - Start-AzureStorageBlobIncrementalCopy'
+        ReleaseNotes = '* Fix issue with New-AzureStorageContext in offline scenarios: https://github.com/Azure/azure-powershell/issues/3939
+        * Upgrade to Azure Storage Client Library 8.1.1 and Azure Storage DataMovement Library 0.5.1
+        * Add a new cmdlet to support blob Incremental Copy feature
+          - Start-AzureStorageBlobIncrementalCopy'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/Storage/Azure.Storage.psd1

@@ -203,6 +203,7 @@
     <Compile Include="Common\Cmdlet\NewAzureStorageContextTest.cs" />
     <Compile Include="Common\Cmdlet\SetAzureStorageServiceLoggingTest.cs" />
     <Compile Include="Common\Cmdlet\SetAzureStorageServiceHourMetricsTest.cs" />
+    <Compile Include="Common\Cmdlet\StorageContextDisconnectedTests.cs" />
     <Compile Include="Common\CommunicationExceptionUtilTest.cs" />
     <Compile Include="Common\FileNamingGenerator.cs" />
     <Compile Include="Common\IStorageManagement.cs" />