From bed6de41e367135c3fdfccf76e297e99e0abc127 Mon Sep 17 00:00:00 2001
From: Peter Innes <peinnes@microsoft.com>
Date: Mon, 3 May 2021 12:48:08 -0700
Subject: [PATCH 1/3] Updating .NET Functions .csproj template to include all
 *.json files (except in www directory) as content; local.settings.json
 continues to not be included in publish output; fix www item include to use
 POSIX-style path separators; add _FunctionsSkipCleanOutput to PropertyGroup.

---
 .../app/templates/dotnet/functions/botName.csproj  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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 479d6592a4..3d9242e6b7 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
@@ -2,9 +2,10 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
+    <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="**/*.blu;**/*.dialog;**/*.lg;**/*.lu;**/*.onnx;**/*.qna;**/*.txt" Exclude="$(BaseOutputPath)/**;$(BaseIntermediateOutputPath)/**;wwwroot/**">
+    <Content Include="**/*.blu;**/*.dialog;**/*.json;**/*.lg;**/*.lu;**/*.onnx;**/*.qna;**/*.txt" Exclude="$(BaseOutputPath)/**;$(BaseIntermediateOutputPath)/**;www/**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -19,17 +20,10 @@
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.7" /><%- packageReferences %>
   </ItemGroup>
   <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Update="local.settings.json">
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </None>
-    <None Include="<%- settingsIncludePath %>appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="www\**\*.*">
+    <None Include="www/**/*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

From 471368c21f9737d518490502bf572375bd2d99aa Mon Sep 17 00:00:00 2001
From: Peter Innes <peinnes@microsoft.com>
Date: Tue, 4 May 2021 11:15:46 -0700
Subject: [PATCH 2/3] Updating .NET Functions default content includes and
 excludes.

---
 .../generators/app/templates/dotnet/functions/botName.csproj   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 3d9242e6b7..fdecab2ad2 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
@@ -5,7 +5,8 @@
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="**/*.blu;**/*.dialog;**/*.json;**/*.lg;**/*.lu;**/*.onnx;**/*.qna;**/*.txt" Exclude="$(BaseOutputPath)/**;$(BaseIntermediateOutputPath)/**;www/**">
+    <Content Include="**/*.blu;**/*.dialog;**/*.json;**/*.lg;**/*.lu;**/*.onnx;**/*.qna;**/*.txt"
+             Exclude="$(AppDesignerFolder)/**;$(BaseOutputPath)/**;$(BaseIntermediateOutputPath)/**;www/**;**/function.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

From 418b8481c127a64713c4381fce05cf926e202e8b Mon Sep 17 00:00:00 2001
From: Peter Innes <peinnes@microsoft.com>
Date: Tue, 4 May 2021 11:29:00 -0700
Subject: [PATCH 3/3] Fixing closing tag for local.settings.json Content
 element in .NET Functions .csproj template.

---
 .../generators/app/templates/dotnet/functions/botName.csproj    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fdecab2ad2..b6dfdd9b6d 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
@@ -23,7 +23,7 @@
   <ItemGroup>
     <Content Update="local.settings.json">
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
+    </Content>
     <None Include="www/**/*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>