VSIX template bug fixes (#1958)

lauren-mills · darrenj · commit 5c6253769438 · 2019-07-26T07:59:59.000-07:00
* fix skill template bug

* [va] updated vstemplate files and nuspec

* updated skill template vstemplate files
diff --git a/templates/Skill-Template/csharp/Template/Microsoft.Bot.Builder.Solutions.SkillTemplate.nuspec b/templates/Skill-Template/csharp/Template/Microsoft.Bot.Builder.Solutions.SkillTemplate.nuspec
@@ -17,4 +17,7 @@
       <packageType name="Template" />
     </packageTypes>
   </metadata>
+  <files>
+    <file src=".\" exclude="**\*.vstemplate;**\*.ico;" />
+  </files>
 </package>
diff --git a/templates/Skill-Template/csharp/Template/Skill.Tests/SkillTestTemplate.vstemplate b/templates/Skill-Template/csharp/Template/Skill.Tests/SkillTestTemplate.vstemplate
@@ -11,26 +11,26 @@
     <Icon>__TemplateIcon.ico</Icon>
   </TemplateData>
   <TemplateContent>
-    <Project TargetFileName="Skill.Tests.csproj" File="Skill.Tests\Skill.Tests.csproj" ReplaceParameters="true">
-      <Folder Name="Skill.Tests\Mocks" TargetFolderName="Mocks">
+    <Project TargetFileName="Skill.Tests.csproj" File="Skill.Tests.csproj" ReplaceParameters="true">
+      <Folder Name="Mocks" TargetFolderName="Mocks">
         <ProjectItem ReplaceParameters="true" TargetFileName="MockLuisRecognizer.cs">MockLuisRecognizer.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="MockQnAMaker.cs">MockQnAMaker.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill.Tests\Utilities" TargetFolderName="Utilities">
+      <Folder Name="Utilities" TargetFolderName="Utilities">
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralTestUtil.cs">GeneralTestUtil.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="SkillTestUtil.cs">SkillTestUtil.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill.Tests\Utterances" TargetFolderName="Utterances">
+      <Folder Name="Utterances" TargetFolderName="Utterances">
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralUtterances.resx">GeneralUtterances.resx</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralUtterances.Designer.cs">GeneralUtterances.Designer.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="SampleDialogUtterances.resx">SampleDialogUtterances.resx</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="SampleDialogUtterances.Designer.cs">SampleDialogUtterances.Designer.cs</ProjectItem>
       </Folder>
-      <ProjectItem ReplaceParameters="true" TargetFileName="InterruptionTests.cs">Skill.Tests\InterruptionTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="LocalizationTests.cs">Skill.Tests\LocalizationTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="MainDialogTests.cs">Skill.Tests\MainDialogTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="SampleDialogTests.cs">Skill.Tests\SampleDialogTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="SkillTestBase.cs">Skill.Tests\SkillTestBase.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="InterruptionTests.cs">InterruptionTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="LocalizationTests.cs">LocalizationTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="MainDialogTests.cs">MainDialogTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="SampleDialogTests.cs">SampleDialogTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="SkillTestBase.cs">SkillTestBase.cs</ProjectItem>
     </Project>
   </TemplateContent>
 </VSTemplate>
diff --git a/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs b/templates/Skill-Template/csharp/Template/Skill/Adapters/CustomSkillAdapter.cs
@@ -37,7 +37,7 @@ public CustomSkillAdapter(
             Use(new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: true));
             Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));
             Use(new EventDebuggerMiddleware());
-            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(SkillSample))));
+            Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof($safeprojectname$))));
         }
     }
 }
diff --git a/templates/Skill-Template/csharp/Template/Skill/SkillProjectTemplate.vstemplate b/templates/Skill-Template/csharp/Template/Skill/SkillProjectTemplate.vstemplate
@@ -12,29 +12,29 @@
     <Icon>__TemplateIcon.ico</Icon>
   </TemplateData>
   <TemplateContent>
-    <Project TargetFileName="Skill.csproj" File="Skill\Skill.csproj" ReplaceParameters="true">
-      <Folder Name="Skill\Connected Services" TargetFolderName="Connected Services">
+    <Project TargetFileName="Skill.csproj" File="Skill.csproj" ReplaceParameters="true">
+      <Folder Name="Connected Services" TargetFolderName="Connected Services">
         <Folder Name="Application Insights" TargetFolderName="Application Insights">
           <ProjectItem ReplaceParameters="true" TargetFileName="ConnectedService.json">ConnectedService.json</ProjectItem>
         </Folder>
       </Folder>
-      <Folder Name="Skill\Properties" TargetFolderName="Properties">
+      <Folder Name="Properties" TargetFolderName="Properties">
         <ProjectItem ReplaceParameters="true" TargetFileName="launchSettings.json">launchSettings.json</ProjectItem>
       </Folder>
