diff --git a/src/KeyVault/KeyVault/ChangeLog.md b/src/KeyVault/KeyVault/ChangeLog.md
index c785fe748ba4..9935e96f0a4c 100644
--- a/src/KeyVault/KeyVault/ChangeLog.md
+++ b/src/KeyVault/KeyVault/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+Added warning messages for planning to remove attribute SecretVauleText
 
 ## Version 2.0.0
 * Removed two aliases: `New-AzKeyVaultCertificateAdministratorDetails` and `New-AzKeyVaultCertificateOrganizationDetails`
diff --git a/src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs
index 442ea53f2c85..5a3b9a5b4f13 100644
--- a/src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs
@@ -15,13 +15,17 @@
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecret",        DefaultParameterSetName = ByVaultNameParameterSet)]
+    [CmdletOutputBreakingChange(typeof(PSKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
+    [CmdletOutputBreakingChange(typeof(PSDeletedKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecret", DefaultParameterSetName = ByVaultNameParameterSet)]
     [OutputType(typeof(PSKeyVaultSecretIdentityItem), typeof(PSKeyVaultSecret), typeof(PSDeletedKeyVaultSecretIdentityItem), typeof(PSDeletedKeyVaultSecret))]
     public class GetAzureKeyVaultSecret : KeyVaultCmdletBase
     {
diff --git a/src/KeyVault/KeyVault/Commands/RemoveAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
index c983e8a87182..71e2224830c6 100644
--- a/src/KeyVault/KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/RemoveAzureKeyVaultSecret.cs
@@ -15,11 +15,14 @@
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.KeyVault.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+using System;
 using System.Globalization;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
+    [CmdletOutputBreakingChange(typeof(PSDeletedKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
     [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecret",SupportsShouldProcess = true,DefaultParameterSetName = ByVaultNameParameterSet)]
     [OutputType(typeof(PSDeletedKeyVaultSecret))]
     public class RemoveAzureKeyVaultSecret : KeyVaultCmdletBase
diff --git a/src/KeyVault/KeyVault/Commands/RestoreAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/RestoreAzureKeyVaultSecret.cs
index c76f74652351..e3d08ac6e0f3 100644
--- a/src/KeyVault/KeyVault/Commands/RestoreAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/RestoreAzureKeyVaultSecret.cs
@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.IO;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Common.Authentication;
@@ -19,12 +20,14 @@
 using Microsoft.Azure.Commands.KeyVault.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
     /// <summary>
     /// Restores the backup secret into a vault 
     /// </summary>
+    [CmdletOutputBreakingChange(typeof(PSKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
     [Cmdlet("Restore", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecret",SupportsShouldProcess = true,DefaultParameterSetName = ByVaultNameParameterSet)]
     [OutputType( typeof(PSKeyVaultSecret) )]
     public class RestoreAzureKeyVaultSecret : KeyVaultCmdletBase
diff --git a/src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs
index 6248b9574707..a2975a029683 100644
--- a/src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/SetAzureKeyVaultSecret.cs
@@ -15,6 +15,7 @@
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -23,6 +24,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
+    [CmdletOutputBreakingChange(typeof(PSKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
     [Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecret",SupportsShouldProcess = true,DefaultParameterSetName = DefaultParameterSet)]
     [OutputType(typeof(PSKeyVaultSecret))]
     public class SetAzureKeyVaultSecret : KeyVaultCmdletBase
diff --git a/src/KeyVault/KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs b/src/KeyVault/KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs
index 211884fac300..86dd416bf2ab 100644
--- a/src/KeyVault/KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs
+++ b/src/KeyVault/KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs
@@ -14,10 +14,13 @@
 
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
+    [CmdletOutputBreakingChange(typeof(PSKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
     [Cmdlet("Undo", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecretRemoval",SupportsShouldProcess = true,DefaultParameterSetName = DefaultParameterSet)]
     [OutputType(typeof(PSKeyVaultSecret))]
     public class UndoAzureKeyVaultSecretRemoval : KeyVaultCmdletBase
diff --git a/src/KeyVault/KeyVault/Commands/UpdateAzureKeyVaultSecret.cs b/src/KeyVault/KeyVault/Commands/UpdateAzureKeyVaultSecret.cs
index 8e47667c3f44..70b38e086796 100644
--- a/src/KeyVault/KeyVault/Commands/UpdateAzureKeyVaultSecret.cs
+++ b/src/KeyVault/KeyVault/Commands/UpdateAzureKeyVaultSecret.cs
@@ -14,12 +14,14 @@
 
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Collections;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
+    [CmdletOutputBreakingChange(typeof(PSKeyVaultSecret), "3.0.0", DeprecatedOutputProperties = new String[] { "SecretValueText" })]
     [Cmdlet("Update", ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecret",DefaultParameterSetName = DefaultParameterSet,SupportsShouldProcess = true)]
     [OutputType(typeof(PSKeyVaultSecret))]
     [Alias("Set-" + ResourceManager.Common.AzureRMConstants.AzurePrefix + "KeyVaultSecretAttribute")]