Skip to content

Commit 81ffa30

Browse files
markcowlmarkcowl
authored
Merge pull request #2527 from Azure/release-1.5.1
Merge release -> master for Release 1.5.1
2 parents d489832 + 5a6f985 commit 81ffa30

File tree

202 files changed

+5667
-4431
lines changed

Some content is hidden

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

202 files changed

+5667
-4431
lines changed

‎ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
##2016.06.23 version 1.5.1
2+
* Azure Resource Manager
3+
- Fix a bug in New-AzureRmResourceGroupDeployment. In some deployments the cmdlet throws an exception with "Deployment 'deploymentName' could not be found." and causes the cmdlet to fail. The fix makes sure the deployment is created before getting operations.
4+
* AzureRM.Profile
5+
- Fix issues #2387, #2388 with SubscriptionId and TenantId ValidationSet in Set-AzureRMContext cmdlet
6+
17
##2016.06.01 version 1.5.0
28
* Azure Resource Manager
39
- (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
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="1.5.0" ?>
8+
<?define version="1.5.1" ?>
99

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

‎src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828

2929
[assembly: ComVisible(false)]
3030
[assembly: CLSCompliant(false)]
31-
[assembly: AssemblyVersion("1.5.0")]
32-
[assembly: AssemblyFileVersion("1.5.0")]
31+
[assembly: AssemblyVersion("1.5.1")]
32+
[assembly: AssemblyFileVersion("1.5.1")]
3333
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848
// [assembly: AssemblyVersion("1.0.*")]
49-
[assembly: AssemblyVersion("1.5.0")]
50-
[assembly: AssemblyFileVersion("1.5.0")]
49+
[assembly: AssemblyVersion("1.5.1")]
50+
[assembly: AssemblyFileVersion("1.5.1")]

‎src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion("1.5.0")]
28-
[assembly: AssemblyFileVersion("1.5.0")]
27+
[assembly: AssemblyVersion("1.5.1")]
28+
[assembly: AssemblyFileVersion("1.5.1")]

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

Lines changed: 2 additions & 2 deletions
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 = "1.5.0";
29+
public const string AssemblyVersion = "1.5.1";
3030

31-
public const string AssemblyFileVersion = "1.5.0";
31+
public const string AssemblyFileVersion = "1.5.1";
3232

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

‎src/Common/Commands.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
28-
[assembly: AssemblyVersion("1.5.0")]
29-
[assembly: AssemblyFileVersion("1.5.0")]
28+
[assembly: AssemblyVersion("1.5.1")]
29+
[assembly: AssemblyFileVersion("1.5.1")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

‎src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.5.0")]
36-
[assembly: AssemblyFileVersion("1.5.0")]
35+
[assembly: AssemblyVersion("1.5.1")]
36+
[assembly: AssemblyFileVersion("1.5.1")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.1.1'
12+
ModuleVersion = '1.1.2'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
@@ -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 = '1.0.9'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
4949

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

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

Lines changed: 2 additions & 2 deletions
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("1.1.1")]
46-
[assembly: AssemblyFileVersion("1.1.1")]
45+
[assembly: AssemblyVersion("1.1.2")]
46+
[assembly: AssemblyFileVersion("1.1.2")]

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

Lines changed: 2 additions & 2 deletions
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("1.1.1")]
45-
[assembly: AssemblyFileVersion("1.1.1")]
44+
[assembly: AssemblyVersion("1.1.2")]
45+
[assembly: AssemblyFileVersion("1.1.2")]

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

Lines changed: 2 additions & 2 deletions
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("1.1.1")]
45-
[assembly: AssemblyFileVersion("1.1.1")]
44+
[assembly: AssemblyVersion("1.1.2")]
45+
[assembly: AssemblyFileVersion("1.1.2")]

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

Lines changed: 2 additions & 2 deletions
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("1.1.1")]
46-
[assembly: AssemblyFileVersion("1.1.1")]
45+
[assembly: AssemblyVersion("1.1.2")]
46+
[assembly: AssemblyFileVersion("1.1.2")]
4747
[assembly: CollectionBehavior(DisableTestParallelization = true)]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.9'
12+
ModuleVersion = '1.0.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'
@@ -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 = '1.0.9'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
4949

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

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

Lines changed: 2 additions & 2 deletions
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("1.0.9")]
47-
[assembly: AssemblyFileVersion("1.0.9")]
46+
[assembly: AssemblyVersion("1.0.10")]
47+
[assembly: AssemblyFileVersion("1.0.10")]
4848
[assembly: CLSCompliant(false)]
4949
[assembly: CollectionBehavior(DisableTestParallelization = true)]

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

Lines changed: 2 additions & 2 deletions
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("1.0.9")]
47-
[assembly: AssemblyFileVersion("1.0.9")]
46+
[assembly: AssemblyVersion("1.0.10")]
47+
[assembly: AssemblyFileVersion("1.0.10")]
4848
#if SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.9'
12+
ModuleVersion = '1.0.10'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'
@@ -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 = '1.0.9'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
4949

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

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

Lines changed: 2 additions & 2 deletions
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("1.0.9")]
50-
[assembly: AssemblyFileVersion("1.0.9")]
49+
[assembly: AssemblyVersion("1.0.10")]
50+
[assembly: AssemblyFileVersion("1.0.10")]
5151
[assembly: CollectionBehavior(DisableTestParallelization = true)]

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

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

