From 4020646b7074c2c01ff378f382b174ea7349e68f Mon Sep 17 00:00:00 2001 From: Kristen Schau <47155823+krschau@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:02:45 -0400 Subject: [PATCH] Consolate on DevHomeAzureExtension namespace --- src/AzureExtension/AzureExtension.cs | 5 ++-- .../Contracts/IAICredentialService.cs | 2 +- .../Contracts/IArmTokenService.cs | 2 +- .../Contracts/IAzureOpenAIService.cs | 2 +- .../Contracts/IDataTokenService.cs | 2 +- .../Contracts/IDevBoxAuthService.cs | 2 +- .../Contracts/IDevBoxCreationManager.cs | 6 ++--- .../Contracts/IDevBoxManagementService.cs | 6 ++--- .../Contracts/IDevBoxOperationWatcher.cs | 6 ++--- .../Contracts/IInstalledAppsService.cs | 2 +- .../Contracts/IPackagesService.cs | 2 +- .../Contracts/ITimeSpanService.cs | 4 ++-- src/AzureExtension/DevBox/Constants.cs | 6 ++--- src/AzureExtension/DevBox/DevBoxInstance.cs | 12 +++++----- .../DevBoxCreationPoolName.cs | 2 +- .../DevBoxHardwareProfile.cs | 2 +- .../DevBoxImageReference.cs | 2 +- .../DevBoxLongRunningOperation.cs | 4 ++-- .../DevBoxMachineState.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxMachines.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxOperation.cs | 4 ++-- .../DevBoxOperationList.cs | 2 +- .../DevBoxOperationResult.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxOsDisk.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxPool.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxPoolRoot.cs | 2 +- .../DevBoxPoolStopOnDisconnect.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxProject.cs | 2 +- .../DevBoxProjectProperties.cs | 2 +- .../DevBoxJsonToCsClasses/DevBoxProjects.cs | 2 +- .../DevBoxRemoteConnectionData.cs | 2 +- .../DevBoxStorageProfile.cs | 2 +- .../JsonSourceGenerationContext.cs | 4 ++-- src/AzureExtension/DevBox/DevBoxProvider.cs | 8 +++---- .../Exceptions/DevBoxCreationException.cs | 2 +- .../Exceptions/DevBoxNameInvalidException.cs | 2 +- .../DevBoxOperationMonitorException.cs | 2 +- .../DevBoxProjectNameInvalidException.cs | 2 +- .../WingetConfigurationException.cs | 2 +- .../Helpers/AdaptiveCardJSONToCSClass.cs | 2 +- .../DevBox/Helpers/DevBoxOperationHelper.cs | 2 +- .../DevCenterOperationStatusConverter.cs | 4 ++-- .../DevBox/Helpers/TaskJSONToCSClasses.cs | 2 +- .../DevBox/Helpers/TaskYAMLToCSClasses.cs | 2 +- .../WaitingForUserAdaptiveCardSession.cs | 2 +- .../DevBox/Helpers/WingetConfigWrapper.cs | 10 ++++---- .../Models/CreateComputeSystemOperation.cs | 6 ++--- .../Models/CreationAdaptiveCardSession.cs | 2 +- .../DevBox/Models/DevBoxCreationParameters.cs | 2 +- .../DevBox/Models/DevBoxHttpsRequestResult.cs | 2 +- .../Models/DevBoxOperationResponseHeader.cs | 2 +- .../Models/DevBoxOperationWatcherTimer.cs | 4 ++-- .../Models/DevBoxProjectAndPoolContainer.cs | 4 ++-- .../DevBox/Models/DevCenterOperationBase.cs | 2 +- .../Helpers/AzureRepositoryHierarchy.cs | 7 +++--- .../Providers/RepositoryProvider.cs | 1 - .../Providers/SettingsProvider.cs | 4 ++-- .../Providers/SettingsUIController.cs | 6 ++--- .../AICredentialService.cs | 4 ++-- ...AIDevContainerQuickStartProjectProvider.cs | 4 ++-- .../AzureOpenAIService.cs | 4 ++-- .../QuickStartPlayground/Completions.cs | 4 ++-- .../DependencyUIController.cs | 4 ++-- .../DevContainerGenerationOperation.cs | 4 ++-- .../DevContainerProjectFeedback.cs | 2 +- .../DevContainerProjectHost.cs | 2 +- .../DevContainerQuickStartProjectProvider.cs | 4 ++-- .../DockerProgressUIController.cs | 2 +- .../QuickStartPlayground/DockerValidation.cs | 2 +- .../QuickStartPlayground/EmbeddingsCalc.cs | 2 +- .../ExtensionInitializationUIController.cs | 2 +- .../InstalledAppsService.cs | 4 ++-- ...AIDevContainerQuickStartProjectProvider.cs | 4 ++-- .../QuickStartPlayground/ServiceExtensions.cs | 4 ++-- .../QuickStartPlayground/TrainingSample.cs | 2 +- .../Services/DevBox/ARMTokenService.cs | 8 +++---- .../Services/DevBox/AuthService.cs | 4 ++-- .../Services/DevBox/DataTokenService.cs | 8 +++---- .../Services/DevBox/DevBoxCreationManager.cs | 19 +++++++-------- .../DevBox/DevBoxManagementService.cs | 23 +++++++++---------- .../Services/DevBox/DevBoxOperationWatcher.cs | 21 +++++++++-------- .../Services/DevBox/PackagesService.cs | 4 ++-- .../Services/DevBox/TimeSpanService.cs | 13 ++++++----- src/AzureExtensionServer/Program.cs | 12 +++++----- .../DevBox/ArmTestTokenService.cs | 4 ++-- .../DevBox/DataTestTokenService.cs | 4 ++-- test/AzureExtension/DevBox/DevBoxTests.cs | 8 +++---- .../AzureExtension/DevBox/DevBoxTestsSetup.cs | 10 ++++---- .../AzureExtension/DevBox/EmptyDeveloperId.cs | 2 +- .../DevBox/TimeSpanServiceMock.cs | 6 ++--- .../Mocks/MockAuthenticationSettings.cs | 2 +- 91 files changed, 194 insertions(+), 195 deletions(-) diff --git a/src/AzureExtension/AzureExtension.cs b/src/AzureExtension/AzureExtension.cs index c5af3d70..af243f78 100644 --- a/src/AzureExtension/AzureExtension.cs +++ b/src/AzureExtension/AzureExtension.cs @@ -2,11 +2,10 @@ // Licensed under the MIT License. using System.Runtime.InteropServices; -using AzureExtension.DevBox; -using AzureExtension.Providers; -using AzureExtension.QuickStartPlayground; +using DevHomeAzureExtension.DevBox; using DevHomeAzureExtension.DeveloperId; using DevHomeAzureExtension.Providers; +using DevHomeAzureExtension.QuickStartPlayground; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Windows.DevHome.SDK; diff --git a/src/AzureExtension/Contracts/IAICredentialService.cs b/src/AzureExtension/Contracts/IAICredentialService.cs index 21a99e03..64530900 100644 --- a/src/AzureExtension/Contracts/IAICredentialService.cs +++ b/src/AzureExtension/Contracts/IAICredentialService.cs @@ -3,7 +3,7 @@ using System.Security; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public interface IAICredentialService { diff --git a/src/AzureExtension/Contracts/IArmTokenService.cs b/src/AzureExtension/Contracts/IArmTokenService.cs index 13e454e7..2bd0e895 100644 --- a/src/AzureExtension/Contracts/IArmTokenService.cs +++ b/src/AzureExtension/Contracts/IArmTokenService.cs @@ -3,7 +3,7 @@ using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; // ARMTokenService is a service that provides an Azure Resource Manager (ARM) token. public interface IArmTokenService diff --git a/src/AzureExtension/Contracts/IAzureOpenAIService.cs b/src/AzureExtension/Contracts/IAzureOpenAIService.cs index 472be76b..30c5ece9 100644 --- a/src/AzureExtension/Contracts/IAzureOpenAIService.cs +++ b/src/AzureExtension/Contracts/IAzureOpenAIService.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public enum OpenAIEndpoint { diff --git a/src/AzureExtension/Contracts/IDataTokenService.cs b/src/AzureExtension/Contracts/IDataTokenService.cs index 73bedb2c..bfbd4758 100644 --- a/src/AzureExtension/Contracts/IDataTokenService.cs +++ b/src/AzureExtension/Contracts/IDataTokenService.cs @@ -3,7 +3,7 @@ using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public interface IDataTokenService { diff --git a/src/AzureExtension/Contracts/IDevBoxAuthService.cs b/src/AzureExtension/Contracts/IDevBoxAuthService.cs index da86cddc..fc1ef8a2 100644 --- a/src/AzureExtension/Contracts/IDevBoxAuthService.cs +++ b/src/AzureExtension/Contracts/IDevBoxAuthService.cs @@ -3,7 +3,7 @@ using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public interface IDevBoxAuthService { diff --git a/src/AzureExtension/Contracts/IDevBoxCreationManager.cs b/src/AzureExtension/Contracts/IDevBoxCreationManager.cs index 7939ea58..be3793c5 100644 --- a/src/AzureExtension/Contracts/IDevBoxCreationManager.cs +++ b/src/AzureExtension/Contracts/IDevBoxCreationManager.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.DevBox; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.Models; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public interface IDevBoxCreationManager { diff --git a/src/AzureExtension/Contracts/IDevBoxManagementService.cs b/src/AzureExtension/Contracts/IDevBoxManagementService.cs index 3c38d0e6..351e1894 100644 --- a/src/AzureExtension/Contracts/IDevBoxManagementService.cs +++ b/src/AzureExtension/Contracts/IDevBoxManagementService.cs @@ -2,11 +2,11 @@ // Licensed under the MIT License. using System.Text.Json; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Models; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public interface IDevBoxManagementService { diff --git a/src/AzureExtension/Contracts/IDevBoxOperationWatcher.cs b/src/AzureExtension/Contracts/IDevBoxOperationWatcher.cs index fa8af34d..eaf9a069 100644 --- a/src/AzureExtension/Contracts/IDevBoxOperationWatcher.cs +++ b/src/AzureExtension/Contracts/IDevBoxOperationWatcher.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.DevBox; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.Models; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; /// /// Interface used to watch Dev Box operations asynchronously that take place in the Dev Center. diff --git a/src/AzureExtension/Contracts/IInstalledAppsService.cs b/src/AzureExtension/Contracts/IInstalledAppsService.cs index 85b53251..00392ad8 100644 --- a/src/AzureExtension/Contracts/IInstalledAppsService.cs +++ b/src/AzureExtension/Contracts/IInstalledAppsService.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; public interface IInstalledAppsService { diff --git a/src/AzureExtension/Contracts/IPackagesService.cs b/src/AzureExtension/Contracts/IPackagesService.cs index 0f4c9e31..0b3ed82f 100644 --- a/src/AzureExtension/Contracts/IPackagesService.cs +++ b/src/AzureExtension/Contracts/IPackagesService.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; using Windows.ApplicationModel; diff --git a/src/AzureExtension/Contracts/ITimeSpanService.cs b/src/AzureExtension/Contracts/ITimeSpanService.cs index 43535e8f..03713ce7 100644 --- a/src/AzureExtension/Contracts/ITimeSpanService.cs +++ b/src/AzureExtension/Contracts/ITimeSpanService.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.DevBox; +using DevHomeAzureExtension.DevBox; -namespace AzureExtension.Contracts; +namespace DevHomeAzureExtension.Contracts; /// /// Interface that an operation watcher can use to get the time span based on the action to perform. diff --git a/src/AzureExtension/DevBox/Constants.cs b/src/AzureExtension/DevBox/Constants.cs index 1bd607fd..8c463e2c 100644 --- a/src/AzureExtension/DevBox/Constants.cs +++ b/src/AzureExtension/DevBox/Constants.cs @@ -2,13 +2,13 @@ // Licensed under the MIT License. using System.Text.Json; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Helpers; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Helpers; using DevHomeAzureExtension.Helpers; using Windows.ApplicationModel; using Windows.Storage; -namespace AzureExtension.DevBox; +namespace DevHomeAzureExtension.DevBox; public static class Constants { diff --git a/src/AzureExtension/DevBox/DevBoxInstance.cs b/src/AzureExtension/DevBox/DevBoxInstance.cs index 98e665b4..a424e059 100644 --- a/src/AzureExtension/DevBox/DevBoxInstance.cs +++ b/src/AzureExtension/DevBox/DevBoxInstance.cs @@ -7,18 +7,18 @@ using System.Text; using System.Text.Json; using System.Web; -using AzureExtension.Contracts; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Helpers; -using AzureExtension.DevBox.Models; -using AzureExtension.Services.DevBox; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Helpers; +using DevHomeAzureExtension.DevBox.Models; using DevHomeAzureExtension.Helpers; +using DevHomeAzureExtension.Services.DevBox; using Microsoft.Windows.DevHome.SDK; using Serilog; using Windows.ApplicationModel; using Windows.Foundation; -namespace AzureExtension.DevBox; +namespace DevHomeAzureExtension.DevBox; public delegate DevBoxInstance DevBoxInstanceFactory(IDeveloperId developerId, DevBoxMachineState devBoxJson); diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxCreationPoolName.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxCreationPoolName.cs index a5a16397..cae1e50a 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxCreationPoolName.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxCreationPoolName.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// This is used to represent the json object that we send with the "create Dev Box" request. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxHardwareProfile.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxHardwareProfile.cs index a1b4e463..a919b05f 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxHardwareProfile.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxHardwareProfile.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents the HardwareProfile object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxImageReference.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxImageReference.cs index 88189b5c..94c2b967 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxImageReference.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxImageReference.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents the ImageReference object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxLongRunningOperation.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxLongRunningOperation.cs index 2cf1d5d3..e305c4a7 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxLongRunningOperation.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxLongRunningOperation.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox.Models; -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// https://azure.github.io/typespec-azure/docs/howtos/Azure%20Core/long-running-operations diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachineState.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachineState.cs index c2ea3075..e01691b2 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachineState.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachineState.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// This class represents the state of a DevBox machine. It is the class representation of diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachines.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachines.cs index 8f94a501..6e451325 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachines.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxMachines.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents the response from the Dev Center API for getting a list of DevBoxes diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperation.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperation.cs index d18c24af..5443b774 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperation.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperation.cs @@ -2,9 +2,9 @@ // Licensed under the MIT License. using System.Text.Json.Serialization; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox.Models; -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents the DevBoxOperation object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationList.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationList.cs index 5e55ff9f..c0a8ff9a 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationList.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationList.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a list of DevBoxOperation object's within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationResult.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationResult.cs index 1ccc47d1..d2bb7ab3 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationResult.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOperationResult.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a DevBoxOperationResult object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOsDisk.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOsDisk.cs index 514d1eef..8e091cca 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOsDisk.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxOsDisk.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a OsDisk object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPool.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPool.cs index 5c351e2d..f8006564 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPool.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPool.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a Pool object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolRoot.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolRoot.cs index 9d8ff1d5..4b5b64a6 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolRoot.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolRoot.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a list of Pool object's within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolStopOnDisconnect.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolStopOnDisconnect.cs index 7d5c95ad..b9f9e083 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolStopOnDisconnect.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxPoolStopOnDisconnect.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a StopOnDisconnect object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProject.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProject.cs index f5da8a67..64df5e3c 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProject.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProject.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a DevBoxProject object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjectProperties.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjectProperties.cs index 7b6d2b5f..d29bbc9f 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjectProperties.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjectProperties.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a ProjectProperties object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjects.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjects.cs index a43f2703..428d2b02 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjects.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxProjects.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents a List of DevBoxProject objects within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxRemoteConnectionData.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxRemoteConnectionData.cs index 3f85ff4e..c4f053b5 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxRemoteConnectionData.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxRemoteConnectionData.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents the data returned from a request to retrieve the remote connection information for a Dev Box. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxStorageProfile.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxStorageProfile.cs index 95c54287..82e0c18d 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxStorageProfile.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/DevBoxStorageProfile.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Represents the StorageProfile object within a response from a Dev Box rest API call. diff --git a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/JsonSourceGenerationContext.cs b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/JsonSourceGenerationContext.cs index bbe4b3ba..968cc8a6 100644 --- a/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/JsonSourceGenerationContext.cs +++ b/src/AzureExtension/DevBox/DevBoxJsonToCsClasses/JsonSourceGenerationContext.cs @@ -2,9 +2,9 @@ // Licensed under the MIT License. using System.Text.Json.Serialization; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox.Models; -namespace AzureExtension.DevBox.DevBoxJsonToCsClasses; +namespace DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; /// /// Used to generate the source code for the classes that we deserialize Json to objects for the DevBox feature. diff --git a/src/AzureExtension/DevBox/DevBoxProvider.cs b/src/AzureExtension/DevBox/DevBoxProvider.cs index 9d64bc78..d7a75ddc 100644 --- a/src/AzureExtension/DevBox/DevBoxProvider.cs +++ b/src/AzureExtension/DevBox/DevBoxProvider.cs @@ -4,15 +4,15 @@ using System.Collections.Concurrent; using System.Text; using System.Text.Json; -using AzureExtension.Contracts; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Models; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Serilog; using Windows.Foundation; -namespace AzureExtension.DevBox; +namespace DevHomeAzureExtension.DevBox; /// /// Implements the IComputeSystemProvider interface to provide DevBoxes as ComputeSystems. diff --git a/src/AzureExtension/DevBox/Exceptions/DevBoxCreationException.cs b/src/AzureExtension/DevBox/Exceptions/DevBoxCreationException.cs index f793d628..a3c6091f 100644 --- a/src/AzureExtension/DevBox/Exceptions/DevBoxCreationException.cs +++ b/src/AzureExtension/DevBox/Exceptions/DevBoxCreationException.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Exceptions; +namespace DevHomeAzureExtension.DevBox.Exceptions; public class DevBoxCreationException : Exception { diff --git a/src/AzureExtension/DevBox/Exceptions/DevBoxNameInvalidException.cs b/src/AzureExtension/DevBox/Exceptions/DevBoxNameInvalidException.cs index 1fed875f..3bce3405 100644 --- a/src/AzureExtension/DevBox/Exceptions/DevBoxNameInvalidException.cs +++ b/src/AzureExtension/DevBox/Exceptions/DevBoxNameInvalidException.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Exceptions; +namespace DevHomeAzureExtension.DevBox.Exceptions; public class DevBoxNameInvalidException : Exception { diff --git a/src/AzureExtension/DevBox/Exceptions/DevBoxOperationMonitorException.cs b/src/AzureExtension/DevBox/Exceptions/DevBoxOperationMonitorException.cs index 74c28f33..fa8070d2 100644 --- a/src/AzureExtension/DevBox/Exceptions/DevBoxOperationMonitorException.cs +++ b/src/AzureExtension/DevBox/Exceptions/DevBoxOperationMonitorException.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Exceptions; +namespace DevHomeAzureExtension.DevBox.Exceptions; public class DevBoxOperationMonitorException : Exception { diff --git a/src/AzureExtension/DevBox/Exceptions/DevBoxProjectNameInvalidException.cs b/src/AzureExtension/DevBox/Exceptions/DevBoxProjectNameInvalidException.cs index 4da2d4ec..6241f441 100644 --- a/src/AzureExtension/DevBox/Exceptions/DevBoxProjectNameInvalidException.cs +++ b/src/AzureExtension/DevBox/Exceptions/DevBoxProjectNameInvalidException.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Exceptions; +namespace DevHomeAzureExtension.DevBox.Exceptions; public class DevBoxProjectNameInvalidException : Exception { diff --git a/src/AzureExtension/DevBox/Exceptions/WingetConfigurationException.cs b/src/AzureExtension/DevBox/Exceptions/WingetConfigurationException.cs index f0e720d3..addbd266 100644 --- a/src/AzureExtension/DevBox/Exceptions/WingetConfigurationException.cs +++ b/src/AzureExtension/DevBox/Exceptions/WingetConfigurationException.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Exceptions; +namespace DevHomeAzureExtension.DevBox.Exceptions; public class WingetConfigurationException : Exception { diff --git a/src/AzureExtension/DevBox/Helpers/AdaptiveCardJSONToCSClass.cs b/src/AzureExtension/DevBox/Helpers/AdaptiveCardJSONToCSClass.cs index 52169a12..908bd3f4 100644 --- a/src/AzureExtension/DevBox/Helpers/AdaptiveCardJSONToCSClass.cs +++ b/src/AzureExtension/DevBox/Helpers/AdaptiveCardJSONToCSClass.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; public class AdaptiveCardJSONToCSClass { diff --git a/src/AzureExtension/DevBox/Helpers/DevBoxOperationHelper.cs b/src/AzureExtension/DevBox/Helpers/DevBoxOperationHelper.cs index 3923376d..ac86546d 100644 --- a/src/AzureExtension/DevBox/Helpers/DevBoxOperationHelper.cs +++ b/src/AzureExtension/DevBox/Helpers/DevBoxOperationHelper.cs @@ -3,7 +3,7 @@ using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; public static class DevBoxOperationHelper { diff --git a/src/AzureExtension/DevBox/Helpers/DevCenterOperationStatusConverter.cs b/src/AzureExtension/DevBox/Helpers/DevCenterOperationStatusConverter.cs index 69ac7048..e9cdce8c 100644 --- a/src/AzureExtension/DevBox/Helpers/DevCenterOperationStatusConverter.cs +++ b/src/AzureExtension/DevBox/Helpers/DevCenterOperationStatusConverter.cs @@ -3,9 +3,9 @@ using System.Text.Json; using System.Text.Json.Serialization; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.DevBox.Models; -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; /// /// Custom JSON converter for . diff --git a/src/AzureExtension/DevBox/Helpers/TaskJSONToCSClasses.cs b/src/AzureExtension/DevBox/Helpers/TaskJSONToCSClasses.cs index ad3e7445..914d89bb 100644 --- a/src/AzureExtension/DevBox/Helpers/TaskJSONToCSClasses.cs +++ b/src/AzureExtension/DevBox/Helpers/TaskJSONToCSClasses.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; // Example of a task JSON response that will be deserialized into the BaseClass class // { diff --git a/src/AzureExtension/DevBox/Helpers/TaskYAMLToCSClasses.cs b/src/AzureExtension/DevBox/Helpers/TaskYAMLToCSClasses.cs index 9e94b924..3e8cf8c8 100644 --- a/src/AzureExtension/DevBox/Helpers/TaskYAMLToCSClasses.cs +++ b/src/AzureExtension/DevBox/Helpers/TaskYAMLToCSClasses.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; // Note: For every addition of a new resource type, the corresponding classes should be added here. // Example of a YAML file that will be deserialized diff --git a/src/AzureExtension/DevBox/Helpers/WaitingForUserAdaptiveCardSession.cs b/src/AzureExtension/DevBox/Helpers/WaitingForUserAdaptiveCardSession.cs index fdbca1c1..f8f7aed0 100644 --- a/src/AzureExtension/DevBox/Helpers/WaitingForUserAdaptiveCardSession.cs +++ b/src/AzureExtension/DevBox/Helpers/WaitingForUserAdaptiveCardSession.cs @@ -9,7 +9,7 @@ using Serilog; using Windows.Foundation; -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; public class WaitingForUserAdaptiveCardSession : IExtensionAdaptiveCardSession2, IDisposable { diff --git a/src/AzureExtension/DevBox/Helpers/WingetConfigWrapper.cs b/src/AzureExtension/DevBox/Helpers/WingetConfigWrapper.cs index 5fe286fb..2a358d8a 100644 --- a/src/AzureExtension/DevBox/Helpers/WingetConfigWrapper.cs +++ b/src/AzureExtension/DevBox/Helpers/WingetConfigWrapper.cs @@ -3,16 +3,16 @@ using System.Text; using System.Text.Json; -using AzureExtension.Contracts; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Exceptions; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Exceptions; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Windows.Foundation; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; -namespace AzureExtension.DevBox.Helpers; +namespace DevHomeAzureExtension.DevBox.Helpers; public class WingetConfigWrapper : IApplyConfigurationOperation, IDisposable { @@ -32,7 +32,7 @@ public class WingetConfigWrapper : IApplyConfigurationOperation, IDisposable public const string WingetTaskJsonTaskStart = @"{ ""name"": ""winget"", - ""runAs"": ""User"", + ""runAs"": ""User"", ""parameters"": { ""inlineConfigurationBase64"": """; diff --git a/src/AzureExtension/DevBox/Models/CreateComputeSystemOperation.cs b/src/AzureExtension/DevBox/Models/CreateComputeSystemOperation.cs index 5bc3d47c..389970e4 100644 --- a/src/AzureExtension/DevBox/Models/CreateComputeSystemOperation.cs +++ b/src/AzureExtension/DevBox/Models/CreateComputeSystemOperation.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; -using AzureExtension.DevBox.Exceptions; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox.Exceptions; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Serilog; using Windows.Foundation; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; public delegate CreateComputeSystemOperation CreateComputeSystemOperationFactory(IDeveloperId developerId, DevBoxCreationParameters userOptions); diff --git a/src/AzureExtension/DevBox/Models/CreationAdaptiveCardSession.cs b/src/AzureExtension/DevBox/Models/CreationAdaptiveCardSession.cs index efffa066..0de4cb11 100644 --- a/src/AzureExtension/DevBox/Models/CreationAdaptiveCardSession.cs +++ b/src/AzureExtension/DevBox/Models/CreationAdaptiveCardSession.cs @@ -9,7 +9,7 @@ using Serilog; using Windows.Foundation; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; public enum SessionState { diff --git a/src/AzureExtension/DevBox/Models/DevBoxCreationParameters.cs b/src/AzureExtension/DevBox/Models/DevBoxCreationParameters.cs index 86851b59..7b502afc 100644 --- a/src/AzureExtension/DevBox/Models/DevBoxCreationParameters.cs +++ b/src/AzureExtension/DevBox/Models/DevBoxCreationParameters.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.Text; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; /// /// These parameters are the parameters we'll expect to be passed in from Dev Home to create a Dev Box. diff --git a/src/AzureExtension/DevBox/Models/DevBoxHttpsRequestResult.cs b/src/AzureExtension/DevBox/Models/DevBoxHttpsRequestResult.cs index 2c089f27..927beac3 100644 --- a/src/AzureExtension/DevBox/Models/DevBoxHttpsRequestResult.cs +++ b/src/AzureExtension/DevBox/Models/DevBoxHttpsRequestResult.cs @@ -3,7 +3,7 @@ using System.Text.Json; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; /// /// Represents the result of an HTTPS request result from the Dev Center. For Dev Box operations diff --git a/src/AzureExtension/DevBox/Models/DevBoxOperationResponseHeader.cs b/src/AzureExtension/DevBox/Models/DevBoxOperationResponseHeader.cs index 9b759e3c..a47839eb 100644 --- a/src/AzureExtension/DevBox/Models/DevBoxOperationResponseHeader.cs +++ b/src/AzureExtension/DevBox/Models/DevBoxOperationResponseHeader.cs @@ -3,7 +3,7 @@ using System.Net.Http.Headers; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; /// /// Represents the header for a Dev Box long running operation. The Dev Box APIs run a Location and an Operation-Location diff --git a/src/AzureExtension/DevBox/Models/DevBoxOperationWatcherTimer.cs b/src/AzureExtension/DevBox/Models/DevBoxOperationWatcherTimer.cs index 5ec27405..2dbb548d 100644 --- a/src/AzureExtension/DevBox/Models/DevBoxOperationWatcherTimer.cs +++ b/src/AzureExtension/DevBox/Models/DevBoxOperationWatcherTimer.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Services.DevBox; +using DevHomeAzureExtension.Services.DevBox; using Windows.System.Threading; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; /// /// Used to store information about a timer that is being stored by the . diff --git a/src/AzureExtension/DevBox/Models/DevBoxProjectAndPoolContainer.cs b/src/AzureExtension/DevBox/Models/DevBoxProjectAndPoolContainer.cs index 3d6352f0..552a5ab2 100644 --- a/src/AzureExtension/DevBox/Models/DevBoxProjectAndPoolContainer.cs +++ b/src/AzureExtension/DevBox/Models/DevBoxProjectAndPoolContainer.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; /// /// Represents an object that contains both a DevBoxProject and a DevBoxPoolRoot. diff --git a/src/AzureExtension/DevBox/Models/DevCenterOperationBase.cs b/src/AzureExtension/DevBox/Models/DevCenterOperationBase.cs index 8964bb24..eaa05c69 100644 --- a/src/AzureExtension/DevBox/Models/DevCenterOperationBase.cs +++ b/src/AzureExtension/DevBox/Models/DevCenterOperationBase.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace AzureExtension.DevBox.Models; +namespace DevHomeAzureExtension.DevBox.Models; /// /// The status of a DevCenter operation. diff --git a/src/AzureExtension/Helpers/AzureRepositoryHierarchy.cs b/src/AzureExtension/Helpers/AzureRepositoryHierarchy.cs index 255757e0..abc8f68d 100644 --- a/src/AzureExtension/Helpers/AzureRepositoryHierarchy.cs +++ b/src/AzureExtension/Helpers/AzureRepositoryHierarchy.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. using DevHomeAzureExtension.Client; -using DevHomeAzureExtension.DeveloperId; using Microsoft.TeamFoundation.Core.WebApi; using Microsoft.VisualStudio.Services.Account.Client; using Microsoft.VisualStudio.Services.WebApi; @@ -11,7 +10,7 @@ // In the past, an organization was known as an account. Typedef to organization to make the code easier to read. using Organization = Microsoft.VisualStudio.Services.Account.Account; -namespace AzureExtension.Helpers; +namespace DevHomeAzureExtension.Helpers; /// /// Handles the hierarchy between organizations and projects. Handles querying for both as well. @@ -29,7 +28,7 @@ public class AzureRepositoryHierarchy // 1:N Organization to project. private readonly Dictionary> _organizationsAndProjects = new(); - private readonly DeveloperId _developerId; + private readonly DeveloperId.DeveloperId _developerId; /// /// Initializes a new instance of the class. @@ -41,7 +40,7 @@ public class AzureRepositoryHierarchy /// Additionally, organizations and projects need to be fetched from the network. /// This class handles fetching the data, caching it, and searching it. /// - public AzureRepositoryHierarchy(DeveloperId developerId) + public AzureRepositoryHierarchy(DeveloperId.DeveloperId developerId) { _developerId = developerId; } diff --git a/src/AzureExtension/Providers/RepositoryProvider.cs b/src/AzureExtension/Providers/RepositoryProvider.cs index 73a77759..9ce4390d 100644 --- a/src/AzureExtension/Providers/RepositoryProvider.cs +++ b/src/AzureExtension/Providers/RepositoryProvider.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. using System.Security.Authentication; -using AzureExtension.Helpers; using DevHomeAzureExtension.Client; using DevHomeAzureExtension.DeveloperId; using DevHomeAzureExtension.Helpers; diff --git a/src/AzureExtension/Providers/SettingsProvider.cs b/src/AzureExtension/Providers/SettingsProvider.cs index 52a11300..197285f5 100644 --- a/src/AzureExtension/Providers/SettingsProvider.cs +++ b/src/AzureExtension/Providers/SettingsProvider.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Providers; +namespace DevHomeAzureExtension.Providers; public sealed class SettingsProvider : ISettingsProvider { diff --git a/src/AzureExtension/Providers/SettingsUIController.cs b/src/AzureExtension/Providers/SettingsUIController.cs index ee78d9a1..0b9f21b7 100644 --- a/src/AzureExtension/Providers/SettingsUIController.cs +++ b/src/AzureExtension/Providers/SettingsUIController.cs @@ -3,14 +3,14 @@ using System.Text.Json; using System.Text.Json.Serialization; -using AzureExtension.Contracts; -using AzureExtension.QuickStartPlayground; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; +using DevHomeAzureExtension.QuickStartPlayground; using Microsoft.Windows.DevHome.SDK; using Serilog; using Windows.Foundation; -namespace AzureExtension.Providers; +namespace DevHomeAzureExtension.Providers; internal sealed partial class SettingsUIController : IExtensionAdaptiveCardSession { diff --git a/src/AzureExtension/QuickStartPlayground/AICredentialService.cs b/src/AzureExtension/QuickStartPlayground/AICredentialService.cs index 9bf7b23e..181f4d6e 100644 --- a/src/AzureExtension/QuickStartPlayground/AICredentialService.cs +++ b/src/AzureExtension/QuickStartPlayground/AICredentialService.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; using System.Security; using System.Text; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Windows.Win32; using Windows.Win32.Foundation; using Windows.Win32.Security.Credentials; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class AICredentialService : IAICredentialService { diff --git a/src/AzureExtension/QuickStartPlayground/AzureOpenAIDevContainerQuickStartProjectProvider.cs b/src/AzureExtension/QuickStartPlayground/AzureOpenAIDevContainerQuickStartProjectProvider.cs index 0d8963cc..9edc9341 100644 --- a/src/AzureExtension/QuickStartPlayground/AzureOpenAIDevContainerQuickStartProjectProvider.cs +++ b/src/AzureExtension/QuickStartPlayground/AzureOpenAIDevContainerQuickStartProjectProvider.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class AzureOpenAIDevContainerQuickStartProjectProvider : DevContainerQuickStartProjectProvider { diff --git a/src/AzureExtension/QuickStartPlayground/AzureOpenAIService.cs b/src/AzureExtension/QuickStartPlayground/AzureOpenAIService.cs index 596d1b5d..5d6ad31e 100644 --- a/src/AzureExtension/QuickStartPlayground/AzureOpenAIService.cs +++ b/src/AzureExtension/QuickStartPlayground/AzureOpenAIService.cs @@ -5,12 +5,12 @@ using System.Reflection; using Azure; using Azure.AI.OpenAI; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Microsoft.ML.Tokenizers; using Newtonsoft.Json; using Serilog; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class AzureOpenAIService : IAzureOpenAIService { diff --git a/src/AzureExtension/QuickStartPlayground/Completions.cs b/src/AzureExtension/QuickStartPlayground/Completions.cs index e6f1f124..f3d3040b 100644 --- a/src/AzureExtension/QuickStartPlayground/Completions.cs +++ b/src/AzureExtension/QuickStartPlayground/Completions.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public static class Completions { diff --git a/src/AzureExtension/QuickStartPlayground/DependencyUIController.cs b/src/AzureExtension/QuickStartPlayground/DependencyUIController.cs index 5647f02f..07c7e525 100644 --- a/src/AzureExtension/QuickStartPlayground/DependencyUIController.cs +++ b/src/AzureExtension/QuickStartPlayground/DependencyUIController.cs @@ -4,12 +4,12 @@ using System.Diagnostics; using System.Text.Json; using System.Text.Json.Serialization; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Windows.Foundation; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed partial class DependencyUIController : IExtensionAdaptiveCardSession2 { diff --git a/src/AzureExtension/QuickStartPlayground/DevContainerGenerationOperation.cs b/src/AzureExtension/QuickStartPlayground/DevContainerGenerationOperation.cs index b40370ec..fc8b1bf8 100644 --- a/src/AzureExtension/QuickStartPlayground/DevContainerGenerationOperation.cs +++ b/src/AzureExtension/QuickStartPlayground/DevContainerGenerationOperation.cs @@ -4,14 +4,14 @@ using System.Diagnostics; using System.Runtime.InteropServices.WindowsRuntime; using System.Text.Json; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Serilog; using Windows.Foundation; using Windows.Storage; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class DevContainerGenerationOperation : IQuickStartProjectGenerationOperation { diff --git a/src/AzureExtension/QuickStartPlayground/DevContainerProjectFeedback.cs b/src/AzureExtension/QuickStartPlayground/DevContainerProjectFeedback.cs index dcc71ed2..9b5ddb7e 100644 --- a/src/AzureExtension/QuickStartPlayground/DevContainerProjectFeedback.cs +++ b/src/AzureExtension/QuickStartPlayground/DevContainerProjectFeedback.cs @@ -3,7 +3,7 @@ using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class DevContainerProjectFeedback : IQuickStartProjectResultFeedbackHandler { diff --git a/src/AzureExtension/QuickStartPlayground/DevContainerProjectHost.cs b/src/AzureExtension/QuickStartPlayground/DevContainerProjectHost.cs index 2a6adc2a..fefc0e1f 100644 --- a/src/AzureExtension/QuickStartPlayground/DevContainerProjectHost.cs +++ b/src/AzureExtension/QuickStartPlayground/DevContainerProjectHost.cs @@ -5,7 +5,7 @@ using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class DevContainerProjectHost : IQuickStartProjectHost { diff --git a/src/AzureExtension/QuickStartPlayground/DevContainerQuickStartProjectProvider.cs b/src/AzureExtension/QuickStartPlayground/DevContainerQuickStartProjectProvider.cs index 20a773b5..870f234d 100644 --- a/src/AzureExtension/QuickStartPlayground/DevContainerQuickStartProjectProvider.cs +++ b/src/AzureExtension/QuickStartPlayground/DevContainerQuickStartProjectProvider.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Windows.Storage; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public abstract class DevContainerQuickStartProjectProvider : IQuickStartProjectProvider { diff --git a/src/AzureExtension/QuickStartPlayground/DockerProgressUIController.cs b/src/AzureExtension/QuickStartPlayground/DockerProgressUIController.cs index 1f30e2c7..dbc70b04 100644 --- a/src/AzureExtension/QuickStartPlayground/DockerProgressUIController.cs +++ b/src/AzureExtension/QuickStartPlayground/DockerProgressUIController.cs @@ -8,7 +8,7 @@ using Microsoft.Windows.DevHome.SDK; using Windows.Foundation; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed partial class DockerProgressUIController : IExtensionAdaptiveCardSession2 { diff --git a/src/AzureExtension/QuickStartPlayground/DockerValidation.cs b/src/AzureExtension/QuickStartPlayground/DockerValidation.cs index d2d2601e..bd27dc81 100644 --- a/src/AzureExtension/QuickStartPlayground/DockerValidation.cs +++ b/src/AzureExtension/QuickStartPlayground/DockerValidation.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using Windows.Storage; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public static class DockerValidation { diff --git a/src/AzureExtension/QuickStartPlayground/EmbeddingsCalc.cs b/src/AzureExtension/QuickStartPlayground/EmbeddingsCalc.cs index 5f5317ae..2bcfc5c0 100644 --- a/src/AzureExtension/QuickStartPlayground/EmbeddingsCalc.cs +++ b/src/AzureExtension/QuickStartPlayground/EmbeddingsCalc.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.Numerics.Tensors; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; /// /// This class contains helper methods to perform vector database-like operations on the diff --git a/src/AzureExtension/QuickStartPlayground/ExtensionInitializationUIController.cs b/src/AzureExtension/QuickStartPlayground/ExtensionInitializationUIController.cs index 2483fd99..a7759c2b 100644 --- a/src/AzureExtension/QuickStartPlayground/ExtensionInitializationUIController.cs +++ b/src/AzureExtension/QuickStartPlayground/ExtensionInitializationUIController.cs @@ -4,7 +4,7 @@ using Microsoft.Windows.DevHome.SDK; using Windows.Foundation; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; // This class serves as a wrapper around multiple adaptive cards which are displayed one after // another but don't know about each other. After each adaptive card is done, the next is displayed. diff --git a/src/AzureExtension/QuickStartPlayground/InstalledAppsService.cs b/src/AzureExtension/QuickStartPlayground/InstalledAppsService.cs index ca64fe84..03b370fb 100644 --- a/src/AzureExtension/QuickStartPlayground/InstalledAppsService.cs +++ b/src/AzureExtension/QuickStartPlayground/InstalledAppsService.cs @@ -2,12 +2,12 @@ // Licensed under the MIT License. using System.Diagnostics; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Serilog; using Windows.Management.Deployment; using Windows.System.Inventory; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public class InstalledAppsService : IInstalledAppsService { diff --git a/src/AzureExtension/QuickStartPlayground/OpenAIDevContainerQuickStartProjectProvider.cs b/src/AzureExtension/QuickStartPlayground/OpenAIDevContainerQuickStartProjectProvider.cs index 887893d1..af4eaf91 100644 --- a/src/AzureExtension/QuickStartPlayground/OpenAIDevContainerQuickStartProjectProvider.cs +++ b/src/AzureExtension/QuickStartPlayground/OpenAIDevContainerQuickStartProjectProvider.cs @@ -4,12 +4,12 @@ using System.Security; using System.Text.Json; using System.Text.Json.Serialization; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Windows.Foundation; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed partial class OpenAIDevContainerQuickStartProjectProvider : DevContainerQuickStartProjectProvider { diff --git a/src/AzureExtension/QuickStartPlayground/ServiceExtensions.cs b/src/AzureExtension/QuickStartPlayground/ServiceExtensions.cs index 5aeeadb6..85e0c390 100644 --- a/src/AzureExtension/QuickStartPlayground/ServiceExtensions.cs +++ b/src/AzureExtension/QuickStartPlayground/ServiceExtensions.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Microsoft.Extensions.DependencyInjection; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public static class ServiceExtensions { diff --git a/src/AzureExtension/QuickStartPlayground/TrainingSample.cs b/src/AzureExtension/QuickStartPlayground/TrainingSample.cs index c9a6a121..6999e94c 100644 --- a/src/AzureExtension/QuickStartPlayground/TrainingSample.cs +++ b/src/AzureExtension/QuickStartPlayground/TrainingSample.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace AzureExtension.QuickStartPlayground; +namespace DevHomeAzureExtension.QuickStartPlayground; public sealed class TrainingSample { diff --git a/src/AzureExtension/Services/DevBox/ARMTokenService.cs b/src/AzureExtension/Services/DevBox/ARMTokenService.cs index c45b9e65..7bd81b2e 100644 --- a/src/AzureExtension/Services/DevBox/ARMTokenService.cs +++ b/src/AzureExtension/Services/DevBox/ARMTokenService.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; -using AzureExtension.DevBox; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.DeveloperId; using Microsoft.Windows.DevHome.SDK; using Serilog; +using DevBoxConstants = DevHomeAzureExtension.DevBox.Constants; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; /// /// Implementation of the Azure Resource Manager (ARM) token service. @@ -26,7 +26,7 @@ public async Task GetTokenAsync(IDeveloperId? devId) return string.Empty; } - var result = await AuthHelper.ObtainTokenForLoggedInDeveloperAccount(new string[] { Constants.ManagementPlaneScope }, devId.LoginId); + var result = await AuthHelper.ObtainTokenForLoggedInDeveloperAccount(new string[] { DevBoxConstants.ManagementPlaneScope }, devId.LoginId); return result?.AccessToken ?? string.Empty; } } diff --git a/src/AzureExtension/Services/DevBox/AuthService.cs b/src/AzureExtension/Services/DevBox/AuthService.cs index 5a619770..b067aa1e 100644 --- a/src/AzureExtension/Services/DevBox/AuthService.cs +++ b/src/AzureExtension/Services/DevBox/AuthService.cs @@ -2,11 +2,11 @@ // Licensed under the MIT License. using System.Net.Http.Headers; -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Microsoft.Windows.DevHome.SDK; using Windows.ApplicationModel; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; public class AuthService : IDevBoxAuthService { diff --git a/src/AzureExtension/Services/DevBox/DataTokenService.cs b/src/AzureExtension/Services/DevBox/DataTokenService.cs index 84611789..cbecbc75 100644 --- a/src/AzureExtension/Services/DevBox/DataTokenService.cs +++ b/src/AzureExtension/Services/DevBox/DataTokenService.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; -using AzureExtension.DevBox; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.DeveloperId; using Microsoft.Windows.DevHome.SDK; using Serilog; +using DevBoxConstants = DevHomeAzureExtension.DevBox.Constants; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; /// /// Implementation of Dev Box Data Plane token service. @@ -28,7 +28,7 @@ public async Task GetTokenAsync(IDeveloperId? devId) try { - var result = await AuthHelper.ObtainTokenForLoggedInDeveloperAccount(new string[] { Constants.DataPlaneScope }, devId.LoginId); + var result = await AuthHelper.ObtainTokenForLoggedInDeveloperAccount(new string[] { DevBoxConstants.DataPlaneScope }, devId.LoginId); return result?.AccessToken ?? string.Empty; } catch (Exception e) diff --git a/src/AzureExtension/Services/DevBox/DevBoxCreationManager.cs b/src/AzureExtension/Services/DevBox/DevBoxCreationManager.cs index f30939e0..b833b99c 100644 --- a/src/AzureExtension/Services/DevBox/DevBoxCreationManager.cs +++ b/src/AzureExtension/Services/DevBox/DevBoxCreationManager.cs @@ -2,15 +2,16 @@ // Licensed under the MIT License. using System.Text.Json; -using AzureExtension.Contracts; -using AzureExtension.DevBox; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Models; using DevHomeAzureExtension.Helpers; using Microsoft.Windows.DevHome.SDK; using Serilog; +using DevBoxConstants = DevHomeAzureExtension.DevBox.Constants; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; public class DevBoxCreationManager : IDevBoxCreationManager { @@ -49,15 +50,15 @@ public async Task StartCreateDevBoxOperation(CreateCo try { _log.Information($"Starting the create DevBox operation for new environment with new: {parameters.NewEnvironmentName}"); - operation.UpdateProgress(Resources.GetResource(SendingCreationRequestProgressKey), Constants.IndefiniteProgress); + operation.UpdateProgress(Resources.GetResource(SendingCreationRequestProgressKey), DevBoxConstants.IndefiniteProgress); var result = await _devBoxManagementService.CreateDevBox(parameters, developerId); - operation.UpdateProgress(Resources.GetResource(CreationResponseReceivedProgressKey, parameters.NewEnvironmentName, parameters.ProjectName), Constants.IndefiniteProgress); + operation.UpdateProgress(Resources.GetResource(CreationResponseReceivedProgressKey, parameters.NewEnvironmentName, parameters.ProjectName), DevBoxConstants.IndefiniteProgress); - var devBoxState = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), Constants.JsonOptions)!; + var devBoxState = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), DevBoxConstants.JsonOptions)!; var devBox = _devBoxInstanceFactory(developerId, devBoxState); - operation.UpdateProgress(Resources.GetResource(DevCenterCreationStartedProgressKey, parameters.NewEnvironmentName, parameters.ProjectName), Constants.IndefiniteProgress); + operation.UpdateProgress(Resources.GetResource(DevCenterCreationStartedProgressKey, parameters.NewEnvironmentName, parameters.ProjectName), DevBoxConstants.IndefiniteProgress); var callback = DevCenterLongRunningOperationCallback(devBox); diff --git a/src/AzureExtension/Services/DevBox/DevBoxManagementService.cs b/src/AzureExtension/Services/DevBox/DevBoxManagementService.cs index c5311841..da4315ff 100644 --- a/src/AzureExtension/Services/DevBox/DevBoxManagementService.cs +++ b/src/AzureExtension/Services/DevBox/DevBoxManagementService.cs @@ -2,20 +2,19 @@ // Licensed under the MIT License. using System.Collections.Concurrent; -using System.Net; using System.Net.Http.Headers; using System.Text; using System.Text.Json; using System.Text.RegularExpressions; -using AzureExtension.Contracts; -using AzureExtension.DevBox; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Exceptions; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Exceptions; +using DevHomeAzureExtension.DevBox.Models; using Microsoft.Windows.DevHome.SDK; using Serilog; +using DevBoxConstants = DevHomeAzureExtension.DevBox.Constants; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; /// /// The DevBoxManagementService is responsible for making calls to the Azure Resource Graph API. @@ -141,9 +140,9 @@ await Parallel.ForEachAsync(projects.Data!, async (project, token) => try { var properties = project.Properties; - var uriToRetrievePools = $"{properties.DevCenterUri}{Constants.Projects}/{project.Name}/{Constants.Pools}?{Constants.APIVersion}"; + var uriToRetrievePools = $"{properties.DevCenterUri}{DevBoxConstants.Projects}/{project.Name}/{DevBoxConstants.Pools}?{DevBoxConstants.APIVersion}"; var result = await HttpsRequestToDataPlane(new Uri(uriToRetrievePools), developerId, HttpMethod.Get); - var pools = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), Constants.JsonOptions); + var pools = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), DevBoxConstants.JsonOptions); var container = new DevBoxProjectAndPoolContainer { Project = project, Pools = pools }; projectsToPoolsMapping.Add(container); @@ -161,17 +160,17 @@ await Parallel.ForEachAsync(projects.Data!, async (project, token) => /// public async Task CreateDevBox(DevBoxCreationParameters parameters, IDeveloperId developerId) { - if (!Regex.IsMatch(parameters.NewEnvironmentName, Constants.NameRegexPattern)) + if (!Regex.IsMatch(parameters.NewEnvironmentName, DevBoxConstants.NameRegexPattern)) { throw new DevBoxNameInvalidException($"Unable to create Dev Box due to Invalid Dev Box name: {parameters.NewEnvironmentName}"); } - if (!Regex.IsMatch(parameters.ProjectName, Constants.NameRegexPattern)) + if (!Regex.IsMatch(parameters.ProjectName, DevBoxConstants.NameRegexPattern)) { throw new DevBoxProjectNameInvalidException($"Unable to create Dev Box due to Invalid project name: {parameters.ProjectName}"); } - var uriToCreateDevBox = $"{parameters.DevCenterUri}{Constants.Projects}/{parameters.ProjectName}{Constants.DevBoxUserSegmentOfUri}/{parameters.NewEnvironmentName}?{Constants.APIVersion}"; + var uriToCreateDevBox = $"{parameters.DevCenterUri}{DevBoxConstants.Projects}/{parameters.ProjectName}{DevBoxConstants.DevBoxUserSegmentOfUri}/{parameters.NewEnvironmentName}?{DevBoxConstants.APIVersion}"; var contentJson = JsonSerializer.Serialize(new DevBoxCreationPoolName(parameters.PoolName)); var content = new StringContent(contentJson, Encoding.UTF8, "application/json"); return await HttpsRequestToDataPlane(new Uri(uriToCreateDevBox), developerId, HttpMethod.Put, content); diff --git a/src/AzureExtension/Services/DevBox/DevBoxOperationWatcher.cs b/src/AzureExtension/Services/DevBox/DevBoxOperationWatcher.cs index 2e0e1512..d6e3a822 100644 --- a/src/AzureExtension/Services/DevBox/DevBoxOperationWatcher.cs +++ b/src/AzureExtension/Services/DevBox/DevBoxOperationWatcher.cs @@ -2,16 +2,17 @@ // Licensed under the MIT License. using System.Text.Json; -using AzureExtension.Contracts; -using AzureExtension.DevBox; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Exceptions; -using AzureExtension.DevBox.Models; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Exceptions; +using DevHomeAzureExtension.DevBox.Models; using Microsoft.Windows.DevHome.SDK; using Serilog; using Windows.System.Threading; +using DevBoxConstants = DevHomeAzureExtension.DevBox.Constants; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; /// /// Represents the status of a Dev Box provisioning operation. @@ -76,7 +77,7 @@ public void StartDevCenterOperationMonitor(IDeveloperId developerId, Uri operati // Query the Dev Center for the status of the Dev Box operation. var result = await _managementService.HttpsRequestToDataPlane(operationUri, developerId, HttpMethod.Get, null); - var operation = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), Constants.JsonOptions)!; + var operation = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), DevBoxConstants.JsonOptions)!; // Invoke the call back so the original requester can handle the status update of the operation. completionCallback(operation.Status); @@ -137,12 +138,12 @@ public void StartDevBoxProvisioningStatusMonitor(IDeveloperId developerId, DevBo _log.Information($"Starting the provisioning monitor for Dev Box with Name: '{devBoxInstance.DisplayName}' , Id: '{devBoxInstance.Id}'"); // Query the Dev Center for the provisioning status of the Dev Box. This is needed for when the Dev Box was created outside of Dev Home. - var devBoxUri = $"{devBoxInstance.DevBoxState.Uri}?{Constants.APIVersion}"; + var devBoxUri = $"{devBoxInstance.DevBoxState.Uri}?{DevBoxConstants.APIVersion}"; var result = await _managementService.HttpsRequestToDataPlane(new Uri(devBoxUri), developerId, HttpMethod.Get, null); - var devBoxState = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), Constants.JsonOptions)!; + var devBoxState = JsonSerializer.Deserialize(result.JsonResponseRoot.ToString(), DevBoxConstants.JsonOptions)!; // If the Dev Box is no longer being created, update the state for Dev Homes UI and end the timer. - if (!(devBoxState.ProvisioningState == Constants.DevBoxProvisioningStates.Creating || devBoxState.ProvisioningState == Constants.DevBoxProvisioningStates.Provisioning)) + if (!(devBoxState.ProvisioningState == DevBoxConstants.DevBoxProvisioningStates.Creating || devBoxState.ProvisioningState == DevBoxConstants.DevBoxProvisioningStates.Provisioning)) { _log.Information($"Dev Box provisioning now completed."); devBoxInstance.ProvisioningMonitorCompleted(devBoxState, ProvisioningStatus.Succeeded); diff --git a/src/AzureExtension/Services/DevBox/PackagesService.cs b/src/AzureExtension/Services/DevBox/PackagesService.cs index 1bb3f1a5..b623c4e1 100644 --- a/src/AzureExtension/Services/DevBox/PackagesService.cs +++ b/src/AzureExtension/Services/DevBox/PackagesService.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Windows.ApplicationModel; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; public class PackagesService : IPackagesService { diff --git a/src/AzureExtension/Services/DevBox/TimeSpanService.cs b/src/AzureExtension/Services/DevBox/TimeSpanService.cs index 8af58701..9aa252f4 100644 --- a/src/AzureExtension/Services/DevBox/TimeSpanService.cs +++ b/src/AzureExtension/Services/DevBox/TimeSpanService.cs @@ -1,17 +1,18 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; -using AzureExtension.DevBox; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox; +using DevBoxConstants = DevHomeAzureExtension.DevBox.Constants; -namespace AzureExtension.Services.DevBox; +namespace DevHomeAzureExtension.Services.DevBox; /// /// Service to provide time spans for different operations. /// public class TimeSpanService : ITimeSpanService { - public TimeSpan DevBoxOperationDeadline { get; private set; } = Constants.OperationDeadline; + public TimeSpan DevBoxOperationDeadline { get; private set; } = DevBoxConstants.OperationDeadline; /// /// Get the period interval based on the action to perform. @@ -28,9 +29,9 @@ public TimeSpan GetPeriodIntervalBasedOnAction(DevBoxActionToPerform actionToPer switch (actionToPerform) { case DevBoxActionToPerform.Create: - return Constants.ThreeMinutePeriod; + return DevBoxConstants.ThreeMinutePeriod; default: - return Constants.OneMinutePeriod; + return DevBoxConstants.OneMinutePeriod; } } } diff --git a/src/AzureExtensionServer/Program.cs b/src/AzureExtensionServer/Program.cs index a26c936d..5774124d 100644 --- a/src/AzureExtensionServer/Program.cs +++ b/src/AzureExtensionServer/Program.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; -using AzureExtension.DevBox; -using AzureExtension.DevBox.Models; -using AzureExtension.Providers; -using AzureExtension.QuickStartPlayground; -using AzureExtension.Services.DevBox; +using DevHomeAzureExtension.Contracts; using DevHomeAzureExtension.DataModel; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.Models; using DevHomeAzureExtension.DeveloperId; +using DevHomeAzureExtension.Providers; +using DevHomeAzureExtension.QuickStartPlayground; +using DevHomeAzureExtension.Services.DevBox; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/test/AzureExtension/DevBox/ArmTestTokenService.cs b/test/AzureExtension/DevBox/ArmTestTokenService.cs index 4a3f2e66..0a352d3a 100644 --- a/test/AzureExtension/DevBox/ArmTestTokenService.cs +++ b/test/AzureExtension/DevBox/ArmTestTokenService.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Test.DevBox; +namespace DevHomeAzureExtension.Test.DevBox; public class ArmTestTokenService : IArmTokenService { diff --git a/test/AzureExtension/DevBox/DataTestTokenService.cs b/test/AzureExtension/DevBox/DataTestTokenService.cs index a387b6ae..4b44ad31 100644 --- a/test/AzureExtension/DevBox/DataTestTokenService.cs +++ b/test/AzureExtension/DevBox/DataTestTokenService.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; +using DevHomeAzureExtension.Contracts; using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Test.DevBox; +namespace DevHomeAzureExtension.Test.DevBox; public class DataTestTokenService : IDataTokenService { diff --git a/test/AzureExtension/DevBox/DevBoxTests.cs b/test/AzureExtension/DevBox/DevBoxTests.cs index 2f7cee35..de084adb 100644 --- a/test/AzureExtension/DevBox/DevBoxTests.cs +++ b/test/AzureExtension/DevBox/DevBoxTests.cs @@ -2,10 +2,10 @@ // Licensed under the MIT License. using System.Text.Json; -using AzureExtension.DevBox; -using AzureExtension.DevBox.DevBoxJsonToCsClasses; -using AzureExtension.DevBox.Models; -using AzureExtension.Test.DevBox; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.DevBoxJsonToCsClasses; +using DevHomeAzureExtension.DevBox.Models; +using DevHomeAzureExtension.Test.DevBox; using Microsoft.Extensions.DependencyInjection; using Microsoft.Windows.DevHome.SDK; diff --git a/test/AzureExtension/DevBox/DevBoxTestsSetup.cs b/test/AzureExtension/DevBox/DevBoxTestsSetup.cs index 438ee1c3..26a8f8d3 100644 --- a/test/AzureExtension/DevBox/DevBoxTestsSetup.cs +++ b/test/AzureExtension/DevBox/DevBoxTestsSetup.cs @@ -3,11 +3,11 @@ using System.Net; using System.Net.Http.Headers; -using AzureExtension.Contracts; -using AzureExtension.DevBox; -using AzureExtension.DevBox.Models; -using AzureExtension.Services.DevBox; -using AzureExtension.Test.DevBox; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox; +using DevHomeAzureExtension.DevBox.Models; +using DevHomeAzureExtension.Services.DevBox; +using DevHomeAzureExtension.Test.DevBox; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Moq; diff --git a/test/AzureExtension/DevBox/EmptyDeveloperId.cs b/test/AzureExtension/DevBox/EmptyDeveloperId.cs index a842d0e2..7dab4f79 100644 --- a/test/AzureExtension/DevBox/EmptyDeveloperId.cs +++ b/test/AzureExtension/DevBox/EmptyDeveloperId.cs @@ -3,7 +3,7 @@ using Microsoft.Windows.DevHome.SDK; -namespace AzureExtension.Test.DevBox; +namespace DevHomeAzureExtension.Test.DevBox; public class EmptyDeveloperId : IDeveloperId { diff --git a/test/AzureExtension/DevBox/TimeSpanServiceMock.cs b/test/AzureExtension/DevBox/TimeSpanServiceMock.cs index f7a11b0e..014daac0 100644 --- a/test/AzureExtension/DevBox/TimeSpanServiceMock.cs +++ b/test/AzureExtension/DevBox/TimeSpanServiceMock.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -using AzureExtension.Contracts; -using AzureExtension.DevBox; +using DevHomeAzureExtension.Contracts; +using DevHomeAzureExtension.DevBox; -namespace AzureExtension.Test.DevBox; +namespace DevHomeAzureExtension.Test.DevBox; public class TimeSpanServiceMock : ITimeSpanService { diff --git a/test/AzureExtension/DeveloperId/Mocks/MockAuthenticationSettings.cs b/test/AzureExtension/DeveloperId/Mocks/MockAuthenticationSettings.cs index f1fc663c..e35f494a 100644 --- a/test/AzureExtension/DeveloperId/Mocks/MockAuthenticationSettings.cs +++ b/test/AzureExtension/DeveloperId/Mocks/MockAuthenticationSettings.cs @@ -3,7 +3,7 @@ using DevHomeAzureExtension.DeveloperId; -namespace AzureExtension.Test.DeveloperId.Mocks; +namespace DevHomeAzureExtension.Test.DeveloperId.Mocks; public class MockAuthenticationSettings : IAuthenticationSettings {