Skip to content

Merge master -> dev #3036

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.

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 43 commits into from
Sep 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a8586b0
Use Microsoft.Azure.RecoveryServices publisher for VM backup
Sep 15, 2016
2848045
Merge branch 'fix_vmbackup_publisher' into dev
Sep 15, 2016
c3991a5
Fix VMBackup default version
Sep 15, 2016
12e417b
Merge branch 'fix_vmbackup_publisher' into dev
Sep 15, 2016
ac9659e
Revert "Merge branch 'fix_vmbackup_publisher' into dev"
Sep 16, 2016
018fdf7
Revert "Merge branch 'fix_vmbackup_publisher' into dev"
Sep 16, 2016
0df698d
Add timeout of 10 minutes on ADE related HTTP calls
Sep 16, 2016
f99e4a0
Merge branch 'enc_tasks_timeout' into dev
Sep 16, 2016
1082464
Revert "Merge branch 'enc_tasks_timeout' into dev"
Sep 16, 2016
af6465c
Merge remote-tracking branch 'upstream/dev' into dev
Sep 19, 2016
91d7b17
error message for gateway
dihan0604 Sep 21, 2016
60b8d95
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dihan0604 Sep 21, 2016
b62dbb5
add tests
dihan0604 Sep 21, 2016
948332d
merge confict
dihan0604 Sep 21, 2016
7d0d4cb
add correct tests
dihan0604 Sep 21, 2016
bd8ba4b
update version for compute
dihan0604 Sep 21, 2016
eab72f6
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
dihan0604 Sep 21, 2016
b721ed9
[AppGW] Adding backend health API.
kagamsft Sep 21, 2016
6db2cc8
change file version
dihan0604 Sep 21, 2016
31764e6
[AppGW] Fixing indent.
kagamsft Sep 21, 2016
858d07c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
kagamsft Sep 22, 2016
d14ddae
Update publisher name for VMBackup
Sep 22, 2016
3eb2016
[AppGW] new test recording
kagamsft Sep 22, 2016
81f4056
remove confirm action
dihan0604 Sep 22, 2016
3cebd9a
Merge remote-tracking branch 'upstream/dev' into krkhan-update-vmback…
Sep 22, 2016
513f385
Update module versions for release 3.0.0
cormacpayne Sep 22, 2016
94fc13a
fix mark comment
dihan0604 Sep 22, 2016
8a4b5cb
Change Resources to minor change, fix Storage version going from 2.1.…
cormacpayne Sep 22, 2016
8c2a6f6
Merge pull request #2994 from cormacpayne/release-3.0.0
cormacpayne Sep 23, 2016
fb45e5f
Merge remote-tracking branch 'upstream/release-3.0.0' into krkhan-upd…
Sep 23, 2016
4deb56b
Merge pull request #2992 from krkhan/krkhan-update-vmbackup-publisher
markcowl Sep 23, 2016
77bbf7a
KeyVault: Add support for specifying CeritifcateType in certificate p…
rohmano Sep 23, 2016
1cdaf09
Merge pull request #2995 from dihan0604/dev
cormacpayne Sep 23, 2016
3d4a098
Merge pull request #2989 from kagamsft/dev
cormacpayne Sep 23, 2016
6f77449
Update Swap-AzureRmWebAppSlot cmdlet to use a common verb name
markcowl Sep 23, 2016
3c31b93
Merge pull request #3003 from markcowl/release-3.0.0
cormacpayne Sep 23, 2016
f2fafac
Merge pull request #2997 from rohmano/dev
cormacpayne Sep 23, 2016
1e1cead
Fix error when publishing modules to gallery
cormacpayne Sep 27, 2016
ca20042
Merge pull request #3020 from cormacpayne/release-3.0.0
cormacpayne Sep 27, 2016
fc2d3bf
Adding migration guide for 3.0.0 release.
twitchax Sep 28, 2016
b265c79
Merge pull request #3032 from aaronroney/dev
markcowl Sep 29, 2016
adf93f5
Update ChangeLog.md for Release 3.0.0
cormacpayne Sep 29, 2016
64ad444
Merge pull request #3035 from Azure/release-3.0.0
markcowl Sep 29, 2016
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
72 changes: 71 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,74 @@
## 2016.09.16 version 2.2.0
## 2016.09.28 version 3.0.0
* This release contains breaking changes. Please see [the migration guide](documentation/release-notes/migration-guide.3.0.0.md) for change details and the impact on existing scripts.
* ApiManagement
* Enable support of Importing and Exporting SOAP based APIs (Wsdl Format)
- Import-AzureRmApiManagementApi
- Export-AzureRmApiManagementApi
* Deprecated cmdlet Set-AzureRmApiManagementVirtualNetworks. In place, place used cmdlet Update-AzureRmApiManagementDeployment
* Enabled support for ARM based VNETs for configuration Vpn via cmdlet Update-AzureRmApiManagementDeployment
* Introduced support for VpnType (None, External, Internal) to differentiate ApiManagement workloads for Internet and Intranet
* Fixed PowerShell issues
- https://github.com/Azure/azure-powershell/issues/2622
- https://github.com/Azure/azure-powershell/issues/2606
* Batch
* Added new cmdlet for reactivating tasks
- Enable-AzureBatchTask
* Added new parameter for application packages on job manager tasks and cloud tasks
- New-AzureBatchTask -ApplicationPackageReferences
* Added new parameters for job auto termination
- New-AzureBatchJob -OnAllTasksComplete -OnTaskFailure
- New-AzureBatchJob -ExitConditions
* ExpressRoute
* Added new parameter service key in return object when provider list all cross connection
- Get-AzureCrossConnectionCommand
* MachineLearning
* Get-AzureRmMlWebService supports paginated response
* Remind user Get-AzureRmMlWebService "Name" parameter needs to work with "ResourceGroupName" parameter
* Network
* Added new cmdlet to get application gateway backend health
- Get-AzureRmApplicationGatewayBackendHealth
* Added support for creating UltraPerformance sku
- New-AzureRmVirtualNetworkGateway -GatewaySku
- New-AzureVirtualNetworkGateway -GatewaySku
* RemoteApp
* Added cmdlets to enable User Disk and Gold Image Migration feature
- Export-AzureRemoteAppUserDisk
- Export-AzureRemoteAppTemplateImage
* SiteRecovery
* New cmdlets have been added to support one to one mapping with service objects.
- Get-AzureRmSiteRecoveryFabric
- Get-AzureRmSiteRecoveryProtectableItem
- Get-AzureRmSiteRecoveryProtectionContainerMapping
- Get-AzureRmSiteRecoveryRecoveryPoin
- Get-AzureRmSiteRecoveryReplicationProtectedItem
- Get-AzureRmSiteRecoveryServicesProvider
- New-AzureRmSiteRecoveryFabri
- New-AzureRmSiteRecoveryProtectionContainerMapping
- New-AzureRmSiteRecoveryReplicationProtectedItem
- Remove-AzureRmSiteRecoveryFabric
- Remove-AzureRmSiteRecoveryProtectionContainerMapping
- Remove-AzureRmSiteRecoveryReplicationProtectedItem
- Remove-AzureRmSiteRecoveryServicesProvider
- Set-AzureRmSiteRecoveryReplicationProtectedItem
- Start-AzureRmSiteRecoveryApplyRecoveryPoint
- Update-AzureRmSiteRecoveryServicesProvider
* Following cmdlets have been modified for to support one to one mapping with service objects.
- Edit-AzureRmSiteRecoveryRecoveryPlan
- Get-AzureRmSiteRecoveryNetwork
- Get-AzureRmSiteRecoveryNetworkMapping
- Get-AzureRmSiteRecoveryProtectionContainer
- Get-AzureRmSiteRecoveryStorageClassification
- Get-AzureRmSiteRecoveryStorageClassificationMapping
- Start-AzureRmSiteRecoveryCommitFailoverJob
- Start-AzureRmSiteRecoveryPlannedFailoverJob
- Start-AzureRmSiteRecoveryTestFailoverJob
- Start-AzureRmSiteRecoveryUnplannedFailoverJob
- Update-AzureRmSiteRecoveryProtectionDirection
- Update-AzureRmSiteRecoveryRecoveryPlan
* HUB support added to Set-AzureRmSiteRecoveryReplicationProtectedItem.
* Deprecation warning introduced for cmlets/parameter-sets which does not comply to SiteRecovery service object model.

