From 8e265e9ee42f72d352d0de3f0c26794742def5ea Mon Sep 17 00:00:00 2001
From: Dong Lei <donglei@microsoft.com>
Date: Thu, 25 Mar 2021 03:21:27 +0000
Subject: [PATCH 1/5] fix: Update azure-pipelines.yml to use SDK instead of
 runtime

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7b63afa632..efc97b3d7c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -72,7 +72,7 @@ jobs:
       - task: UseDotNet@2
         inputs:
           version: "3.1.x"
-          packageType: runtime
+          packageType: sdk
       - task: DotNetCoreCLI@2
         displayName: "dotnet build"
         inputs:

From f4fe57b6fcfd88f42827f021b939c93dd48809b8 Mon Sep 17 00:00:00 2001
From: Dong Lei <donglei@microsoft.com>
Date: Thu, 25 Mar 2021 03:48:01 +0000
Subject: [PATCH 2/5] Update Microsoft.BotFramework.Composer.Core.csproj

---
 runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
index 8b58c56f94..ca964efc0c 100644
--- a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
+++ b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

From 522bb3b1884cad4e0582b92408a343c72510c0f9 Mon Sep 17 00:00:00 2001
From: Dong Lei <donglei@microsoft.com>
Date: Thu, 25 Mar 2021 04:14:31 +0000
Subject: [PATCH 3/5] Update Microsoft.BotFramework.Composer.Functions.csproj

---
 .../Microsoft.BotFramework.Composer.Functions.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
index c7eb0ca292..1833517fb2 100644
--- a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
+++ b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
     <UserSecretsId>2eb1c70c-5cd2-4c08-8aab-df989c347067</UserSecretsId>
   </PropertyGroup>

From d8819685fd9e8a09910ec91ac56075a156b224ac Mon Sep 17 00:00:00 2001
From: Dong Lei <donglei@microsoft.com>
Date: Thu, 25 Mar 2021 04:33:37 +0000
Subject: [PATCH 4/5] update system.Encodings.web

---
 .../Microsoft.BotFramework.Composer.Functions.csproj             | 1 +
 runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
index 1833517fb2..e10caadff5 100644
--- a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
+++ b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
@@ -12,6 +12,7 @@
     <CodeAnalysisRuleSet>..\core\Microsoft.BotFramework.Composer.Core.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.12.2"/>
     <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2"/>
diff --git a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
index ca964efc0c..2938d435a6 100644
--- a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
+++ b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
@@ -13,6 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.12.2"/>
     <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2"/>
     <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.2"/>

From 39f57cd0867eb4550a4bc43b96e02816d12b10d8 Mon Sep 17 00:00:00 2001
From: Dong Lei <donglei@microsoft.com>
Date: Thu, 25 Mar 2021 04:40:50 +0000
Subject: [PATCH 5/5] Update Microsoft.BotFramework.Composer.Functions.csproj

---
 .../Microsoft.BotFramework.Composer.Functions.csproj             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
index e10caadff5..1833517fb2 100644
--- a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
+++ b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
@@ -12,7 +12,6 @@
     <CodeAnalysisRuleSet>..\core\Microsoft.BotFramework.Composer.Core.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.12.2"/>
     <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2"/>