Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplified namespaces #47027

Merged
merged 1 commit into from
Nov 8, 2024
Merged

simplified namespaces #47027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/cloudmachine/Azure.CloudMachine.Web/api/Azure.CloudMachine.Web.net8.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace System.ClientModel.TypeSpec
namespace Azure.CloudMachine
{
public static partial class CloudMachineExtensions
{
Expand Down
9 changes: 5 additions & 4 deletions sdk/cloudmachine/Azure.CloudMachine.Web/src/CloudMachineExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 0 additions & 2 deletions sdk/cloudmachine/Azure.CloudMachine/src/CoreServices/StorageServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion sdk/cloudmachine/Azure.CloudMachine/src/extensions/ChatTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions sdk/cloudmachine/Azure.CloudMachine/tests/CloudMachineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
31 changes: 17 additions & 14 deletions ...ing/Azure.Provisioning.CloudMachine/api/Azure.Provisioning.CloudMachine.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) { }
Expand All @@ -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
{
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/AIModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
3 changes: 2 additions & 1 deletion sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/KeyVaultFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 2 additions & 1 deletion sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/OpenAIFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions sdk/provisioning/Azure.Provisioning.CloudMachine/src/CDKLevel3/CloudMachineFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

using System.ComponentModel;
using Azure.CloudMachine;

namespace Azure.Provisioning.CloudMachine;

Expand Down
6 changes: 3 additions & 3 deletions sdk/provisioning/Azure.Provisioning.CloudMachine/src/CDKLevel3/CloudMachineInfrastructure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion sdk/provisioning/Azure.Provisioning.CloudMachine/src/Tsp/TypeSpecWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Threading.Tasks;

Expand Down
5 changes: 2 additions & 3 deletions sdk/provisioning/Azure.Provisioning.CloudMachine/tests/CloudMachineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down