Skip to content

Commit 65751f8

Browse files
cormacpaynecormacpayne
committed
Merge branch 'master' of https://github.com/Azure/azure-powershell into preview-master-merge
# Conflicts: # src/ResourceManager/DevTestLabs/ChangeLog.md # src/ResourceManager/Resources/ChangeLog.md # src/ServiceManagement/Services/Commands.Utilities/ChangeLog.md
2 parents 3bd30e6 + 8cb3ca8 commit 65751f8

File tree

245 files changed

+634
-824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+634
-824
lines changed

‎ChangeLog.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
## 2017.05.12 - Version 4.0.1
1+
## 2017.05.23 - Version 4.0.2
2+
* Profile
3+
* Add-AzureRmAccount
4+
* Added `-EnvironmentName` parameter alis for backward compatibility with 2.x versions of AzureRM.profile
5+
6+
## 2017.05.12 - Version 4.0.1
27
* Fix issue with New-AzureStorageContext in offline scenarios: https://github.com/Azure/azure-powershell/issues/3939
38

49
## 2017.05.10 - Version 4.0.0
@@ -3214,4 +3219,4 @@ Virtual Network cmdlets
32143219
* iisnode 0.1.13
32153220

32163221
2011.12.09 Version 0.5.0
3217-
* Initial Release
3222+
* Initial Release

‎setup/azurecmd.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="4.0.1" ?>
8+
<?define version="4.0.2" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎src/Common/Commands.Common/AzurePSCmdlet.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected string PSVersion
9898
/// <summary>
9999
/// Gets PowerShell module version used for user agent header.
100100
/// </summary>
101-
protected string ModuleVersion { get { return Assembly.GetCallingAssembly().GetName().Version.ToString(); } }
101+
protected string ModuleVersion { get { return AzurePowerShell.AssemblyVersion; } }
102102

103103
/// <summary>
104104
/// The context for management cmdlet requests - includes account, tenant, subscription,

‎src/Common/Commands.Common/AzurePowerShell.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class AzurePowerShell
2626

2727
public const string AssemblyCopyright = "Copyright © Microsoft";
2828

29-
public const string AssemblyVersion = "4.0.0";
29+
public const string AssemblyVersion = "4.0.2";
3030

31-
public const string AssemblyFileVersion = "4.0.0";
31+
public const string AssemblyFileVersion = "4.0.2";
3232

3333
public const string ProfileFile = "AzureProfile.json";
3434

‎src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/5/2017
6+
# Generated on: 5/21/2017
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.3.0'
15+
ModuleVersion = '0.3.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()

‎src/ResourceManager/AnalysisServices/ChangeLog.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21-
2221
* New SKUs added: B1, B2, S0
2322
* Scale up/down support added
2423

24+
## Version 0.3.1
25+
2526
## Version 0.3.0
2627

2728
## Version 0.2.0

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.3.0'
12+
ModuleVersion = '0.3.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// by using the '*' as shown below:
3636

3737

38-
[assembly: AssemblyVersion("0.3.0")]
39-
[assembly: AssemblyFileVersion("0.3.0")]
38+
[assembly: AssemblyVersion("0.3.1")]
39+
[assembly: AssemblyFileVersion("0.3.1")]

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232

3333
[assembly: Guid("37af97fd-d603-4d52-a7a6-0885004a57fe")]
3434

35-
[assembly: AssemblyVersion("0.3.0")]
36-
[assembly: AssemblyFileVersion("0.3.0")]
35+
[assembly: AssemblyVersion("0.3.1")]
36+
[assembly: AssemblyFileVersion("0.3.1")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// by using the '*' as shown below:
3636

3737

38-
[assembly: AssemblyVersion("0.3.0")]
39-
[assembly: AssemblyFileVersion("0.3.0")]
38+
[assembly: AssemblyVersion("0.3.1")]
39+
[assembly: AssemblyFileVersion("0.3.1")]

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/5/2017
6+
# Generated on: 5/21/2017
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '4.0.0'
15+
ModuleVersion = '4.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()
@@ -185,8 +185,7 @@ PrivateData = @{
185185
# IconUri = ''
186186

187187
# ReleaseNotes of this module
188-
ReleaseNotes = '* Added support for configuring external groups in New-AzureRmApiManagementGroup.
189-
'
188+
ReleaseNotes = 'Updated for common code changes'
190189

191190
# External dependent modules of this module
192191
# ExternalModuleDependencies = ''

‎src/ResourceManager/ApiManagement/ChangeLog.md

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020
## Current Release
2121

22+
## Version 4.0.1
23+
2224
## Version 4.0.0
2325
* Added support for configuring external groups in New-AzureRmApiManagementGroup.
2426

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("4.0.0")]
46-
[assembly: AssemblyFileVersion("4.0.0")]
45+
[assembly: AssemblyVersion("4.0.1")]
46+
[assembly: AssemblyFileVersion("4.0.1")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("4.0.0")]
45-
[assembly: AssemblyFileVersion("4.0.0")]
44+
[assembly: AssemblyVersion("4.0.1")]
45+
[assembly: AssemblyFileVersion("4.0.1")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("4.0.0")]
45-
[assembly: AssemblyFileVersion("4.0.0")]
44+
[assembly: AssemblyVersion("4.0.1")]
45+
[assembly: AssemblyFileVersion("4.0.1")]

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("4.0.0")]
46-
[assembly: AssemblyFileVersion("4.0.0")]
45+
[assembly: AssemblyVersion("4.0.1")]
46+
[assembly: AssemblyFileVersion("4.0.1")]
4747
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Automation/AzureRM.Automation.psd1

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/5/2017
6+
# Generated on: 5/21/2017
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '3.0.0'
15+
ModuleVersion = '3.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()

