diff --git a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyAssignment.cs b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyAssignment.cs
index c7379348119a..87415cd80ac2 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyAssignment.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyAssignment.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Gets the policy assignment.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyAssignment), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyAssignment), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "EnforcementMode", "Metadata", "NonComplianceMessages", "NotScopes", "Parameters", "PolicyDefinitionId", "Scope" })]
     [Cmdlet(VerbsCommon.Get, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicyAssignment", DefaultParameterSetName = PolicyCmdletBase.DefaultParameterSet), OutputType(typeof(PsPolicyAssignment))]
     public class GetAzurePolicyAssignmentCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs
index fddfb5d5a1b1..ba41b22bb144 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Gets the policy definition.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyDefinition), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyDefinition), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "Metadata", "Mode", "Parameters", "PolicyRule", "PolicyType" })]
     [Cmdlet(VerbsCommon.Get, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicyDefinition", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet), OutputType(typeof(PsPolicyDefinition))]
     public class GetAzurePolicyDefinitionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyExemption.cs b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyExemption.cs
index a315c1bd2631..109b86e1817a 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyExemption.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyExemption.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Gets the policy exemption.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyExemption), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyExemption), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "ExemptionCategory", "ExpiresOn", "Metadata", "PolicyAssignmentId", "PolicyDefinitionReferenceIds" })]
     [Cmdlet(VerbsCommon.Get, AzureRMConstants.AzureRMPrefix + "PolicyExemption", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet), OutputType(typeof(PsPolicyExemption))]
     public class GetAzurePolicyExemptionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicySetDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicySetDefinition.cs
index 086ddee38b8f..62c870df113e 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicySetDefinition.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicySetDefinition.cs
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Gets the policy set definition.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicySetDefinition), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicySetDefinition), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "Metadata", "Parameters", "PolicyDefinitionGroups", "PolicyDefinitions", "PolicyType" })]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicySetDefinition", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet), OutputType(typeof(PsPolicySetDefinition))]
     public class GetAzurePolicySetDefinitionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyAssignment.cs b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyAssignment.cs
index cfbae95473ae..001ae8342ea4 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyAssignment.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyAssignment.cs
@@ -35,7 +35,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Creates a policy assignment.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyAssignment), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyAssignment), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "EnforcementMode", "Metadata", "NonComplianceMessages", "NotScopes", "Parameters", "PolicyDefinitionId", "Scope" })]
     [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicyAssignment", DefaultParameterSetName = PolicyCmdletBase.DefaultParameterSet), OutputType(typeof(PsPolicyAssignment))]
     public class NewAzurePolicyAssignmentCmdlet : PolicyCmdletBase, IDynamicParameters
diff --git a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyDefinition.cs
index 630e13234b68..7b033fc2072b 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyDefinition.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyDefinition.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Creates the new policy definition.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyDefinition), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyDefinition), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "Metadata", "Mode", "Parameters", "PolicyRule", "PolicyType" })]
     [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicyDefinition", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet), OutputType(typeof(PsPolicyDefinition))]
     public class NewAzurePolicyDefinitionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyExemption.cs b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyExemption.cs
index 11b5ba2df831..d4a4efa6d09e 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyExemption.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicyExemption.cs
@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Creates a policy exemption.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyExemption), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyExemption), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "ExemptionCategory", "ExpiresOn", "Metadata", "PolicyAssignmentId", "PolicyDefinitionReferenceIds" })]
     [Cmdlet(VerbsCommon.New, AzureRMConstants.AzureRMPrefix + "PolicyExemption", DefaultParameterSetName = PolicyCmdletBase.DefaultParameterSet, SupportsShouldProcess = true), OutputType(typeof(PsPolicyExemption))]
     public class NewAzurePolicyExemptionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicySetDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicySetDefinition.cs
index 1aca1a7fb3bc..f0fa3186a8ec 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicySetDefinition.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/NewAzurePolicySetDefinition.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Creates the policy set definition.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicySetDefinition), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicySetDefinition), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "Metadata", "Parameters", "PolicyDefinitionGroups", "PolicyDefinitions", "PolicyType" })]
     [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicySetDefinition", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PsPolicySetDefinition))]
     public class NewAzurePolicySetDefinitionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyAssignment.cs b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyAssignment.cs
index 79592d096f8d..d3e8fa61179d 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyAssignment.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyAssignment.cs
@@ -33,7 +33,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Sets the policy assignment.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyAssignment), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyAssignment), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "EnforcementMode", "Metadata", "NonComplianceMessages", "NotScopes", "Parameters", "PolicyDefinitionId", "Scope" })]
     [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicyAssignment", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet), OutputType(typeof(PsPolicyAssignment))]
     public class SetAzurePolicyAssignmentCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyDefinition.cs
index 60b6928995ed..381361b0794c 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyDefinition.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyDefinition.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Sets the policy definition.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyDefinition), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyDefinition), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "Metadata", "Mode", "Parameters", "PolicyRule", "PolicyType" })]
     [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicyDefinition", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet), OutputType(typeof(PsPolicyDefinition))]
     public class SetAzurePolicyDefinitionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyExemption.cs b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyExemption.cs
index f51f6ad876f3..2ca85e475932 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyExemption.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicyExemption.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Sets the policy exemption.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicyExemption), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicyExemption), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "ExemptionCategory", "ExpiresOn", "Metadata", "PolicyAssignmentId", "PolicyDefinitionReferenceIds" })]
     [Cmdlet(VerbsCommon.Set, AzureRMConstants.AzureRMPrefix + "PolicyExemption", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PsPolicyExemption))]
     public class SetAzurePolicyExemptionCmdlet : PolicyCmdletBase
diff --git a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicySetDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicySetDefinition.cs
index b4f55aa4deeb..acb467589a18 100644
--- a/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicySetDefinition.cs
+++ b/src/Resources/ResourceManager/Implementation/Policy/SetAzurePolicySetDefinition.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// Sets the policy definition.
     /// </summary>
     [CmdletOutputBreakingChangeWithVersion(
-        typeof(PsPolicySetDefinition), deprecateByAzVersion: "11.0.0", deprecateByVersion: "7.0.0", DeprecatedOutputProperties = new[] { "Properties" },
+        typeof(PsPolicySetDefinition), deprecateByAzVersion: "12.0.0", deprecateByVersion: "7.1.0", DeprecatedOutputProperties = new[] { "Properties" },
         NewOutputProperties = new[] { "Description", "DisplayName", "Metadata", "Parameters", "PolicyDefinitionGroups", "PolicyDefinitions", "PolicyType" })]
     [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "PolicySetDefinition", DefaultParameterSetName = PolicyCmdletBase.NameParameterSet, SupportsShouldProcess = true), OutputType(typeof(PsPolicySetDefinition))]
     public class SetAzurePolicySetDefinitionCmdlet : PolicyCmdletBase