diff --git a/src/DnsResolver/Az.DnsResolver.psd1 b/src/DnsResolver/Az.DnsResolver.psd1
index cd9addaaf8c5..e8fdcc909653 100644
--- a/src/DnsResolver/Az.DnsResolver.psd1
+++ b/src/DnsResolver/Az.DnsResolver.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 7/6/2022
+# Generated on: 7/14/2022
 #
 
 @{
diff --git a/src/DnsResolver/Changelog.md b/src/DnsResolver/Changelog.md
index 59e08a997191..42cf458eca85 100644
--- a/src/DnsResolver/Changelog.md
+++ b/src/DnsResolver/Changelog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Reformatted exception message for cmdlets
 * Upgraded API version to 2022-07-01 
 
 ## Version 0.2.0
diff --git a/src/DnsResolver/DnsResolver.sln b/src/DnsResolver/DnsResolver.sln
index 19dc9b952e5e..6b2392780923 100644
--- a/src/DnsResolver/DnsResolver.sln
+++ b/src/DnsResolver/DnsResolver.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.6.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{78DD8E2B-ED53-425A-98B8-155569355F66}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{C9BD833B-5AF8-4152-9446-E7B2DB728157}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{2F49DE9F-EAC2-453E-AF52-2A04539DF721}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{91DD7D67-A50C-4066-99E1-41A529980AC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DnsResolver", "Az.DnsResolver.csproj", "{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DnsResolver", "Az.DnsResolver.csproj", "{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,77 +28,77 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Debug|x64.Build.0 = Debug|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Debug|x86.Build.0 = Debug|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Release|x64.ActiveCfg = Release|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Release|x64.Build.0 = Release|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Release|x86.ActiveCfg = Release|Any CPU
-		{0305F1CE-B0D2-4DDE-AAA8-673209A24BDE}.Release|x86.Build.0 = Release|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Debug|x64.Build.0 = Debug|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Release|x64.ActiveCfg = Release|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Release|x64.Build.0 = Release|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2AB0A0E-536C-4BC1-8C55-48CB7EBD3748}.Release|x86.Build.0 = Release|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Debug|x64.Build.0 = Debug|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Debug|x86.Build.0 = Debug|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Release|x64.ActiveCfg = Release|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Release|x64.Build.0 = Release|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Release|x86.ActiveCfg = Release|Any CPU
-		{43A2C05E-F534-4E6F-8F27-7EEF49001CC8}.Release|x86.Build.0 = Release|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Debug|x64.Build.0 = Debug|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Debug|x86.Build.0 = Debug|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Release|x64.ActiveCfg = Release|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Release|x64.Build.0 = Release|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Release|x86.ActiveCfg = Release|Any CPU
-		{3559AC31-6C95-4BB6-8081-D3E1FFA399B1}.Release|x86.Build.0 = Release|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Debug|x64.Build.0 = Debug|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Debug|x86.Build.0 = Debug|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Release|x64.ActiveCfg = Release|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Release|x64.Build.0 = Release|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Release|x86.ActiveCfg = Release|Any CPU
-		{D95E12E1-E2E4-4E49-AAD2-F95857A060C9}.Release|x86.Build.0 = Release|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Debug|x64.Build.0 = Debug|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Debug|x86.Build.0 = Debug|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Release|x64.ActiveCfg = Release|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Release|x64.Build.0 = Release|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Release|x86.ActiveCfg = Release|Any CPU
-		{22BDF02C-5ACB-4919-94AE-34E3D0E5BA49}.Release|x86.Build.0 = Release|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Release|x64.Build.0 = Release|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{83DE6850-AD3D-4248-AAAE-035CBAFA5FE5}.Release|x86.Build.0 = Release|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Debug|x64.Build.0 = Debug|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Debug|x86.Build.0 = Debug|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Release|x64.ActiveCfg = Release|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Release|x64.Build.0 = Release|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Release|x86.ActiveCfg = Release|Any CPU
+		{78DD8E2B-ED53-425A-98B8-155569355F66}.Release|x86.Build.0 = Release|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Debug|x86.Build.0 = Debug|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Release|x64.Build.0 = Release|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Release|x86.ActiveCfg = Release|Any CPU
+		{C9BD833B-5AF8-4152-9446-E7B2DB728157}.Release|x86.Build.0 = Release|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Release|x64.Build.0 = Release|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F49DE9F-EAC2-453E-AF52-2A04539DF721}.Release|x86.Build.0 = Release|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Release|x64.Build.0 = Release|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{91DD7D67-A50C-4066-99E1-41A529980AC0}.Release|x86.Build.0 = Release|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Debug|x86.Build.0 = Debug|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Release|x64.Build.0 = Release|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5CC1095-A2C9-40D4-AFDF-7953DAE37344}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_Get.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_Get.cs
new file mode 100644
index 000000000000..13e63ff020b9
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_Get.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRulesetForwardingRule_Get
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_GetViaIdentity.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_GetViaIdentity.cs
new file mode 100644
index 000000000000..06379cf2d7d4
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_GetViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRulesetForwardingRule_GetViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_List.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_List.cs
new file mode 100644
index 000000000000..284c4de79936
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetForwardingRule_List.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRulesetForwardingRule_List
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_Get.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_Get.cs
new file mode 100644
index 000000000000..215c29c551e4
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_Get.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRulesetVirtualNetworkLink_Get
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_GetViaIdentity.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_GetViaIdentity.cs
new file mode 100644
index 000000000000..4c7927ea454a
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_GetViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRulesetVirtualNetworkLink_GetViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_List.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_List.cs
new file mode 100644
index 000000000000..6553a2fba9af
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRulesetVirtualNetworkLink_List.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRulesetVirtualNetworkLink_List
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_Get.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_Get.cs
new file mode 100644
index 000000000000..48569896d5ed
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_Get.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRuleset_Get
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_GetViaIdentity.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_GetViaIdentity.cs
new file mode 100644
index 000000000000..6c87d623aaf4
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_GetViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRuleset_GetViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List.cs
new file mode 100644
index 000000000000..6ab83448beee
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRuleset_List
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List1.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List1.cs
new file mode 100644
index 000000000000..f232521c612b
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List1.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRuleset_List1
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List2.cs b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List2.cs
new file mode 100644
index 000000000000..ec9602a694f9
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsForwardingRuleset_List2.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsForwardingRuleset_List2
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_Get.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_Get.cs
new file mode 100644
index 000000000000..965cdf6df0e0
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_Get.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolverInboundEndpoint_Get
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_GetViaIdentity.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_GetViaIdentity.cs
new file mode 100644
index 000000000000..5ad676adfcc9
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_GetViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolverInboundEndpoint_GetViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_List.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_List.cs
new file mode 100644
index 000000000000..65cc9c8885b6
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolverInboundEndpoint_List.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolverInboundEndpoint_List
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_Get.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_Get.cs
new file mode 100644
index 000000000000..3bbb373cab60
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_Get.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolverOutboundEndpoint_Get
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_GetViaIdentity.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_GetViaIdentity.cs
new file mode 100644
index 000000000000..2647a2f0663d
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_GetViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolverOutboundEndpoint_GetViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_List.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_List.cs
new file mode 100644
index 000000000000..dbee9c07c962
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolverOutboundEndpoint_List.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolverOutboundEndpoint_List
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolver_Get.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolver_Get.cs
new file mode 100644
index 000000000000..03ffd748bd08
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolver_Get.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolver_Get
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolver_GetViaIdentity.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolver_GetViaIdentity.cs
new file mode 100644
index 000000000000..81491fed2648
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolver_GetViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolver_GetViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolver_List.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolver_List.cs
new file mode 100644
index 000000000000..c5a0f2b0b226
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolver_List.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolver_List
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolver_List1.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolver_List1.cs
new file mode 100644
index 000000000000..2bd4042d9d10
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolver_List1.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolver_List1
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/GetAzDnsResolver_List2.cs b/src/DnsResolver/custom/csharp/GetAzDnsResolver_List2.cs
new file mode 100644
index 000000000000..635708246a47
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/GetAzDnsResolver_List2.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class GetAzDnsResolver_List2
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/NewAzDnsForwardingRulesetForwardingRule_CreateExpanded.cs b/src/DnsResolver/custom/csharp/NewAzDnsForwardingRulesetForwardingRule_CreateExpanded.cs
new file mode 100644
index 000000000000..a66c87734c2e
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/NewAzDnsForwardingRulesetForwardingRule_CreateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class NewAzDnsForwardingRulesetForwardingRule_CreateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/NewAzDnsForwardingRulesetVirtualNetworkLink_CreateExpanded.cs b/src/DnsResolver/custom/csharp/NewAzDnsForwardingRulesetVirtualNetworkLink_CreateExpanded.cs
new file mode 100644
index 000000000000..b6b058fa55da
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/NewAzDnsForwardingRulesetVirtualNetworkLink_CreateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class NewAzDnsForwardingRulesetVirtualNetworkLink_CreateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/NewAzDnsForwardingRuleset_CreateExpanded.cs b/src/DnsResolver/custom/csharp/NewAzDnsForwardingRuleset_CreateExpanded.cs
new file mode 100644
index 000000000000..e5af8f9eed5a
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/NewAzDnsForwardingRuleset_CreateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class NewAzDnsForwardingRuleset_CreateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/NewAzDnsResolverInboundEndpoint_CreateExpanded.cs b/src/DnsResolver/custom/csharp/NewAzDnsResolverInboundEndpoint_CreateExpanded.cs
new file mode 100644
index 000000000000..30d3261e21a7
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/NewAzDnsResolverInboundEndpoint_CreateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class NewAzDnsResolverInboundEndpoint_CreateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/NewAzDnsResolverOutboundEndpoint_CreateExpanded.cs b/src/DnsResolver/custom/csharp/NewAzDnsResolverOutboundEndpoint_CreateExpanded.cs
new file mode 100644
index 000000000000..e3d0d5d7415f
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/NewAzDnsResolverOutboundEndpoint_CreateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class NewAzDnsResolverOutboundEndpoint_CreateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/NewAzDnsResolver_CreateExpanded.cs b/src/DnsResolver/custom/csharp/NewAzDnsResolver_CreateExpanded.cs
new file mode 100644
index 000000000000..9fb45c298c83
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/NewAzDnsResolver_CreateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class NewAzDnsResolver_CreateExpanded
+    {
+         partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+         {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+         }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetForwardingRule_Delete.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetForwardingRule_Delete.cs
new file mode 100644
index 000000000000..b1a496dd6591
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetForwardingRule_Delete.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsForwardingRulesetForwardingRule_Delete
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetForwardingRule_DeleteViaIdentity.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetForwardingRule_DeleteViaIdentity.cs
new file mode 100644
index 000000000000..176a713f441f
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetForwardingRule_DeleteViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsForwardingRulesetForwardingRule_DeleteViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetVirtualNetworkLink_Delete.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetVirtualNetworkLink_Delete.cs
new file mode 100644
index 000000000000..9a8c1fe4d1f0
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetVirtualNetworkLink_Delete.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsForwardingRulesetVirtualNetworkLink_Delete
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetVirtualNetworkLink_DeleteViaIdentity.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetVirtualNetworkLink_DeleteViaIdentity.cs
new file mode 100644
index 000000000000..40f981f3debc
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRulesetVirtualNetworkLink_DeleteViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsForwardingRulesetVirtualNetworkLink_DeleteViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRuleset_Delete.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRuleset_Delete.cs
new file mode 100644
index 000000000000..3327a608e8cd
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRuleset_Delete.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsForwardingRuleset_Delete
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRuleset_DeleteViaIdentity.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRuleset_DeleteViaIdentity.cs
new file mode 100644
index 000000000000..9b5d5816cf3a
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsForwardingRuleset_DeleteViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsForwardingRuleset_DeleteViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsResolverInboundEndpoint_Delete.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverInboundEndpoint_Delete.cs
new file mode 100644
index 000000000000..14c66d0d16db
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverInboundEndpoint_Delete.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsResolverInboundEndpoint_Delete
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsResolverInboundEndpoint_DeleteViaIdentity.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverInboundEndpoint_DeleteViaIdentity.cs
new file mode 100644
index 000000000000..c5a10741f749
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverInboundEndpoint_DeleteViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsResolverInboundEndpoint_DeleteViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsResolverOutboundEndpoint_Delete.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverOutboundEndpoint_Delete.cs
new file mode 100644
index 000000000000..05137e51e4d1
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverOutboundEndpoint_Delete.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsResolverOutboundEndpoint_Delete
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsResolverOutboundEndpoint_DeleteViaIdentity.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverOutboundEndpoint_DeleteViaIdentity.cs
new file mode 100644
index 000000000000..48b64a61e204
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsResolverOutboundEndpoint_DeleteViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsResolverOutboundEndpoint_DeleteViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsResolver_Delete.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsResolver_Delete.cs
new file mode 100644
index 000000000000..4eb610b0777d
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsResolver_Delete.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsResolver_Delete
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RemoveAzDnsResolver_DeleteViaIdentity.cs b/src/DnsResolver/custom/csharp/RemoveAzDnsResolver_DeleteViaIdentity.cs
new file mode 100644
index 000000000000..f4e4d0128c78
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RemoveAzDnsResolver_DeleteViaIdentity.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class RemoveAzDnsResolver_DeleteViaIdentity
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/RestErrorHandler.cs b/src/DnsResolver/custom/csharp/RestErrorHandler.cs
new file mode 100644
index 000000000000..6e1d3edc4fa5
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/RestErrorHandler.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Management.Automation;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    internal static class CmdletRestExtension
+    {
+        public static void WriteError(this Cmdlet cmdlet, HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            var errorResponse = errorResponseTask?.ConfigureAwait(false).GetAwaiter().GetResult();
+
+            if (errorResponse?.Detail != null)
+            {
+                var errorDetails = errorResponse.Detail;
+                var errorDetailsString = "";
+               
+                foreach(var errorDetail in errorDetails)
+                {
+                    errorDetailsString += errorDetail.Message + " ";
+                }
+                
+                cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null)
+                {
+                    ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty }
+                });
+                
+                returnNow = Task.FromResult(true);
+            }
+            else
+            {
+                returnNow = Task.FromResult(false);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetForwardingRule_UpdateExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetForwardingRule_UpdateExpanded.cs
new file mode 100644
index 000000000000..5963049071e2
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetForwardingRule_UpdateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsForwardingRulesetForwardingRule_UpdateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetForwardingRule_UpdateViaIdentityExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetForwardingRule_UpdateViaIdentityExpanded.cs
new file mode 100644
index 000000000000..f55ade7a32e8
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetForwardingRule_UpdateViaIdentityExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsForwardingRulesetForwardingRule_UpdateViaIdentityExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateExpanded.cs
new file mode 100644
index 000000000000..5fc2eece2720
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateViaIdentityExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateViaIdentityExpanded.cs
new file mode 100644
index 000000000000..4abc84269377
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateViaIdentityExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsForwardingRulesetVirtualNetworkLink_UpdateViaIdentityExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRuleset_UpdateExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRuleset_UpdateExpanded.cs
new file mode 100644
index 000000000000..7887ea5bacda
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRuleset_UpdateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsForwardingRuleset_UpdateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRuleset_UpdateViaIdentityExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRuleset_UpdateViaIdentityExpanded.cs
new file mode 100644
index 000000000000..89f6b9d75d82
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsForwardingRuleset_UpdateViaIdentityExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsForwardingRuleset_UpdateViaIdentityExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsResolverInboundEndpoint_UpdateExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverInboundEndpoint_UpdateExpanded.cs
new file mode 100644
index 000000000000..b443c18e48a3
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverInboundEndpoint_UpdateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsResolverInboundEndpoint_UpdateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsResolverInboundEndpoint_UpdateViaIdentityExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverInboundEndpoint_UpdateViaIdentityExpanded.cs
new file mode 100644
index 000000000000..d019f7a06a9f
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverInboundEndpoint_UpdateViaIdentityExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsResolverInboundEndpoint_UpdateViaIdentityExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsResolverOutboundEndpoint_UpdateExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverOutboundEndpoint_UpdateExpanded.cs
new file mode 100644
index 000000000000..16f67fe81aec
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverOutboundEndpoint_UpdateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsResolverOutboundEndpoint_UpdateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsResolverOutboundEndpoint_UpdateViaIdentityExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverOutboundEndpoint_UpdateViaIdentityExpanded.cs
new file mode 100644
index 000000000000..3909f5d7d9b2
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsResolverOutboundEndpoint_UpdateViaIdentityExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsResolverOutboundEndpoint_UpdateViaIdentityExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsResolver_UpdateExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsResolver_UpdateExpanded.cs
new file mode 100644
index 000000000000..6b43981d680e
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsResolver_UpdateExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsResolver_UpdateExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/custom/csharp/UpdateAzDnsResolver_UpdateViaIdentityExpanded.cs b/src/DnsResolver/custom/csharp/UpdateAzDnsResolver_UpdateViaIdentityExpanded.cs
new file mode 100644
index 000000000000..46820ab60c7f
--- /dev/null
+++ b/src/DnsResolver/custom/csharp/UpdateAzDnsResolver_UpdateViaIdentityExpanded.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Models.Api20220701;
+
+namespace Microsoft.Azure.PowerShell.Cmdlets.DnsResolver.Cmdlets
+{
+    public partial class UpdateAzDnsResolver_UpdateViaIdentityExpanded
+    {
+        partial void overrideOnDefault(HttpResponseMessage responseMessage, Task<ICloudError> errorResponseTask, ref Task<bool> returnNow)
+        {
+            this.WriteError(responseMessage, errorResponseTask, ref returnNow);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/DnsResolver/generate-info.json b/src/DnsResolver/generate-info.json
index 75235d4732d6..0eb05902ead3 100644
--- a/src/DnsResolver/generate-info.json
+++ b/src/DnsResolver/generate-info.json
@@ -1,8 +1,8 @@
 {
-  "swagger_commit": "bab2f4389eb5ca73cdf366ec0a4af3f3eb6e1f6d",
+  "swagger_commit": "8e4e3058fe99ad60910be23703914bb900b39216",
   "node": "v14.15.5",
   "autorest": "`-- (empty)",
   "autorest_core": "3.8.4",
   "autorest_modelerfour": "4.15.414",
-  "autorest_powershell": "3.0.491"
+  "autorest_powershell": "3.0.492"
 }
diff --git a/src/DnsResolver/test/New-AzDnsResolver.Tests.ps1 b/src/DnsResolver/test/New-AzDnsResolver.Tests.ps1
index 5507574c9206..aec2e6f8f1b3 100644
--- a/src/DnsResolver/test/New-AzDnsResolver.Tests.ps1
+++ b/src/DnsResolver/test/New-AzDnsResolver.Tests.ps1
@@ -41,7 +41,7 @@ Describe 'New-AzDnsResolver' {
         $location = "westus2";
         
         # ACT,ASSERT
-        {New-AzDnsResolver -Name $dnsResolverName -ResourceGroupName $resourceGroupName -VirtualNetworkId $malformedVirtualNetworkArmId -Location $location }| Should -Throw 'Unparseable resource ID'
+        {New-AzDnsResolver -Name $dnsResolverName -ResourceGroupName $resourceGroupName -VirtualNetworkId $malformedVirtualNetworkArmId -Location $location }| Should -Throw
     }
 
     It 'Create DNS resolver with a new virtual network' {
@@ -70,7 +70,7 @@ Describe 'New-AzDnsResolver' {
         $nonExistentVirtualNetwork = "/subscriptions/0e5a46b1-de0b-4ec3-a5d7-dda908b4e076/resourceGroups/powershelldnsresolvertestrglocaltest/providers/Microsoft.Network/virtualNetworks/psvirtualnetworkname9aywbo511111"
 
         # ACT, ASSERT
-        {New-AzDnsResolver -Name $dnsResolverName -ResourceGroupName $resourceGroupName -VirtualNetworkId $nonExistentVirtualNetwork -Location $location }| Should -Throw 'DNS resolver not found in database'
+        {New-AzDnsResolver -Name $dnsResolverName -ResourceGroupName $resourceGroupName -VirtualNetworkId $nonExistentVirtualNetwork -Location $location }| Should -Throw
     }
 
     It 'Update DNS Resolver with new tags.' {
diff --git a/src/DnsResolver/test/Remove-AzDnsForwardingRuleset.Tests.ps1 b/src/DnsResolver/test/Remove-AzDnsForwardingRuleset.Tests.ps1
index b245d5e87a4a..97ee98044563 100644
--- a/src/DnsResolver/test/Remove-AzDnsForwardingRuleset.Tests.ps1
+++ b/src/DnsResolver/test/Remove-AzDnsForwardingRuleset.Tests.ps1
@@ -43,6 +43,6 @@ Describe 'Remove-AzDnsForwardingRuleset' {
         Remove-AzDnsForwardingRuleset -Name $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME
 
         # ASSERT
-        {Get-AzDnsForwardingRuleset -Name $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw "not found"
+        {Get-AzDnsForwardingRuleset -Name $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw
     }
 }
diff --git a/src/DnsResolver/test/Remove-AzDnsForwardingRulesetForwardingRule.Tests.ps1 b/src/DnsResolver/test/Remove-AzDnsForwardingRulesetForwardingRule.Tests.ps1
index 06daedb6483a..f7e6458624f9 100644
--- a/src/DnsResolver/test/Remove-AzDnsForwardingRulesetForwardingRule.Tests.ps1
+++ b/src/DnsResolver/test/Remove-AzDnsForwardingRulesetForwardingRule.Tests.ps1
@@ -46,6 +46,6 @@ Describe 'Remove-AzDnsForwardingRulesetForwardingRule' {
         Remove-AzDnsForwardingRulesetForwardingRule -Name $forwardingRuleName -DnsForwardingRulesetName $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME
 
         # ASSERT
-        {Get-AzDnsForwardingRulesetForwardingRule -Name $forwardingRuleName -DnsForwardingRulesetName $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw "not found"
+        {Get-AzDnsForwardingRulesetForwardingRule -Name $forwardingRuleName -DnsForwardingRulesetName $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw
     }
 }
\ No newline at end of file
diff --git a/src/DnsResolver/test/Remove-AzDnsForwardingRulesetVirtualNetworkLink.Tests.ps1 b/src/DnsResolver/test/Remove-AzDnsForwardingRulesetVirtualNetworkLink.Tests.ps1
index 71b39bbab07c..0ffb7ff54821 100644
--- a/src/DnsResolver/test/Remove-AzDnsForwardingRulesetVirtualNetworkLink.Tests.ps1
+++ b/src/DnsResolver/test/Remove-AzDnsForwardingRulesetVirtualNetworkLink.Tests.ps1
@@ -37,6 +37,6 @@ Describe 'Remove-AzDnsForwardingRulesetVirtualNetworkLink' {
         Remove-AzDnsForwardingRulesetVirtualNetworkLink -DnsForwardingRulesetName $dnsForwardingRulesetName -Name $virtualNetworkLinkName -ResourceGroupName $RESOURCE_GROUP_NAME
 
         # ASSERT
-        {Get-AzDnsForwardingRulesetVirtualNetworkLink -Name $virtualNetworkLinkName -DnsForwardingRulesetName $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw "not found"
+        {Get-AzDnsForwardingRulesetVirtualNetworkLink -Name $virtualNetworkLinkName -DnsForwardingRulesetName $dnsForwardingRulesetName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw
     }
 }
diff --git a/src/DnsResolver/test/Remove-AzDnsResolver.Tests.ps1 b/src/DnsResolver/test/Remove-AzDnsResolver.Tests.ps1
index 1f862a977e88..651220f8c212 100644
--- a/src/DnsResolver/test/Remove-AzDnsResolver.Tests.ps1
+++ b/src/DnsResolver/test/Remove-AzDnsResolver.Tests.ps1
@@ -29,6 +29,6 @@ Describe 'Remove-AzDnsResolver' {
         Remove-AzDnsResolver  -DnsResolverName $dnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME
 
         # ASSERT 
-        {Get-AzDnsResolver  -DnsResolverName $dnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw "not found"
+        {Get-AzDnsResolver  -DnsResolverName $dnsResolverName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw
     }
 }
diff --git a/src/DnsResolver/test/Remove-AzDnsResolverInboundEndpoint.Tests.ps1 b/src/DnsResolver/test/Remove-AzDnsResolverInboundEndpoint.Tests.ps1
index 8b063738556a..d8ba8237a76c 100644
--- a/src/DnsResolver/test/Remove-AzDnsResolverInboundEndpoint.Tests.ps1
+++ b/src/DnsResolver/test/Remove-AzDnsResolverInboundEndpoint.Tests.ps1
@@ -33,6 +33,6 @@ Describe 'Remove-AzDnsResolverInboundEndpoint' {
         Remove-AzDnsResolverInboundEndpoint  -DnsResolverName $dnsResolverName -Name $inboundEndpointName -ResourceGroupName $RESOURCE_GROUP_NAME
 
         # ASSERT 
-        {Get-AzDnsResolverInboundEndpoint  -DnsResolverName $dnsResolverName -Name $inboundEndpointName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw "not found"
+        {Get-AzDnsResolverInboundEndpoint  -DnsResolverName $dnsResolverName -Name $inboundEndpointName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw
     }
 }
diff --git a/src/DnsResolver/test/Remove-AzDnsResolverOutboundEndpoint.Tests.ps1 b/src/DnsResolver/test/Remove-AzDnsResolverOutboundEndpoint.Tests.ps1
index 93865b7c5ef2..db046c90c9c8 100644
--- a/src/DnsResolver/test/Remove-AzDnsResolverOutboundEndpoint.Tests.ps1
+++ b/src/DnsResolver/test/Remove-AzDnsResolverOutboundEndpoint.Tests.ps1
@@ -33,6 +33,6 @@ Describe 'Remove-AzDnsResolverOutboundEndpoint' {
         Remove-AzDnsResolverOutboundEndpoint  -DnsResolverName $dnsResolverName -Name $outboundEndpointName -ResourceGroupName $RESOURCE_GROUP_NAME
 
         # ASSERT 
-        {Get-AzDnsResolverOutboundEndpoint  -DnsResolverName $dnsResolverName -Name $outboundEndpointName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw "not found"
+        {Get-AzDnsResolverOutboundEndpoint  -DnsResolverName $dnsResolverName -Name $outboundEndpointName -ResourceGroupName $RESOURCE_GROUP_NAME } | Should -Throw
     }
 }