diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Azure.Verticals.AgriFood.Farming.csproj b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Azure.Verticals.AgriFood.Farming.csproj
index f5225ec1634d..6da0317d8d2f 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Azure.Verticals.AgriFood.Farming.csproj
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Azure.Verticals.AgriFood.Farming.csproj
@@ -5,7 +5,7 @@
1.0.0-beta.2
Azure FarmBeats
$(RequiredTargetFrameworks)
- $(NoWarn);AZC0001;AZC0012;AZC0007;AZC0006
+ $(NoWarn);AZC0001;AZC0012
$(DefineConstants);EXPERIMENTAL
true
diff --git a/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/GlobalSuppressions.cs b/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/GlobalSuppressions.cs
index 9f553868ea30..cb4f52ab2e07 100644
--- a/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/GlobalSuppressions.cs
+++ b/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/GlobalSuppressions.cs
@@ -2,6 +2,3 @@
// Licensed under the MIT License.
using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Usage", "AZC0007: A client type should have a public constructor with equivalent parameters that doesn't take a Azure.Core.ClientOptions-derived type as the last argument", Justification = "")]
-[assembly: SuppressMessage("Usage", "AZC0006: A client type should have a public constructor with equivalent parameters that takes a Azure.Core.ClientOptions-derived type as the last argument", Justification = "")]
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/GlobalSuppressions.cs b/sdk/devcenter/Azure.Developer.DevCenter/src/GlobalSuppressions.cs
index 90b4113d13f0..332325b41554 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/src/GlobalSuppressions.cs
+++ b/sdk/devcenter/Azure.Developer.DevCenter/src/GlobalSuppressions.cs
@@ -4,5 +4,3 @@
using System.Diagnostics.CodeAnalysis;
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "Temporary while awaiting namespace group approval", Scope = "namespace", Target = "~N:Azure.Developer.DevCenter")]
-[assembly: SuppressMessage("Usage", "AZC0007:DO provide a minimal constructor that takes only the parameters required to connect to the service.", Justification = "False positives on minimal constructors", Scope = "namespaceanddescendants", Target = "~N:Azure.Developer.DevCenter")]
-[assembly: SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "False positives on options constructors", Scope = "namespaceanddescendants", Target = "~N:Azure.Developer.DevCenter")]
diff --git a/sdk/entra/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents/src/GlobalSuppressions.cs b/sdk/entra/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents/src/GlobalSuppressions.cs
index c7da4a546b9d..5bae673b849a 100644
--- a/sdk/entra/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents/src/GlobalSuppressions.cs
+++ b/sdk/entra/Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents/src/GlobalSuppressions.cs
@@ -6,7 +6,6 @@
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "", Scope = "namespace", Target = "~N:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents.Framework")]
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "", Scope = "namespace", Target = "~N:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents")]
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "", Scope = "namespace", Target = "~N:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents.TokenIssuanceStart.Data")]
-[assembly: SuppressMessage("Usage", "AZC0007:DO provide a minimal constructor that takes only the parameters required to connect to the service.", Justification = "Seems like a misfire, as this is a simple class that does not have client options.(Perhaps the name ending in Client)", Scope = "type", Target = "~T:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents.TokenIssuanceStart.Data.AuthenticationEventContextClient")]
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "", Scope = "namespace", Target = "~N:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents.TokenIssuanceStart.Actions")]
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "", Scope = "namespace", Target = "~N:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents.TokenIssuanceStart")]
[assembly: SuppressMessage("Usage", "AZC0001:Use one of the following pre-approved namespace groups (https://azure.github.io/azure-sdk/registered_namespaces.html): Azure.AI, Azure.Analytics, Azure.Communication, Azure.Data, Azure.DigitalTwins, Azure.IoT, Azure.Learn, Azure.Media, Azure.Management, Azure.Messaging, Azure.ResourceManager, Azure.Search, Azure.Security, Azure.Storage, Azure.Template, Azure.Identity, Microsoft.Extensions.Azure", Justification = "", Scope = "namespace", Target = "~N:Microsoft.Azure.WebJobs.Extensions.AuthenticationEvents.Framework.Schema")]
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs.Experimental/src/Properties/AssemblyInfo.cs b/sdk/eventhub/Azure.Messaging.EventHubs.Experimental/src/Properties/AssemblyInfo.cs
index dc614c7a887e..bd4f69465931 100644
--- a/sdk/eventhub/Azure.Messaging.EventHubs.Experimental/src/Properties/AssemblyInfo.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs.Experimental/src/Properties/AssemblyInfo.cs
@@ -9,5 +9,4 @@
[assembly: SuppressMessage("Usage", "AZC0004:DO provide both asynchronous and synchronous variants for all service methods.", Justification = "As an AMQP-based offering, Event Hubs has been exempted from providing a synchronous surface.")]
[assembly: SuppressMessage("Usage", "AZC0008:ClientOptions should have a nested enum called ServiceVersion", Justification = "The Event Hubs interface does not support the concept of versions.")]
-[assembly: SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Analysis is flagging incorrectly. The Event Hubs constructor patterns adhere to guidance and have obtained board approval.")]
[assembly: SuppressMessage("Usage", "AZC0015:Unexpected client method return type.", Justification = "As an AMQP-based offering, Event Hubs has been exempted from HTTP-based return types.")]
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs.Processor/src/Properties/AssemblyInfo.cs b/sdk/eventhub/Azure.Messaging.EventHubs.Processor/src/Properties/AssemblyInfo.cs
index a8d20fb985d7..c886fd4c8c17 100755
--- a/sdk/eventhub/Azure.Messaging.EventHubs.Processor/src/Properties/AssemblyInfo.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs.Processor/src/Properties/AssemblyInfo.cs
@@ -9,5 +9,4 @@
[assembly: SuppressMessage("Usage", "AZC0004:DO provide both asynchronous and synchronous variants for all service methods.", Justification = "As an AMQP-based offering, Event Hubs has been exempted from providing a synchronous surface.")]
[assembly: SuppressMessage("Usage", "AZC0008:ClientOptions should have a nested enum called ServiceVersion", Justification = "The Event Hubs interface does not support the concept of versions.")]
-[assembly: SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Analysis is flagging incorrectly. The Event Hubs constructor patterns adhere to guidance and have obtained board approval.")]
[assembly: SuppressMessage("Usage", "AZC0015:Unexpected client method return type.", Justification = "As an AMQP-based offering, Event Hubs has been exempted from HTTP-based return types.")]
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs/src/Consumer/EventHubConsumerClient.cs b/sdk/eventhub/Azure.Messaging.EventHubs/src/Consumer/EventHubConsumerClient.cs
index 55d5ab29becd..5054847a254f 100644
--- a/sdk/eventhub/Azure.Messaging.EventHubs/src/Consumer/EventHubConsumerClient.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs/src/Consumer/EventHubConsumerClient.cs
@@ -39,7 +39,6 @@ namespace Azure.Messaging.EventHubs.Consumer
/// unmanaged objects are properly cleaned up.
///
///
- [SuppressMessage("Usage", "AZC0007:DO provide a minimal constructor that takes only the parameters required to connect to the service.", Justification = "Event Hubs are AMQP-based services and don't use ClientOptions functionality")]
public class EventHubConsumerClient : IAsyncDisposable
{
/// The name of the default consumer group in the Event Hubs service.
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubBufferedProducerClient.cs b/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubBufferedProducerClient.cs
index 24b9a2737357..87b4994eb5cc 100644
--- a/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubBufferedProducerClient.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubBufferedProducerClient.cs
@@ -54,7 +54,6 @@ namespace Azure.Messaging.EventHubs.Producer
///
///
///
- [SuppressMessage("Usage", "AZC0007:DO provide a minimal constructor that takes only the parameters required to connect to the service.", Justification = "Event Hubs are AMQP-based services and don't use ClientOptions functionality")]
public class EventHubBufferedProducerClient : IAsyncDisposable
{
/// The maximum amount of time, in milliseconds, to allow for acquiring the semaphore guarding a partition's publishing eligibility.
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubProducerClient.cs b/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubProducerClient.cs
index ad230e436198..63c55f2d03bf 100644
--- a/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubProducerClient.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs/src/Producer/EventHubProducerClient.cs
@@ -57,7 +57,6 @@ namespace Azure.Messaging.EventHubs.Producer
///
///
///
- [SuppressMessage("Usage", "AZC0007:DO provide a minimal constructor that takes only the parameters required to connect to the service.", Justification = "Event Hubs are AMQP-based services and don't use ClientOptions functionality")]
public class EventHubProducerClient : IAsyncDisposable
{
/// The maximum number of attempts that may be made to get a from the pool.
diff --git a/sdk/eventhub/Azure.Messaging.EventHubs/src/Properties/AssemblyInfo.cs b/sdk/eventhub/Azure.Messaging.EventHubs/src/Properties/AssemblyInfo.cs
index e202a207fc40..7b65ffce0c45 100644
--- a/sdk/eventhub/Azure.Messaging.EventHubs/src/Properties/AssemblyInfo.cs
+++ b/sdk/eventhub/Azure.Messaging.EventHubs/src/Properties/AssemblyInfo.cs
@@ -9,5 +9,4 @@
[assembly: SuppressMessage("Usage", "AZC0004:DO provide both asynchronous and synchronous variants for all service methods.", Justification = "As an AMQP-based offering, Event Hubs has been exempted from providing a synchronous surface.")]
[assembly: SuppressMessage("Usage", "AZC0008:ClientOptions should have a nested enum called ServiceVersion", Justification = "The Event Hubs interface does not support the concept of versions.")]
-[assembly: SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Analysis is flagging incorrectly. The Event Hubs constructor patterns adhere to guidance and have obtained board approval.")]
[assembly: SuppressMessage("Usage", "AZC0015:Unexpected client method return type.", Justification = "As an AMQP-based offering, Event Hubs has been exempted from HTTP-based return types.")]
diff --git a/sdk/search/Azure.Search.Documents/src/Azure.Search.Documents.csproj b/sdk/search/Azure.Search.Documents/src/Azure.Search.Documents.csproj
index c0763ea55935..d9a28a3c2af0 100644
--- a/sdk/search/Azure.Search.Documents/src/Azure.Search.Documents.csproj
+++ b/sdk/search/Azure.Search.Documents/src/Azure.Search.Documents.csproj
@@ -13,7 +13,7 @@
Azure Cognitive Search;Azure Search Documents;Azure Search;Search;Cognitive;Search Engine;Azure
$(RequiredTargetFrameworks)
- $(NoWarn);AZC0007;AZC0004;AZC0001
+ $(NoWarn);AZC0004;AZC0001
true
diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexClient.cs b/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexClient.cs
index de9bef725159..86ff962e9a86 100644
--- a/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexClient.cs
@@ -105,7 +105,6 @@ public SearchIndexClient(
/// Client configuration options for connecting to Azure Cognitive Search.
/// Thrown when the or is null.
/// Thrown when the is not using HTTPS.
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Avoid ambiguous method definition")]
public SearchIndexClient(
Uri endpoint,
TokenCredential tokenCredential,
diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexerClient.cs b/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexerClient.cs
index ca377b60ed92..5f0516f51ab6 100644
--- a/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexerClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Indexes/SearchIndexerClient.cs
@@ -103,7 +103,6 @@ public SearchIndexerClient(
/// Client configuration options for connecting to Azure Cognitive Search.
/// Thrown when the or is null.
/// Thrown when the is not using HTTPS.
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Avoid ambiguous method definition")]
public SearchIndexerClient(
Uri endpoint,
TokenCredential tokenCredential,
diff --git a/sdk/search/Azure.Search.Documents/src/SearchClient.cs b/sdk/search/Azure.Search.Documents/src/SearchClient.cs
index 3f3792d21c6f..f8cc7b91f802 100644
--- a/sdk/search/Azure.Search.Documents/src/SearchClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/SearchClient.cs
@@ -244,7 +244,6 @@ public SearchClient(
/// Thrown when the is not using HTTPS or
/// the is empty.
///
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Avoid ambiguous method definition")]
public SearchClient(
Uri endpoint,
string indexName,
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/Directory.Build.props b/sdk/servicebus/Azure.Messaging.ServiceBus/Directory.Build.props
index 03647177e773..fd20707be0b8 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/Directory.Build.props
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/Directory.Build.props
@@ -10,7 +10,6 @@
-->
$(NoWarn);
- AZC0006;
AZC0007;
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Properties/AssemblyInfo.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Properties/AssemblyInfo.cs
index 39fbb62fd0a7..fe09eff0d78d 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Properties/AssemblyInfo.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Properties/AssemblyInfo.cs
@@ -9,6 +9,5 @@
[assembly: SuppressMessage("Usage", "AZC0004:DO provide both asynchronous and synchronous variants for all service methods.", Justification = "As an AMQP-based offering, Service Bus has been exempted from providing a synchronous surface.")]
[assembly: SuppressMessage("Usage", "AZC0008:ClientOptions should have a nested enum called ServiceVersion", Justification = "The Service Bus interface does not support the concept of versions.")]
-[assembly: SuppressMessage("Usage", "AZC0006:DO provide constructor overloads that allow specifying additional options.", Justification = "Analysis is flagging incorrectly. The Service Bus constructor patterns adhere to guidance and have obtained board approval.")]
[assembly: SuppressMessage("Usage", "AZC0015:Unexpected client method return type.", Justification = "As an AMQP-based offering, Service Bus has been exempted from HTTP-based return types.")]
[assembly: Azure.Core.AzureResourceProviderNamespace("Microsoft.ServiceBus")]