-      <Folder Name="Skill\wwwroot" TargetFolderName="wwwroot">
+      <Folder Name="wwwroot" TargetFolderName="wwwroot">
         <ProjectItem ReplaceParameters="true" TargetFileName="default.htm">default.htm</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Adapters" TargetFolderName="Adapters">
+      <Folder Name="Adapters" TargetFolderName="Adapters">
         <ProjectItem ReplaceParameters="true" TargetFileName="CustomSkillAdapter.cs">CustomSkillAdapter.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="DefaultAdapter.cs">DefaultAdapter.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Bots" TargetFolderName="Bots">
+      <Folder Name="Bots" TargetFolderName="Bots">
         <ProjectItem ReplaceParameters="true" TargetFileName="DialogBot.cs">DialogBot.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Controllers" TargetFolderName="Controllers">
+      <Folder Name="Controllers" TargetFolderName="Controllers">
         <ProjectItem ReplaceParameters="true" TargetFileName="BotController.cs">BotController.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Deployment" TargetFolderName="Deployment">
+      <Folder Name="Deployment" TargetFolderName="Deployment">
         <Folder Name="Resources" TargetFolderName="Resources">
           <Folder Name="LU" TargetFolderName="LU">
             <Folder Name="de" TargetFolderName="de">
@@ -74,15 +74,15 @@
           <ProjectItem ReplaceParameters="false" TargetFileName="qna_functions.ps1">luis_functions.ps1</ProjectItem>
         </Folder>
       </Folder>
-      <Folder Name="Skill\Dialogs" TargetFolderName="Dialogs">
+      <Folder Name="Dialogs" TargetFolderName="Dialogs">
         <ProjectItem ReplaceParameters="true" TargetFileName="MainDialog.cs">MainDialog.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="SampleDialog.cs">SampleDialog.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="SkillDialogBase.cs">SkillDialogBase.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Models" TargetFolderName="Models">
+      <Folder Name="Models" TargetFolderName="Models">
         <ProjectItem ReplaceParameters="true" TargetFileName="SkillState.cs">SkillState.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Responses" TargetFolderName="Responses">
+      <Folder Name="Responses" TargetFolderName="Responses">
         <Folder Name="Main" TargetFolderName="Main">
           <ProjectItem ReplaceParameters="true" TargetFileName="MainResponses.tt">MainResponses.tt</ProjectItem>
           <ProjectItem ReplaceParameters="true" TargetFileName="MainResponses.cs">MainResponses.cs</ProjectItem>
@@ -115,22 +115,22 @@
           <ProjectItem ReplaceParameters="true" TargetFileName="SharedResponses.zh.json">SharedResponses.zh.json</ProjectItem>
         </Folder>
       </Folder>
-      <Folder Name="Skill\Services" TargetFolderName="Services">
+      <Folder Name="Services" TargetFolderName="Services">
         <ProjectItem ReplaceParameters="true" TargetFileName="BotServices.cs">BotServices.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="BotSettings.cs">BotSettings.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="$safeprojectname$Luis.cs">SkillLuis.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralLuis.cs">GeneralLuis.cs</ProjectItem>
       </Folder>
-      <Folder Name="Skill\Pipeline" TargetFolderName="Pipeline">
+      <Folder Name="Pipeline" TargetFolderName="Pipeline">
         <ProjectItem ReplaceParameters="true" TargetFileName="$safeprojectname$.yml">SkillTemplate.yml</ProjectItem>
       </Folder>
-      <ProjectItem ReplaceParameters="true" TargetFileName=".filenesting.json">Skill\.filenesting.json</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="appsettings.json">Skill\appsettings.json</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="cognitivemodels.json">Skill\cognitivemodels.json</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="manifestTemplate.json">Skill\manifestTemplate.json</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="Program.cs">Skill\Program.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="false" TargetFileName="readme.md">Skill\readme.md</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="Startup.cs">Skill\Startup.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName=".filenesting.json">.filenesting.json</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="appsettings.json">appsettings.json</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="cognitivemodels.json">cognitivemodels.json</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="manifestTemplate.json">manifestTemplate.json</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Program.cs">Program.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="false" TargetFileName="readme.md">readme.md</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Startup.cs">Startup.cs</ProjectItem>
     </Project>
   </TemplateContent>
 </VSTemplate>
diff --git a/templates/Skill-Template/csharp/Template/skill.vstemplate b/templates/Skill-Template/csharp/Template/skill.vstemplate
@@ -9,10 +9,10 @@
   <TemplateContent>
     <ProjectCollection>
       <ProjectTemplateLink ProjectName="$safeprojectname$" CopyParameters="true">
-        SkillProjectTemplate.vstemplate
+        Skill\SkillProjectTemplate.vstemplate
       </ProjectTemplateLink>
       <ProjectTemplateLink ProjectName="$safeprojectname$.Tests" CopyParameters="true">
-        SkillTestTemplate.vstemplate
+        Skill.Tests\SkillTestTemplate.vstemplate
       </ProjectTemplateLink>
     </ProjectCollection>
   </TemplateContent>
