From 8fd865f94fe279bae412abd31877109b3ba3a3e0 Mon Sep 17 00:00:00 2001 From: Siddharth More Date: Wed, 1 Jul 2020 09:35:59 -0700 Subject: [PATCH 1/3] Fix Nuget build error --- sdk/csharp/Directory.Build.props | 10 ++++++++-- .../microsoft.bot.solutions/images/icon.png | Bin 0 -> 8605 bytes 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 sdk/csharp/libraries/microsoft.bot.solutions/images/icon.png diff --git a/sdk/csharp/Directory.Build.props b/sdk/csharp/Directory.Build.props index 6999d817ad..37f6b45db8 100644 --- a/sdk/csharp/Directory.Build.props +++ b/sdk/csharp/Directory.Build.props @@ -36,12 +36,18 @@ full true + + + icon.png + + + + https://github.com/Microsoft/botframework-solutions - https://raw.githubusercontent.com/microsoft/botframework-sdk/master/icon.png - + https://raw.githubusercontent.com/microsoft/botframework-solutions/master/LICENSE true https://github.com/Microsoft/botframework-solutions diff --git a/sdk/csharp/libraries/microsoft.bot.solutions/images/icon.png b/sdk/csharp/libraries/microsoft.bot.solutions/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ace66f9b5af2cc512c53ad88c334fbb5aa2e6279 GIT binary patch literal 8605 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 X{q~XnVuAl#a9Nnzn0z$8{pkMyTep3k literal 0 HcmV?d00001 From 94ce3fa8fa6d0604506e85ca036f49fad780de6b Mon Sep 17 00:00:00 2001 From: smore Date: Wed, 1 Jul 2020 09:55:01 -0700 Subject: [PATCH 2/3] Fix Test build error (#3500) --- .../Microsoft.Bot.Solutions.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj b/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj index 857660a259..db42c6f234 100644 --- a/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj +++ b/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj @@ -2,6 +2,7 @@ netcoreapp2.2 + false false From d22074df89ef9b5ca1b278457cce88a82ee64a72 Mon Sep 17 00:00:00 2001 From: Siddharth More Date: Tue, 7 Jul 2020 15:23:36 -0700 Subject: [PATCH 3/3] Fix comment from Tai --- .../Microsoft.Bot.Solutions.Tests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj b/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj index db42c6f234..857660a259 100644 --- a/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj +++ b/sdk/csharp/tests/microsoft.bot.solutions.tests/Microsoft.Bot.Solutions.Tests.csproj @@ -2,7 +2,6 @@ netcoreapp2.2 - false false