Skip to content

release => master for 4.0.1 #3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 15, 2017
Merged

release => master for 4.0.1 #3962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c619a44
Fix getting storage account from environment in disconnected scenario
markcowl May 9, 2017
77df068
Adding check-in test for disconnected scenario
markcowl May 10, 2017
49074e9
Adding tests for additional offline scenarios
markcowl May 10, 2017
1851ceb
Cleaning up tests and adding test for additional environment
markcowl May 10, 2017
101f8e5
Merge pull request #3938 from markcowl/stonull
markcowl May 10, 2017
198ba4a
Update AzureRM versions for 4.0.1
markcowl May 12, 2017
155914c
Update azure storage manifest version for release
markcowl May 12, 2017
c7e8221
Update dll version for storage
markcowl May 12, 2017
99fde95
Update msi version to match azurerm version
markcowl May 12, 2017
7c1d093
Update storage dependency for Azure module
markcowl May 12, 2017
c916cc3
Remove markdown for renamed cmdlet
markcowl May 12, 2017
060f49a
Retain assembly version for storage cmdlets
markcowl May 12, 2017
c8eb81c
Add note on bug fix to AzureRm release notes
markcowl May 12, 2017
66742e5
Update changelog for storage fix
markcowl May 12, 2017
611c0fd
update storage management module
markcowl May 12, 2017
8fa9073
update storage management version
markcowl May 12, 2017
78ed8fd
Merge pull request #3953 from Azure/update-4.0.1
markcowl May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
7 changes: 5 additions & 2 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -3211,4 +3214,4 @@ Virtual Network cmdlets
* iisnode 0.1.13

2011.12.09 Version 0.5.0
* Initial Release
* Initial Release
2 changes: 1 addition & 1 deletion setup/azurecmd.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Storage/AzureRM.Storage.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '3.0.0'
ModuleVersion = '3.0.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -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 = @()
Expand Down
107 changes: 0 additions & 107 deletions src/ResourceManager/Websites/Commands.Websites/help/Swap-AzureRmWebAppSlot.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/ServiceManagement/Services/Commands.Utilities/Azure.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '4.0.0'
ModuleVersion = '4.0.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -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 = @()
Expand Down
9 changes: 5 additions & 4 deletions src/Storage/Azure.Storage.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '3.0.0'
ModuleVersion = '3.0.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -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 = ''
Expand Down
1 change: 1 addition & 0 deletions src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading