From 24d680f209a945f2eb492997f29585272ba3eeae Mon Sep 17 00:00:00 2001
From: Peter Innes <peinnes@microsoft.com>
Date: Thu, 13 May 2021 09:24:27 -0700
Subject: [PATCH 1/2] Update static files root directory for .NET Functions to
 wwwroot; bump JS SDK version to 4.13.3-preview.

---
 generators/generator-bot-adaptive/generators/app/index.js     | 2 +-
 .../templates/dotnet/functions/Triggers/StaticFilesTrigger.cs | 2 +-
 .../generators/app/templates/dotnet/functions/botName.csproj  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generators/generator-bot-adaptive/generators/app/index.js b/generators/generator-bot-adaptive/generators/app/index.js
index 81ce539f35..eba350bea8 100644
--- a/generators/generator-bot-adaptive/generators/app/index.js
+++ b/generators/generator-bot-adaptive/generators/app/index.js
@@ -249,7 +249,7 @@ module.exports = class extends BaseGenerator {
   _writeJsPackageJson() {
     const { botName, integration } = this.options;
 
-    const sdkVersion = '~4.13.2-preview';
+    const sdkVersion = '~4.13.3-preview';
 
     const dependencies = {
       [integrations.functions]: {
diff --git a/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/Triggers/StaticFilesTrigger.cs b/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/Triggers/StaticFilesTrigger.cs
index 284ce208f3..495942861d 100644
--- a/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/Triggers/StaticFilesTrigger.cs
+++ b/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/Triggers/StaticFilesTrigger.cs
@@ -10,7 +10,7 @@ namespace <%= botName %>.Triggers
 {
     public class StaticFilesTrigger
     {
-        private const string StaticFilesDirectory = "www";
+        private const string StaticFilesDirectory = "wwwroot";
 
         private readonly FileExtensionContentTypeProvider _provider;
 
diff --git a/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/botName.csproj b/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/botName.csproj
index b6dfdd9b6d..450ab052c9 100644
--- a/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/botName.csproj
+++ b/generators/generator-bot-adaptive/generators/app/templates/dotnet/functions/botName.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="**/*.blu;**/*.dialog;**/*.json;**/*.lg;**/*.lu;**/*.onnx;**/*.qna;**/*.txt"
-             Exclude="$(AppDesignerFolder)/**;$(BaseOutputPath)/**;$(BaseIntermediateOutputPath)/**;www/**;**/function.json">
+             Exclude="$(AppDesignerFolder)/**;$(BaseOutputPath)/**;$(BaseIntermediateOutputPath)/**;wwwroot/**;**/function.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -24,7 +24,7 @@
     <Content Update="local.settings.json">
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </Content>
-    <None Include="www/**/*.*">
+    <None Include="wwwroot/**/*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

From 5265d38905508372b312c1b880ae8e0d2c5c0def Mon Sep 17 00:00:00 2001
From: Peter Innes <peinnes@microsoft.com>
Date: Thu, 13 May 2021 09:59:04 -0700
Subject: [PATCH 2/2] Removing ~ from JS SDK version since it does not apply to
 prerelease versions.

---
 generators/generator-bot-adaptive/generators/app/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/generator-bot-adaptive/generators/app/index.js b/generators/generator-bot-adaptive/generators/app/index.js
index eba350bea8..5da5795a1b 100644
--- a/generators/generator-bot-adaptive/generators/app/index.js
+++ b/generators/generator-bot-adaptive/generators/app/index.js
@@ -249,7 +249,7 @@ module.exports = class extends BaseGenerator {
   _writeJsPackageJson() {
     const { botName, integration } = this.options;
 
-    const sdkVersion = '~4.13.3-preview';
+    const sdkVersion = '4.13.3-preview';
 
     const dependencies = {
       [integrations.functions]: {