simplified namespaces (#47027)

Azure · Nov 8, 2024 · 11c22ba · 11c22ba
1 parent 82b9a17
commit 11c22ba
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 35 deletions.
diff --git a/sdk/cloudmachine/Azure.CloudMachine.Web/api/Azure.CloudMachine.Web.net8.0.cs b/sdk/cloudmachine/Azure.CloudMachine.Web/api/Azure.CloudMachine.Web.net8.0.cs
@@ -1,4 +1,4 @@
-namespace System.ClientModel.TypeSpec
+namespace Azure.CloudMachine
 {
     public static partial class CloudMachineExtensions
     {

diff --git a/sdk/cloudmachine/Azure.CloudMachine.Web/src/CloudMachineExtensions.cs b/sdk/cloudmachine/Azure.CloudMachine.Web/src/CloudMachineExtensions.cs
@@ -1,17 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System.Reflection;
-using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 using Azure.CloudMachine;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Builder;
 
-namespace System.ClientModel.TypeSpec;
+namespace Azure.CloudMachine;
 
 /// <summary>
 /// ASp.NET Core extension methods for mapping a service implementation to a set of HTTP endpoints.

diff --git a/sdk/cloudmachine/Azure.CloudMachine/src/CoreServices/StorageServices.cs b/sdk/cloudmachine/Azure.CloudMachine/src/CoreServices/StorageServices.cs
@@ -11,9 +11,7 @@
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using Azure.Messaging.ServiceBus;
-using System.Net.Mime;
 using ContentType = Azure.Core.ContentType;
-using System.Collections.Generic;
 
 namespace Azure.CloudMachine;
 

diff --git a/sdk/cloudmachine/Azure.CloudMachine/src/extensions/ChatTools.cs b/sdk/cloudmachine/Azure.CloudMachine/src/extensions/ChatTools.cs
@@ -8,7 +8,6 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
-using Azure.Messaging.EventGrid.SystemEvents;
 using OpenAI.Chat;
 
 namespace Azure.CloudMachine.OpenAI;

diff --git a/sdk/cloudmachine/Azure.CloudMachine/tests/CloudMachineTests.cs b/sdk/cloudmachine/Azure.CloudMachine/tests/CloudMachineTests.cs
@@ -5,9 +5,6 @@
 
 using System;
 using System.Threading;
-using Azure.Provisioning.CloudMachine;
-using Azure.Provisioning.CloudMachine.KeyVault;
-using Azure.Provisioning.CloudMachine.OpenAI;
 using Azure.Security.KeyVault.Secrets;
 using Azure.CloudMachine.OpenAI;
 using Azure.CloudMachine.KeyVault;

diff --git a/...ing/Azure.Provisioning.CloudMachine/api/Azure.Provisioning.CloudMachine.netstandard2.0.cs b/...ing/Azure.Provisioning.CloudMachine/api/Azure.Provisioning.CloudMachine.netstandard2.0.cs
@@ -1,11 +1,5 @@
-namespace Azure.Provisioning.CloudMachine
+namespace Azure.CloudMachine
 {
-    public abstract partial class CloudMachineFeature
-    {
-        protected CloudMachineFeature() { }
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        public abstract void AddTo(Azure.Provisioning.CloudMachine.CloudMachineInfrastructure cm);
-    }
     public partial class CloudMachineInfrastructure
     {
         public CloudMachineInfrastructure(string cmId) { }
@@ -16,19 +10,19 @@ public void AddEndpoints<T>() { }
         public void AddFeature(Azure.Provisioning.CloudMachine.CloudMachineFeature resource) { }
         public void AddResource(Azure.Provisioning.Primitives.NamedProvisionableConstruct resource) { }
         public Azure.Provisioning.ProvisioningPlan Build(Azure.Provisioning.ProvisioningBuildOptions? context = null) { throw null; }
-        public static bool Configure(string[] args, System.Action<Azure.Provisioning.CloudMachine.CloudMachineInfrastructure>? configure = null) { throw null; }
+        public static bool Configure(string[] args, System.Action<Azure.CloudMachine.CloudMachineInfrastructure>? configure = null) { throw null; }
     }
 }
-namespace Azure.Provisioning.CloudMachine.KeyVault
+namespace Azure.CloudMachine.KeyVault
 {
     public partial class KeyVaultFeature : Azure.Provisioning.CloudMachine.CloudMachineFeature
     {
         public KeyVaultFeature(Azure.Provisioning.KeyVault.KeyVaultSku? sku = null) { }
         public Azure.Provisioning.KeyVault.KeyVaultSku Sku { get { throw null; } set { } }
-        public override void AddTo(Azure.Provisioning.CloudMachine.CloudMachineInfrastructure infrastructure) { }
+        public override void AddTo(Azure.CloudMachine.CloudMachineInfrastructure infrastructure) { }
     }
 }
-namespace Azure.Provisioning.CloudMachine.OpenAI
+namespace Azure.CloudMachine.OpenAI
 {
     public partial class AIModel
     {
@@ -39,9 +33,18 @@ public AIModel(string model, string modelVersion) { }
     public partial class OpenAIFeature : Azure.Provisioning.CloudMachine.CloudMachineFeature
     {
         public OpenAIFeature() { }
-        public Azure.Provisioning.CloudMachine.OpenAI.AIModel? Chat { get { throw null; } set { } }
-        public Azure.Provisioning.CloudMachine.OpenAI.AIModel? Embeddings { get { throw null; } set { } }
-        public override void AddTo(Azure.Provisioning.CloudMachine.CloudMachineInfrastructure cloudMachine) { }
+        public Azure.CloudMachine.OpenAI.AIModel? Chat { get { throw null; } set { } }
+        public Azure.CloudMachine.OpenAI.AIModel? Embeddings { get { throw null; } set { } }
+        public override void AddTo(Azure.CloudMachine.CloudMachineInfrastructure cloudMachine) { }
+    }
+}
+namespace Azure.Provisioning.CloudMachine
+{
+    public abstract partial class CloudMachineFeature
+    {
+        protected CloudMachineFeature() { }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public abstract void AddTo(Azure.CloudMachine.CloudMachineInfrastructure cm);
     }
 }
 namespace System.ClientModel.TypeSpec

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/AIModel.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/AIModel.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Provisioning.CloudMachine.OpenAI;
+namespace Azure.CloudMachine.OpenAI;
 
 public class AIModel
 {

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/KeyVaultFeature.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/KeyVaultFeature.cs
@@ -2,10 +2,11 @@
 // Licensed under the MIT License.
 
 using Azure.Provisioning.Authorization;
+using Azure.Provisioning.CloudMachine;
 using Azure.Provisioning.Expressions;
 using Azure.Provisioning.KeyVault;
 
-namespace Azure.Provisioning.CloudMachine.KeyVault;
+namespace Azure.CloudMachine.KeyVault;
 
 public class KeyVaultFeature : CloudMachineFeature
 {

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/OpenAIFeature.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/OpenAIFeature.cs
@@ -3,9 +3,10 @@
 
 using System;
 using Azure.Provisioning.Authorization;
+using Azure.Provisioning.CloudMachine;
 using Azure.Provisioning.CognitiveServices;
 
-namespace Azure.Provisioning.CloudMachine.OpenAI;
+namespace Azure.CloudMachine.OpenAI;
 
 public class OpenAIFeature : CloudMachineFeature
 {

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/src/CDKLevel3/CloudMachineFeature.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/src/CDKLevel3/CloudMachineFeature.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.ComponentModel;
+using Azure.CloudMachine;
 
 namespace Azure.Provisioning.CloudMachine;
 

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/src/CDKLevel3/CloudMachineInfrastructure.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/src/CDKLevel3/CloudMachineInfrastructure.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using Azure.CloudMachine;
 using System.IO;
 using System;
 using Azure.Provisioning.Authorization;
@@ -13,10 +12,11 @@
 using Azure.Provisioning.Storage;
 using Azure.Provisioning.Primitives;
 using System.Collections.Generic;
-using System.Security.Principal;
 using System.ClientModel.TypeSpec;
+using Azure.Provisioning;
+using Azure.Provisioning.CloudMachine;
 
-namespace Azure.Provisioning.CloudMachine;
+namespace Azure.CloudMachine;
 
 public class CloudMachineInfrastructure
 {

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/src/Tsp/TypeSpecWriter.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/src/Tsp/TypeSpecWriter.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
 

diff --git a/sdk/provisioning/Azure.Provisioning.CloudMachine/tests/CloudMachineTests.cs b/sdk/provisioning/Azure.Provisioning.CloudMachine/tests/CloudMachineTests.cs
@@ -3,9 +3,8 @@
 
 #nullable enable
 
-using Azure.Provisioning.CloudMachine;
-using Azure.Provisioning.CloudMachine.KeyVault;
-using Azure.Provisioning.CloudMachine.OpenAI;
+using Azure.CloudMachine.KeyVault;
+using Azure.CloudMachine.OpenAI;
 using NUnit.Framework;
 
 namespace Azure.CloudMachine.Tests;