## 2016.09.16 version 2.2.0
* Network
- New switch parameter added for network interface to enable/Disable accelerated networking -New-AzureRmNetworkInterface -EnableAcceleratedNetworking

Expand Down
117 changes: 117 additions & 0 deletions documentation/release-notes/migration-guide.3.0.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
# Breaking changes for Microsoft Azure PowerShell 3.0.0.

This document serves as both a breaking change notification and migration guide for consumers of the Microsoft Azure PowerShell cmdlets. Each section describes both the impetus for the breaking change and the migration path of least resistance. For in-depth context, please refer to the pull request associated with each change.

## Table of Contents
1. [Breaking changes to Data Lake Store cmdlets](#breaking-changes-to-data-lake-store-cmdlets)
2. [Breaking changes to ApiManagement cmdlets](#breaking-changes-to-apimanagement-cmdlets)
3. [Breaking changes to Network cmdlets](#breaking-changes-to-network-cmdlets)

## Breaking changes to Data Lake Store cmdlets

The following cmdlets were affected this release ([PR 2965](https://github.com/Azure/azure-powershell/pull/2965)):

**Get-AzureRmDataLakeStoreItemAcl (Get-AdlStoreItemAcl)**
- This cmdlet was removed and replaced with ``Get-AzureRmDataLakeStoreItemAclEntry (Get-AdlStoreItemAclEntry)``.
- The old cmdlet returned a complex object representing the access control list (ACL). The new cmdlet returns a simple list of entries in the chosen path's ACL.

```powershell
# Old
Get-AdlStoreItemAcl -Account myadlsaccount -Path /foo

# New
Get-AdlStoreItemAclEntry -Account myadlsaccount -Path /foo
```

**Get-AzureRmDataLakeStoreItemAclEntry (Get-AdlStoreItemAclEntry)**
- This cmdlet replaces the old cmdlet ``Get-AzureRmDataLakeStoreItemAcl (Get-AdlStoreItemAcl)``.
- This new cmdlet returns a simple list of entries in the chosen path's ACL, with type ``DataLakeStoreItemAce[]``.
- The output of this cmdlet can be passed in to the ``-Acl`` parameter of the following cmdlets:
- ``Remove-AzureRmDataLakeStoreItemAcl``
- ``Set-AzureRmDataLakeStoreItemAcl``
- ``Set-AzureRmDataLakeStoreItemAclEntry``

```powershell
# Old
Get-AdlStoreItemAcl -Account myadlsaccount -Path /foo

# New
Get-AdlStoreItemAclEntry -Account myadlsaccount -Path /foo
```

**Remove-AzureRmDataLakeStoreItemAcl (Remove-AdlStoreItemAcl)**, **Set-AzureRmDataLakeStoreItemAcl (Set-AdlStoreItemAcl)**, **Set-AzureRmDataLakeStoreItemAclEntry (Set-AdlStoreItemAclEntry)**
- These cmdlets now accept ``DataLakeStoreItemAce[]`` for the ``-Acl`` parameter.
- ``DataLakeStoreItemAce[]`` is returned by ``Get-AzureRmDataLakeStoreItemAclEntry (Get-AdlStoreItemAclEntry)``.

```powershell
# Old
$acl = Get-AdlStoreItemAcl -Account myadlsaccount -Path /foo
Set-AdlStoreItemAcl -Account myadlsaccount -Path /foo -Acl $acl

# New
$aclEntries = Get-AdlStoreItemAclEntry -Account myadlsaccount -Path /foo
Set-AdlStoreItemAcl -Account myadlsaccount -Path /foo -Acl $aclEntries
```

## Breaking changes to ApiManagement cmdlets

The following cmdlets were affected this release ([PR 2971](https://github.com/Azure/azure-powershell/pull/2971)):

**New-AzureRmApiManagementVirtualNetwork**
- The required parameters to reference a virtual network changed from requiring SubnetName and VnetId to SubnetResourceId in format
``/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ClassicNetwork/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}``

```powershell
# Old
$virtualNetwork = New-AzureRmApiManagementVirtualNetwork -Location <String> -SubnetName <String> -VnetId <Guid>

# New
$virtualNetwork = New-AzureRmApiManagementVirtualNetwork -Location <String> -SubnetResourceId <String>

```

**Deprecating Cmdlet Set-AzureRmApiManagementVirtualNetworks**
- The Cmdlet is getting deprecated as there was more than one way to Set Virtual Network associated to ApiManagement deployment.

```powershell
# Old
$networksList = @()
$networksList += New-AzureRmApiManagementVirtualNetwork -Location $vnetLocation -VnetId $vnetId -SubnetName $subnetName
Set-AzureRmApiManagementVirtualNetworks -ResourceGroupName "ContosoGroup" -Name "ContosoApi" -VirtualNetworks $networksList

# New
$masterRegionVirtualNetwork = New-AzureRmApiManagementVirtualNetwork -Location <String> -SubnetResourceId <String>
Update-AzureRmApiManagementDeployment -ResourceGroupName "ContosoGroup" -Name "ContosoApi" -VirtualNetwork $masterRegionVirtualNetwork
```

## Breaking changes to Network cmdlets

The following cmdlets were affected this release ([PR 2982](https://github.com/Azure/azure-powershell/pull/2982)):

**New-AzureRmVirtualNetworkGateway**
- Description of what has changed ``:- Bool parameter:-ActiveActive`` is removed and ``SwitchParameter:-EnableActiveActiveFeature`` is added for enabling Active-Active feature on newly creating virtual network gateway.

```powershell
# Old
# Sample of how the cmdlet was previously called
New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -Location $location -IpConfigurations $vnetIpConfig1,$vnetIpConfig2 -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku HighPerformance -ActiveActive $true

# New
# Sample of how the cmdlet should now be called
New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -Location $location -IpConfigurations $vnetIpConfig1,$vnetIpConfig2 -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku HighPerformance -EnableActiveActiveFeature
```

Set-AzureRmVirtualNetworkGateway
- Description of what has changed ``:- Bool parameter:-ActiveActive`` is removed and 2 ``SwitchParameters:-EnableActiveActiveFeature`` / ``DisableActiveActiveFeature`` are added for enabling and disabling Active-Active feature on virtual network gateway.

```powershell
# Old
# Sample of how the cmdlet was previously called
Set-AzureRmVirtualNetworkGateway -VirtualNetworkGateway $gw -ActiveActive $true
Set-AzureRmVirtualNetworkGateway -VirtualNetworkGateway $gw -ActiveActive $false

# New
# Sample of how the cmdlet should now be called
Set-AzureRmVirtualNetworkGateway -VirtualNetworkGateway $gw -EnableActiveActiveFeature
Set-AzureRmVirtualNetworkGateway -VirtualNetworkGateway $gw -DisableActiveActiveFeature
```
2 changes: 1 addition & 1 deletion setup/azurecmd.wxs
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="2.1.0" ?>
<?define version="3.0.0" ?>

<Product Id="*"
Name="$(var.productName)"
Expand Down
4 changes: 4 additions & 0 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -3445,6 +3445,9 @@
<Component Id="cmpC84155BCEC352235456F36314798DEB6" Guid="*">
<File Id="fil3C07A3FCD79F4E195B1E0F363C1D912D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\System.Net.Http.Primitives.dll" />
</Component>
<Component Id="cmpDFB87EBE10120BEA0EE0E65B1CA9BBFE" Guid="*">
<File Id="filF6BB7994B63BABCF5598ACDF7BFABA06" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\WebsitesStartup.ps1" />
</Component>
</Directory>
</Directory>
</Directory>
Expand Down Expand Up @@ -6570,6 +6573,7 @@
<ComponentRef Id="cmp9C45E87E06D911D61AAC3019BA99FB0C" />
<ComponentRef Id="cmp4E4BAFA8406471B1D2FFA4860A8AEAA7" />
<ComponentRef Id="cmpC84155BCEC352235456F36314798DEB6" />
<ComponentRef Id="cmpDFB87EBE10120BEA0EE0E65B1CA9BBFE" />
<ComponentRef Id="cmp5DFC4ECCB8BBF842D8069F3036386B84" />
<ComponentRef Id="cmp215D8C03C711DF4FF42B3D06ED14C790" />
<ComponentRef Id="cmpE75B6D337DC4A69EC4CB3C70C4607514" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@

[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
4 changes: 2 additions & 2 deletions src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
4 changes: 2 additions & 2 deletions src/Common/Commands.Common/AzurePowerShell.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public class AzurePowerShell

public const string AssemblyCopyright = "Copyright © Microsoft";

public const string AssemblyVersion = "2.1.0";
public const string AssemblyVersion = "3.0.0";

public const string AssemblyFileVersion = "2.1.0";
public const string AssemblyFileVersion = "3.0.0";

public const string ProfileFile = "AzureProfile.json";

Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
4 changes: 2 additions & 2 deletions src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

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

# ID used to uniquely identify this module
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.1.0'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.2.0'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("3.0.0")]
[assembly: AssemblyFileVersion("3.0.0")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
4 changes: 2 additions & 2 deletions src/ResourceManager/Automation/AzureRM.Automation.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '2.1.0'
ModuleVersion = '2.2.0'

# ID used to uniquely identify this module
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.1.0'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.2.0'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
[assembly: CLSCompliant(false)]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
#if SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#else
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/AzureBackup/AzureRM.Backup.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '2.1.0'
ModuleVersion = '2.2.0'

# ID used to uniquely identify this module
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.1.0'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.2.0'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
[assembly: CollectionBehavior(DisableTestParallelization = true)]
Loading