[VA][Skill] fix event, remove BuildServiceProvider (#2579)

xieofxie · web-flow · commit 3ace6a77bff0 · 2019-10-25T14:57:29.000+08:00
BuildServiceProvider and runtime one are not same one
diff --git a/skills/csharp/calendarskill/Startup.cs b/skills/csharp/calendarskill/Startup.cs
@@ -60,7 +60,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/emailskill/Startup.cs b/skills/csharp/emailskill/Startup.cs
@@ -58,7 +58,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/experimental/automotiveskill/Startup.cs b/skills/csharp/experimental/automotiveskill/Startup.cs
@@ -58,7 +58,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/experimental/bingsearchskill/Startup.cs b/skills/csharp/experimental/bingsearchskill/Startup.cs
@@ -54,7 +54,6 @@ public Startup(IHostingEnvironment env, ILoggerFactory loggerFactory)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/experimental/eventskill/Startup.cs b/skills/csharp/experimental/eventskill/Startup.cs
@@ -55,8 +55,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);
diff --git a/skills/csharp/experimental/hospitalityskill/Startup.cs b/skills/csharp/experimental/hospitalityskill/Startup.cs
@@ -60,8 +60,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);
diff --git a/skills/csharp/experimental/itsmskill/Startup.cs b/skills/csharp/experimental/itsmskill/Startup.cs
@@ -58,8 +58,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);
diff --git a/skills/csharp/experimental/musicskill/Startup.cs b/skills/csharp/experimental/musicskill/Startup.cs
@@ -54,8 +54,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);
diff --git a/skills/csharp/experimental/newsskill/Startup.cs b/skills/csharp/experimental/newsskill/Startup.cs
@@ -54,7 +54,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/experimental/restaurantbookingskill/Startup.cs b/skills/csharp/experimental/restaurantbookingskill/Startup.cs
@@ -58,7 +58,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/experimental/weatherskill/Startup.cs b/skills/csharp/experimental/weatherskill/Startup.cs
@@ -54,7 +54,6 @@ public Startup(IHostingEnvironment env, ILoggerFactory loggerFactory)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/pointofinterestskill/Startup.cs b/skills/csharp/pointofinterestskill/Startup.cs
@@ -56,7 +56,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/skills/csharp/todoskill/Startup.cs b/skills/csharp/todoskill/Startup.cs
@@ -55,7 +55,6 @@ public Startup(IHostingEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1);
-            var provider = services.BuildServiceProvider();
 
             // Load settings
             var settings = new BotSettings();
diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Startup.cs b/templates/Skill-Template/csharp/Sample/SkillSample/Startup.cs
@@ -55,8 +55,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);
diff --git a/templates/Skill-Template/csharp/Template/Skill/Startup.cs b/templates/Skill-Template/csharp/Template/Skill/Startup.cs
@@ -55,8 +55,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);
diff --git a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Dialogs/MainDialog.cs b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Dialogs/MainDialog.cs
@@ -23,6 +23,8 @@ namespace VirtualAssistantSample.Dialogs
 {
     public class MainDialog : RouterDialog
     {
+        private const string Location = "location";
+        private const string TimeZone = "timezone";
         private BotServices _services;
         private BotSettings _settings;
         private TemplateEngine _templateEngine;
@@ -236,10 +238,10 @@ protected override async Task OnEventActivityAsync(DialogContext innerDc, Cancel
                 case Events.Location:
                     {
                         var locationObj = new JObject();
-                        locationObj.Add(Events.Location, JToken.FromObject(value));
+                        locationObj.Add(Location, JToken.FromObject(value));
 
                         var skillContext = await _skillContext.GetAsync(innerDc.Context, () => new SkillContext());
-                        skillContext[Events.Location] = locationObj;
+                        skillContext[Location] = locationObj;
                         await _skillContext.SetAsync(innerDc.Context, skillContext);
 
                         break;
@@ -251,10 +253,10 @@ protected override async Task OnEventActivityAsync(DialogContext innerDc, Cancel
                         {
                             var timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(value);
                             var timeZoneObj = new JObject();
-                            timeZoneObj.Add(Events.TimeZone, JToken.FromObject(timeZoneInfo));
+                            timeZoneObj.Add(TimeZone, JToken.FromObject(timeZoneInfo));
 
                             var skillContext = await _skillContext.GetAsync(innerDc.Context, () => new SkillContext());
-                            skillContext[Events.TimeZone] = timeZoneObj;
+                            skillContext[TimeZone] = timeZoneObj;
                             await _skillContext.SetAsync(innerDc.Context, skillContext);
                         }
                         catch
diff --git a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Startup.cs b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Startup.cs
@@ -96,14 +96,16 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<OnboardingDialog>();
 
             // Register skill dialogs
-            var provider = services.BuildServiceProvider();
             foreach (var skill in settings.Skills)
             {
-                var userState = provider.GetService<UserState>();
-                var telemetryClient = provider.GetService<IBotTelemetryClient>();
                 var authDialog = BuildAuthDialog(skill, settings, appCredentials);
                 var credentials = new MicrosoftAppCredentialsEx(settings.MicrosoftAppId, settings.MicrosoftAppPassword, skill.MSAappId);
-                services.AddTransient(sp => new SkillDialog(skill, credentials, telemetryClient, userState, authDialog));
+                services.AddTransient(sp =>
+                {
+                    var userState = sp.GetService<UserState>();
+                    var telemetryClient = sp.GetService<IBotTelemetryClient>();
+                    return new SkillDialog(skill, credentials, telemetryClient, userState, authDialog);
+                });
             }
 
             // Configure adapters
diff --git a/templates/Virtual-Assistant-Template/csharp/Template/VA/Startup.cs b/templates/Virtual-Assistant-Template/csharp/Template/VA/Startup.cs
@@ -54,8 +54,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            var provider = services.BuildServiceProvider();
-
             // Load settings
             var settings = new BotSettings();
             Configuration.Bind(settings);

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public Startup(IHostingEnvironment env)`
`60`	`60`	`public void ConfigureServices(IServiceCollection services)`
`61`	`61`	`{`
`62`	`62`	`services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_1);`
`63`		`- var provider = services.BuildServiceProvider();`
`64`	`63`
`65`	`64`	`// Load settings`
`66`	`65`	`var settings = new BotSettings();`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ public Startup(IHostingEnvironment env)`
`58`	`58`	`public void ConfigureServices(IServiceCollection services)`
`59`	`59`	`{`
`60`	`60`	`services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);`
`61`		`- var provider = services.BuildServiceProvider();`
`62`	`61`
`63`	`62`	`// Load settings`
`64`	`63`	`var settings = new BotSettings();`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public Startup(IHostingEnvironment env, ILoggerFactory loggerFactory)`
`54`	`54`	`public void ConfigureServices(IServiceCollection services)`
`55`	`55`	`{`
`56`	`56`	`services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);`
`57`		`- var provider = services.BuildServiceProvider();`
`58`	`57`
`59`	`58`	`// Load settings`
`60`	`59`	`var settings = new BotSettings();`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@ public void ConfigureServices(IServiceCollection services)`
`55`	`55`	`{`
`56`	`56`	`services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);`
`57`	`57`
`58`		`- var provider = services.BuildServiceProvider();`
`59`		`-`
`60`	`58`	`// Load settings`
`61`	`59`	`var settings = new BotSettings();`
`62`	`60`	`Configuration.Bind(settings);`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public void ConfigureServices(IServiceCollection services)`
`60`	`60`	`{`
`61`	`61`	`services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);`
`62`	`62`
`63`		`- var provider = services.BuildServiceProvider();`
`64`		`-`
`65`	`63`	`// Load settings`
`66`	`64`	`var settings = new BotSettings();`
`67`	`65`	`Configuration.Bind(settings);`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ public void ConfigureServices(IServiceCollection services)`
`58`	`58`	`{`
`59`	`59`	`services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);`
`60`	`60`
`61`		`- var provider = services.BuildServiceProvider();`
`62`		`-`
`63`	`61`	`// Load settings`
`64`	`62`	`var settings = new BotSettings();`
`65`	`63`	`Configuration.Bind(settings);`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ public void ConfigureServices(IServiceCollection services)`
`54`	`54`	`{`
`55`	`55`	`services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);`
`56`	`56`
`57`		`- var provider = services.BuildServiceProvider();`
`58`		`-`
`59`	`57`	`// Load settings`
`60`	`58`	`var settings = new BotSettings();`
`61`	`59`	`Configuration.Bind(settings);`