Azure · markcowl · Jun 29, 2016 · Jun 10, 2016 · Jun 14, 2016 · Jun 15, 2016
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,9 @@
+##2016.06.23 version 1.5.1
+* Azure Resource Manager
+  - 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.
+* AzureRM.Profile
+  - Fix issues #2387, #2388 with SubscriptionId and TenantId ValidationSet in Set-AzureRMContext cmdlet
+
 ##2016.06.01 version 1.5.0
 * Azure Resource Manager
   - (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly

diff --git a/setup/azurecmd.wxs b/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="1.5.0" ?>
+  <?define version="1.5.1" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

diff --git a/src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs b/src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs
@@ -28,6 +28,6 @@
 
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs b/src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs
@@ -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("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs b/src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/src/Common/Commands.Common/AzurePowerShell.cs b/src/Common/Commands.Common/AzurePowerShell.cs
@@ -26,9 +26,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "1.5.0";
+        public const string AssemblyVersion = "1.5.1";
 
-        public const string AssemblyFileVersion = "1.5.0";
+        public const string AssemblyFileVersion = "1.5.1";
 
         public const string ProfileFile = "AzureProfile.json";
 

diff --git a/src/Common/Commands.Common/Properties/AssemblyInfo.cs b/src/Common/Commands.Common/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

diff --git a/src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs b/src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs
@@ -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("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.1.1' 
+ModuleVersion = '1.1.2' 
 
 # ID used to uniquely identify this module  
 GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'  
@@ -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 = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

diff --git a/...Manager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs b/...Manager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs
@@ -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("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs
@@ -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("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs
@@ -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("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]
diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Properties/AssemblyInfo.cs
@@ -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("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/ResourceManager/Automation/AzureRM.Automation.psd1 b/src/ResourceManager/Automation/AzureRM.Automation.psd1
@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.9' 
+ModuleVersion = '1.0.10' 
 
 # ID used to uniquely identify this module  
 GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'  
@@ -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 = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/Automation/Commands.Automation.Test/Properties/AssemblyInfo.cs
@@ -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("1.0.9")]
-[assembly: AssemblyFileVersion("1.0.9")]
+[assembly: AssemblyVersion("1.0.10")]
+[assembly: AssemblyFileVersion("1.0.10")]
 [assembly: CLSCompliant(false)]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs b/src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs
@@ -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("1.0.9")]
-[assembly: AssemblyFileVersion("1.0.9")]
+[assembly: AssemblyVersion("1.0.10")]
+[assembly: AssemblyFileVersion("1.0.10")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

diff --git a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1
@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.9' 
+ModuleVersion = '1.0.10' 
 
 # ID used to uniquely identify this module  
 GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'  
@@ -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 = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Properties/AssemblyInfo.cs
@@ -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("1.0.9")]
-[assembly: AssemblyFileVersion("1.0.9")]
+[assembly: AssemblyVersion("1.0.10")]
+[assembly: AssemblyFileVersion("1.0.10")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/AssemblyInfo.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 
-[assembly: AssemblyVersion("1.0.9")]
-[assembly: AssemblyFileVersion("1.0.9")]
+[assembly: AssemblyVersion("1.0.10")]
+[assembly: AssemblyFileVersion("1.0.10")]
diff --git a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1
@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.1.1' 
+ModuleVersion = '1.1.2' 
 
 # ID used to uniquely identify this module  
 GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'  
@@ -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 = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Properties/AssemblyInfo.cs
@@ -33,6 +33,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.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Properties/AssemblyInfo.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("ed102280-3577-49bf-93dd-11b6e3a44a57")]
-[assembly: AssemblyVersion("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Batch.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

diff --git a/src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1 b/src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1
@@ -12,7 +12,7 @@
 ModuleToProcess = 'Microsoft.AzureStack.Commands.dll'
 
 # Version number of this module.
-ModuleVersion = '0.9.6'
+ModuleVersion = '0.9.7'
 
 # ID used to uniquely identify this module
 GUID = '0e691e0a-ce16-40f2-af84-86fb0d82fb29'
@@ -48,7 +48,7 @@ CLRVersion = '4.0'
 ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

diff --git a/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin/Properties/AssemblyInfo.cs b/src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 
 [assembly: Guid("0B02390C-8AA9-4D99-8AA8-2A9D2D39682F")]
 
-[assembly: AssemblyVersion("0.9.6")]
-[assembly: AssemblyFileVersion("0.9.6")]
+[assembly: AssemblyVersion("0.9.7")]
+[assembly: AssemblyFileVersion("0.9.7")]
diff --git a/src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1 b/src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1
@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.7' 
+ModuleVersion = '0.9.8' 
 
 # ID used to uniquely identify this module  
 GUID = 'DA5816B5-97A6-4301-9AA0-72CC68C79F20'  
@@ -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 = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

diff --git a/...urceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Properties/AssemblyInfo.cs b/...urceManager/AzureStackStorage/Commands.AzureStackStorage.Tests/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 
 [assembly: Guid("5802D147-3EE9-4352-A0B1-1C16B6DBCA7C")]
 
-[assembly: AssemblyVersion("0.9.7")]
-[assembly: AssemblyFileVersion("0.9.7")]
+[assembly: AssemblyVersion("0.9.8")]
+[assembly: AssemblyFileVersion("0.9.8")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage/Properties/AssemblyInfo.cs b/src/ResourceManager/AzureStackStorage/Commands.AzureStackStorage/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 
 [assembly: Guid("D4CA0CC1-CD0A-4CE2-A40D-2D8A082D8791")]
 
-[assembly: AssemblyVersion("0.9.7")]
-[assembly: AssemblyFileVersion("0.9.7")]
+[assembly: AssemblyVersion("0.9.8")]
+[assembly: AssemblyFileVersion("0.9.8")]
diff --git a/src/ResourceManager/Cdn/AzureRM.Cdn.psd1 b/src/ResourceManager/Cdn/AzureRM.Cdn.psd1
@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.3' 
+ModuleVersion = '1.0.4' 
 
 # ID used to uniquely identify this module  
 GUID = '52594002-DB89-46DF-928D-2755DAD840E8'  
@@ -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 = '1.0.9'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.10'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/Cdn/Commands.Cdn.Test/Properties/AssemblyInfo.cs
@@ -45,5 +45,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.3")]
-[assembly: AssemblyFileVersion("1.0.3")]
+[assembly: AssemblyVersion("1.0.4")]
+[assembly: AssemblyFileVersion("1.0.4")]
diff --git a/src/ResourceManager/Cdn/Commands.Cdn/Properties/AssemblyInfo.cs b/src/ResourceManager/Cdn/Commands.Cdn/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
-[assembly: AssemblyVersion("1.0.3")]
-[assembly: AssemblyFileVersion("1.0.3")]
+[assembly: AssemblyVersion("1.0.4")]
+[assembly: AssemblyFileVersion("1.0.4")]
diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/AssemblyInfo.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("3819d8a7-c62c-4c47-8ddd-0332d9ce1252")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/...ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj b/...ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj
@@ -163,6 +163,7 @@
     <Compile Include="PowerShellExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RMTestBase.cs" />
+    <Compile Include="TestExecutionHelpers.cs" />
     <Compile Include="XunitTracingInterceptor.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...ourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/TestExecutionHelpers.cs b/...ourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/TestExecutionHelpers.cs
@@ -0,0 +1,47 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+
+namespace Microsoft.Azure.Commands.ScenarioTest
+{
+    public static class TestExecutionHelpers
+    {
+        /// <summary>
+        /// Retry an action until it succeeds - use for flaky tests
+        /// </summary>
+        /// <param name="testAction">Action tor etry</param>
+        /// <param name="maxTries">The maximum number of times to try the action</param>
+        public static void RetryAction(Action testAction, int maxTries = 3)
+        {
+            var tries = 0;
+            var succeeded = false;
+            do
+            {
+                try
+                {
+                    testAction();
+                    succeeded = true;
+                }
+                catch (Exception)
+                {
+                    if (++tries >= maxTries)
+                    {
+                        throw;
+                    }
+                }
+            } while (!succeeded);
+        }
+    }
+}