‎src/ResourceManager/Automation/ChangeLog.md

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020
## Current Release
2121

22+
## Version 3.0.1
23+
2224
## Version 3.0.0
2325

2426
## Version 2.8.0

‎src/ResourceManager/Automation/Commands.Automation.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("3.0.0")]
47-
[assembly: AssemblyFileVersion("3.0.0")]
46+
[assembly: AssemblyVersion("3.0.1")]
47+
[assembly: AssemblyFileVersion("3.0.1")]
4848
[assembly: CLSCompliant(false)]
4949
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("3.0.0")]
47-
[assembly: AssemblyFileVersion("3.0.0")]
46+
[assembly: AssemblyVersion("3.0.1")]
47+
[assembly: AssemblyFileVersion("3.0.1")]
4848
#if SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else

‎src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/5/2017
6+
# Generated on: 5/21/2017
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '3.0.0'
15+
ModuleVersion = '3.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()

‎src/ResourceManager/AzureBackup/ChangeLog.md

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020
## Current Release
2121

22+
## Version 3.0.1
23+
2224
## Version 3.0.0
2325

2426
## Version 2.8.0

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848

49-
[assembly: AssemblyVersion("3.0.0")]
50-
[assembly: AssemblyFileVersion("3.0.0")]
49+
[assembly: AssemblyVersion("3.0.1")]
50+
[assembly: AssemblyFileVersion("3.0.1")]
5151
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
[assembly: ComVisible(false)]
3232
[assembly: CLSCompliant(false)]
3333

34-
[assembly: AssemblyVersion("3.0.0")]
35-
[assembly: AssemblyFileVersion("3.0.0")]
34+
[assembly: AssemblyVersion("3.0.1")]
35+
[assembly: AssemblyFileVersion("3.0.1")]

‎src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/5/2017
6+
# Generated on: 5/21/2017
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '3.0.0'
15+
ModuleVersion = '3.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'; })
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()

‎src/ResourceManager/AzureBatch/ChangeLog.md

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020
## Current Release
2121

22+
## Version 3.0.1
23+
2224
## Version 3.0.0
2325

2426
## Version 2.8.0

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535

36-
[assembly: AssemblyVersion("3.0.0")]
37-
[assembly: AssemblyFileVersion("3.0.0")]
36+
[assembly: AssemblyVersion("3.0.1")]
37+
[assembly: AssemblyFileVersion("3.0.1")]
3838
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/ResourceManager/AzureBatch/Commands.Batch/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("ed102280-3577-49bf-93dd-11b6e3a44a57")]
28-
[assembly: AssemblyVersion("3.0.0")]
29-
[assembly: AssemblyFileVersion("3.0.0")]
28+
[assembly: AssemblyVersion("3.0.1")]
29+
[assembly: AssemblyFileVersion("3.0.1")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Batch.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else

‎src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.14.0'
12+
ModuleVersion = '0.14.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'DA5816B5-97A6-4301-9AA0-72CC68C79F20'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.0'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

‎src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232

3333
[assembly: Guid("5802D147-3EE9-4352-A0B1-1C16B6DBCA7C")]
3434

35-
[assembly: AssemblyVersion("0.14.0")]
36-
[assembly: AssemblyFileVersion("0.14.0")]
35+
[assembly: AssemblyVersion("0.14.1")]
36+
[assembly: AssemblyFileVersion("0.14.1")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

0 commit comments

Comments
 (0)