34-
[assembly: AssemblyVersion("1.0.9")]
35-
[assembly: AssemblyFileVersion("1.0.9")]
34+
[assembly: AssemblyVersion("1.0.10")]
35+
[assembly: AssemblyFileVersion("1.0.10")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.1.1'
12+
ModuleVersion = '1.1.2'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'
@@ -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 = '1.0.9'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
4949

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

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

Lines changed: 2 additions & 2 deletions
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("1.1.1")]
37-
[assembly: AssemblyFileVersion("1.1.1")]
36+
[assembly: AssemblyVersion("1.1.2")]
37+
[assembly: AssemblyFileVersion("1.1.2")]
3838
[assembly: CollectionBehavior(DisableTestParallelization = true)]

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

Lines changed: 2 additions & 2 deletions
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("1.1.1")]
29-
[assembly: AssemblyFileVersion("1.1.1")]
28+
[assembly: AssemblyVersion("1.1.2")]
29+
[assembly: AssemblyFileVersion("1.1.2")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Batch.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else

‎src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ModuleToProcess = 'Microsoft.AzureStack.Commands.dll'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.9.6'
15+
ModuleVersion = '0.9.7'
1616

1717
# ID used to uniquely identify this module
1818
GUID = '0e691e0a-ce16-40f2-af84-86fb0d82fb29'
@@ -48,7 +48,7 @@ CLRVersion = '4.0'
4848
ProcessorArchitecture = ''
4949

5050
# Modules that must be imported into the global environment prior to importing this module
51-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.9'})
51+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
5252

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929

3030
[assembly: Guid("0B02390C-8AA9-4D99-8AA8-2A9D2D39682F")]
3131

32-
[assembly: AssemblyVersion("0.9.6")]
33-
[assembly: AssemblyFileVersion("0.9.6")]
32+
[assembly: AssemblyVersion("0.9.7")]
33+
[assembly: AssemblyFileVersion("0.9.7")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.9.7'
12+
ModuleVersion = '0.9.8'
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 = '1.0.9'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
4949

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

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

Lines changed: 2 additions & 2 deletions
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.9.7")]
36-
[assembly: AssemblyFileVersion("0.9.7")]
35+
[assembly: AssemblyVersion("0.9.8")]
36+
[assembly: AssemblyFileVersion("0.9.8")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929

3030
[assembly: Guid("D4CA0CC1-CD0A-4CE2-A40D-2D8A082D8791")]
3131

32-
[assembly: AssemblyVersion("0.9.7")]
33-
[assembly: AssemblyFileVersion("0.9.7")]
32+
[assembly: AssemblyVersion("0.9.8")]
33+
[assembly: AssemblyFileVersion("0.9.8")]

‎src/ResourceManager/Cdn/AzureRM.Cdn.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.3'
12+
ModuleVersion = '1.0.4'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '52594002-DB89-46DF-928D-2755DAD840E8'
@@ -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 = '1.0.9'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
4949

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545
//
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
48-
[assembly: AssemblyVersion("1.0.3")]
49-
[assembly: AssemblyFileVersion("1.0.3")]
48+
[assembly: AssemblyVersion("1.0.4")]
49+
[assembly: AssemblyFileVersion("1.0.4")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
28-
[assembly: AssemblyVersion("1.0.3")]
29-
[assembly: AssemblyFileVersion("1.0.3")]
28+
[assembly: AssemblyVersion("1.0.4")]
29+
[assembly: AssemblyFileVersion("1.0.4")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("3819d8a7-c62c-4c47-8ddd-0332d9ce1252")]
27-
[assembly: AssemblyVersion("1.5.0")]
28-
[assembly: AssemblyFileVersion("1.5.0")]
27+
[assembly: AssemblyVersion("1.5.1")]
28+
[assembly: AssemblyFileVersion("1.5.1")]

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@
163163
<Compile Include="PowerShellExtensions.cs" />
164164
<Compile Include="Properties\AssemblyInfo.cs" />
165165
<Compile Include="RMTestBase.cs" />
166+
<Compile Include="TestExecutionHelpers.cs" />
166167
<Compile Include="XunitTracingInterceptor.cs" />
167168
</ItemGroup>
168169
<ItemGroup>

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/TestExecutionHelpers.cs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
16+
17+
namespace Microsoft.Azure.Commands.ScenarioTest
18+
{
19+
public static class TestExecutionHelpers
20+
{
21+
/// <summary>
22+
/// Retry an action until it succeeds - use for flaky tests
23+
/// </summary>
24+
/// <param name="testAction">Action tor etry</param>
25+
/// <param name="maxTries">The maximum number of times to try the action</param>
26+
public static void RetryAction(Action testAction, int maxTries = 3)
27+
{
28+
var tries = 0;
29+
var succeeded = false;
30+
do
31+
{
32+
try
33+
{
34+
testAction();
35+
succeeded = true;
36+
}
37+
catch (Exception)
38+
{
39+
if (++tries >= maxTries)
40+
{
41+
throw;
42+
}
43+
}
44+
} while (!succeeded);
45+
}
46+
}
47+
}

0 commit comments

Comments
 (0)