revamp namespace based on folder structure for the entire solution (m…

…icrosoft#515)

solutions/Virtual-Assistant/src/csharp/assistant/BotServices.cs

@@ -10,7 +10,7 @@
 using Microsoft.Bot.Builder.AI.QnA;
 using Microsoft.Bot.Builder.Azure;
 using Microsoft.Bot.Configuration;
-using Microsoft.Bot.Solutions;
+using Microsoft.Bot.Solutions.Middleware.Telemetry;
 using Microsoft.Bot.Solutions.Skills;
 
 namespace VirtualAssistant
@@ -276,4 +276,4 @@ public BotServices(BotConfiguration botConfiguration, Dictionary<string, Diction
         /// </value>
         public Dictionary<string, ISkillConfiguration> SkillConfigurations { get; set; } = new Dictionary<string, ISkillConfiguration>();
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/EscalateDialog.cs

@@ -5,8 +5,9 @@
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
+using VirtualAssistant.Dialogs.Shared;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Escalate
 {
     public class EscalateDialog : EnterpriseDialog
     {
@@ -32,4 +33,4 @@ private async Task<DialogTurnResult> SendEscalationMessage(WaterfallStepContext
             return await sc.EndDialogAsync();
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Escalate/EscalateResponses.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Schema;
 using VirtualAssistant.Dialogs.Escalate.Resources;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Escalate
 {
     public class EscalateResponses : TemplateManager
     {
@@ -35,4 +35,4 @@ public class ResponseIds
             public const string SendEscalationMessage = "sendPhone";
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainDialog.cs

@@ -12,12 +12,14 @@
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Configuration;
 using Microsoft.Bot.Schema;
-using Microsoft.Bot.Solutions;
 using Microsoft.Bot.Solutions.Dialogs;
 using Microsoft.Bot.Solutions.Skills;
+using VirtualAssistant.Dialogs.Escalate;
 using VirtualAssistant.Dialogs.Main.Resources;
+using VirtualAssistant.Dialogs.Onboarding;
+using VirtualAssistant.Dialogs.Shared;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Main
 {
     public class MainDialog : RouterDialog
     {

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs

@@ -9,11 +9,9 @@
 using Microsoft.Bot.Builder.TemplateManager;
 using Microsoft.Bot.Schema;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
 using VirtualAssistant.Dialogs.Main.Resources;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Main
 {
     public class MainResponses : TemplateManager
     {
@@ -136,4 +134,4 @@ public class ResponseIds
             public const string Qna = "qna";
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Onboarding/OnboardingDialog.cs

@@ -3,11 +3,11 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.ApplicationInsights;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
+using VirtualAssistant.Dialogs.Shared;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Onboarding
 {
     public class OnboardingDialog : EnterpriseDialog
     {
@@ -71,4 +71,4 @@ public async Task<DialogTurnResult> FinishOnboardingDialog(WaterfallStepContext
             return await sc.EndDialogAsync();
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Onboarding/OnboardingResponses.cs

@@ -7,7 +7,7 @@
 using Microsoft.Bot.Schema;
 using VirtualAssistant.Dialogs.Onboarding.Resources;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Onboarding
 {
     public class OnboardingResponses : TemplateManager
     {
@@ -78,4 +78,4 @@ public class ResponseIds
             public const string AddLinkedAccountsMessage = "linkedAccountsInfo";
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Onboarding/OnboardingState.cs

@@ -3,12 +3,12 @@
 
 using Microsoft.Bot.Builder.Dialogs;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Onboarding
 {
     public class OnboardingState : DialogState
     {
         public string Name { get; set; }
 
         public string Location { get; set; }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Shared/CustomSkillDialog.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Configuration;
 using Microsoft.Bot.Solutions.Skills;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Shared
 {
     public class CustomSkillDialog : ComponentDialog
     {

solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Shared/EnterpriseDialog.cs

@@ -8,8 +8,9 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Solutions.Dialogs;
+using VirtualAssistant.Dialogs.Main;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.Dialogs.Shared
 {
     public class EnterpriseDialog : InterruptableDialog
     {
@@ -80,4 +81,4 @@ protected virtual async Task<InterruptionAction> OnHelp(DialogContext dc)
             return InterruptionAction.MessageSentToUser;
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/ServiceClients/GraphClient.cs

@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Graph;
 
-namespace VirtualAssistant
+namespace VirtualAssistant.ServiceClients
 {
     public class GraphClient
     {
@@ -45,4 +45,4 @@ await Task.Run(() =>
             return graphClient;
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/assistant/Startup.cs

@@ -14,12 +14,13 @@
 using Microsoft.Bot.Configuration;
 using Microsoft.Bot.Connector.Authentication;
 using Microsoft.Bot.Schema;
-using Microsoft.Bot.Solutions;
 using Microsoft.Bot.Solutions.Middleware;
+using Microsoft.Bot.Solutions.Middleware.Telemetry;
 using Microsoft.Bot.Solutions.Models.Proactive;
 using Microsoft.Bot.Solutions.Skills;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using VirtualAssistant.Dialogs.Main;
 
 namespace VirtualAssistant
 {

solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.cs

@@ -8,6 +8,7 @@
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Configuration;
 using Microsoft.Bot.Schema;
+using VirtualAssistant.Dialogs.Main;
 
 namespace VirtualAssistant
 {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Dialogs/RouterDialog.cs

@@ -3,10 +3,9 @@
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Schema;
-using Microsoft.Bot.Solutions.Dialogs;
 using Microsoft.Bot.Solutions.Extensions;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Dialogs
 {
     public abstract class RouterDialog : InterruptableDialog
     {
@@ -143,4 +142,4 @@ public RouterDialog(string dialogId, IBotTelemetryClient telemetryClient)
             return Task.FromResult(InterruptionAction.NoAction);
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/ContentModeratorMiddleware.cs

@@ -10,7 +10,7 @@
 using Microsoft.Bot.Schema;
 using Microsoft.CognitiveServices.ContentModerator;
 
-namespace VirtualAssistant
+namespace Microsoft.Bot.Solutions.Middleware
 {
     /// <summary>
     /// Middleware component to run Content Moderator Service on all incoming activities.
@@ -82,4 +82,4 @@ public ContentModeratorMiddleware(string subscriptionKey, string region)
             await next(cancellationToken);
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/ITelemetryLuisRecognizer.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     public interface ITelemetryLuisRecognizer : IRecognizer
     {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/ITelemetryQnAMaker.cs

@@ -1,9 +1,8 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.QnA;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     public interface ITelemetryQnAMaker
     {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/LuisTelemetryConstants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     /// <summary>
     /// The Application Insights property names that we're logging.

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/QnATelemetryConstants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     /// <summary>
     /// The Application Insights property names that we're logging.

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryConstants.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     public static class TelemetryConstants
     {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryLoggerMiddleware.cs

@@ -5,12 +5,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Schema;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     /// <summary>
     /// Middleware for logging incoming, outgoing, updated or deleted Activity messages into Application Insights.
@@ -251,4 +250,4 @@ private Dictionary<string, string> FillDeleteEventProperties(IMessageDeleteActiv
             return properties;
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryLuisRecognizer.cs

@@ -10,7 +10,7 @@
 using Microsoft.Bot.Builder.Dialogs;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     /// <summary>
     /// TelemetryLuisRecognizer invokes the Luis Recognizer and logs some results into Application Insights.

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Middleware/Telemetry/TelemetryQnAMaker.cs

@@ -4,12 +4,11 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.ApplicationInsights;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.QnA;
 using Newtonsoft.Json;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Middleware.Telemetry
 {
     /// <summary>
     /// TelemetryQnaRecognizer invokes the Qna Maker and logs some results into Application Insights.

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Prompts/EventPrompt.cs

@@ -5,7 +5,7 @@
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Schema;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Prompts
 {
     public class EventPrompt : ActivityPrompt
     {
@@ -36,4 +36,4 @@ protected override Task<PromptRecognizerResult<Activity>> OnRecognizeAsync(ITurn
             return Task.FromResult(result);
         }
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/LocaleConfiguration.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-using Microsoft.Bot.Builder;
-using Microsoft.Bot.Builder.AI.QnA;
+using Microsoft.Bot.Solutions.Middleware.Telemetry;
 
 namespace Microsoft.Bot.Solutions.Skills
 {
@@ -44,4 +43,4 @@ public class LocaleConfiguration
         /// </value>
         public Dictionary<string, ITelemetryQnAMaker> QnAServices { get; set; } = new Dictionary<string, ITelemetryQnAMaker>();
     }
-}
+}

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/SkillConfiguration.cs

@@ -2,11 +2,11 @@
 using System.Linq;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
-using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.AI.Luis;
 using Microsoft.Bot.Builder.AI.QnA;
 using Microsoft.Bot.Builder.Azure;
 using Microsoft.Bot.Configuration;
+using Microsoft.Bot.Solutions.Middleware.Telemetry;
 
 namespace Microsoft.Bot.Solutions.Skills
 {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Translation/PluralType.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Translation
 {
     public enum PluralType
     {

solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Translation/ResourceLoaderExtension.cs

@@ -3,7 +3,7 @@
 
 using System.Resources;
 
-namespace Microsoft.Bot.Solutions
+namespace Microsoft.Bot.Solutions.Translation
 {
     public static class ResourceLoaderExtension
     {