diff --git a/templates/Virtual-Assistant-Template/csharp/Template/Microsoft.Bot.Builder.Solutions.VirtualAssistantTemplate.nuspec b/templates/Virtual-Assistant-Template/csharp/Template/Microsoft.Bot.Builder.Solutions.VirtualAssistantTemplate.nuspec
@@ -17,4 +17,7 @@
       <packageType name="Template" />
     </packageTypes>
   </metadata>
+  <files>
+	  <file src=".\" exclude="**\*.vstemplate;**\*.ico;" />
+  </files>
 </package>
diff --git a/templates/Virtual-Assistant-Template/csharp/Template/VA.Tests/VATestTemplate.vstemplate b/templates/Virtual-Assistant-Template/csharp/Template/VA.Tests/VATestTemplate.vstemplate
@@ -12,36 +12,36 @@
     <Icon>__TemplateIcon.ico</Icon>
   </TemplateData>
   <TemplateContent>
-    <Project TargetFileName="VA.Tests.csproj" File="VA.Tests\VA.Tests.csproj" ReplaceParameters="true">
-      <Folder Name="VA.Tests\Mocks" TargetFolderName="Mocks">
+    <Project TargetFileName="VA.Tests.csproj" File="VA.Tests.csproj" ReplaceParameters="true">
+      <Folder Name="Mocks" TargetFolderName="Mocks">
         <ProjectItem ReplaceParameters="true" TargetFileName="MockLuisRecognizer.cs">MockLuisRecognizer.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="MockQnAMaker.cs">MockQnAMaker.cs</ProjectItem>
       </Folder>
-      <Folder Name="VA.Tests\Resources" TargetFolderName="Resources">
+      <Folder Name="Resources" TargetFolderName="Resources">
         <ProjectItem ReplaceParameters="true" TargetFileName="chitchat_default.json">chitchat_default.json</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="chitchat_greeting.json">chitchat_greeting.json</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="faq_default.json">faq_default.json</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="faq_overview.json">faq_overview.json</ProjectItem>
       </Folder>
-      <Folder Name="VA.Tests\Utilities" TargetFolderName="Utilities">
+      <Folder Name="Utilities" TargetFolderName="Utilities">
         <ProjectItem ReplaceParameters="true" TargetFileName="ChitchatTestUtil.cs">ChitchatTestUtil.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="DispatchTestUtil.cs">DispatchTestUtil.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="FaqTestUtil.cs">FaqTestUtil.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralTestUtil.cs">GeneralTestUtil.cs</ProjectItem>
       </Folder>
-      <Folder Name="VA.Tests\Utterances" TargetFolderName="Utterances">
+      <Folder Name="Utterances" TargetFolderName="Utterances">
         <ProjectItem ReplaceParameters="true" TargetFileName="ChitchatUtterances.resx">ChitchatUtterances.resx</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="ChitchatUtterances.Designer.cs">ChitchatUtterances.Designer.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="FaqUtterances.resx">FaqUtterances.resx</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="FaqUtterances.Designer.cs">FaqUtterances.Designer.cs</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralUtterances.resx">GeneralUtterances.resx</ProjectItem>
         <ProjectItem ReplaceParameters="true" TargetFileName="GeneralUtterances.Designer.cs">GeneralUtterances.Designer.cs</ProjectItem>
       </Folder>
-      <ProjectItem ReplaceParameters="true" TargetFileName="BotTestBase.cs">VA.Tests\BotTestBase.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="InterruptionTests.cs">VA.Tests\InterruptionTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="LocalizationTests.cs">VA.Tests\LocalizationTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="MainDialogTests.cs">VA.Tests\MainDialogTests.cs</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="OnboardingDialogTests.cs">VA.Tests\OnboardingDialogTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="BotTestBase.cs">BotTestBase.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="InterruptionTests.cs">InterruptionTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="LocalizationTests.cs">LocalizationTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="MainDialogTests.cs">MainDialogTests.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="OnboardingDialogTests.cs">OnboardingDialogTests.cs</ProjectItem>
     </Project>
   </TemplateContent>
 </VSTemplate>
diff --git a/templates/Virtual-Assistant-Template/csharp/Template/VA/VAProjectTemplate.vstemplate b/templates/Virtual-Assistant-Template/csharp/Template/VA/VAProjectTemplate.vstemplate
diff --git a/templates/Virtual-Assistant-Template/csharp/Template/va.vstemplate b/templates/Virtual-Assistant-Template/csharp/Template/va.vstemplate

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public CustomSkillAdapter(`
`37`	`37`	`Use(new TelemetryLoggerMiddleware(telemetryClient, logPersonalInformation: true));`
`38`	`38`	`Use(new SetLocaleMiddleware(settings.DefaultLocale ?? "en-us"));`
`39`	`39`	`Use(new EventDebuggerMiddleware());`
`40`		`- Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof(SkillSample))));`
	`40`	`+ Use(new SkillMiddleware(userState, conversationState, conversationState.CreateProperty<DialogState>(nameof($safeprojectname$))));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`