diff --git a/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj b/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
index 83846dc3c..c8e2304bf 100644
--- a/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
+++ b/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
@@ -14,14 +14,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/samples/csharp/skill/SkillSample/SkillSample.csproj b/samples/csharp/skill/SkillSample/SkillSample.csproj
index ffb7866ee..05d442a83 100644
--- a/samples/csharp/skill/SkillSample/SkillSample.csproj
+++ b/samples/csharp/skill/SkillSample/SkillSample.csproj
@@ -9,12 +9,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/sdk/csharp/libraries/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj b/sdk/csharp/libraries/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj
index 9339a5331..3aa77271e 100644
--- a/sdk/csharp/libraries/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj
+++ b/sdk/csharp/libraries/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj
@@ -42,15 +42,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/sdk/csharp/tests/microsoft.bot.solutions.tests/Skills/SkillConversationIdFactoryTests.cs b/sdk/csharp/tests/microsoft.bot.solutions.tests/Skills/SkillConversationIdFactoryTests.cs
index 50d81ab82..2e3f76e86 100644
--- a/sdk/csharp/tests/microsoft.bot.solutions.tests/Skills/SkillConversationIdFactoryTests.cs
+++ b/sdk/csharp/tests/microsoft.bot.solutions.tests/Skills/SkillConversationIdFactoryTests.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Bot.Solutions.Tests.Skills
public void SkillConversationIdFactoryNullStorageTest()
{
var ex = Assert.ThrowsException(() => new SkillConversationIdFactory(null));
- Assert.IsTrue(ex.Message.Contains("Value cannot be null.\r\nParameter name: storage"));
+ Assert.IsTrue(ex.Message.Contains("Value cannot be null. (Parameter 'storage')"));
}
[TestMethod]
diff --git a/sdk/csharp/tests/microsoft.bot.solutions.tests/TaskExtensionTests/BackgroundWorkerTests.cs b/sdk/csharp/tests/microsoft.bot.solutions.tests/TaskExtensionTests/BackgroundWorkerTests.cs
index 2daa497c4..62896b519 100644
--- a/sdk/csharp/tests/microsoft.bot.solutions.tests/TaskExtensionTests/BackgroundWorkerTests.cs
+++ b/sdk/csharp/tests/microsoft.bot.solutions.tests/TaskExtensionTests/BackgroundWorkerTests.cs
@@ -2,15 +2,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;
-using System.Xml.Linq;
-using Microsoft.Bot.Builder;
-using Microsoft.Bot.Builder.Adapters;
-using Microsoft.Bot.Schema;
-using Microsoft.Bot.Solutions.Feedback;
-using Microsoft.Bot.Solutions.Middleware;
-using Microsoft.Bot.Solutions.Proactive;
using Microsoft.Bot.Solutions.TaskExtensions;
-using Microsoft.Bot.Solutions.Util;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/sdk/csharp/tests/microsoft.bot.solutions.tests/Util/UtilTests.cs b/sdk/csharp/tests/microsoft.bot.solutions.tests/Util/UtilTests.cs
index cb7f2b10e..c2c0029be 100644
--- a/sdk/csharp/tests/microsoft.bot.solutions.tests/Util/UtilTests.cs
+++ b/sdk/csharp/tests/microsoft.bot.solutions.tests/Util/UtilTests.cs
@@ -1,13 +1,4 @@
using System.Diagnostics.CodeAnalysis;
-using System.Security.Policy;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using Microsoft.Bot.Builder;
-using Microsoft.Bot.Builder.Adapters;
-using Microsoft.Bot.Schema;
-using Microsoft.Bot.Solutions.Feedback;
-using Microsoft.Bot.Solutions.Middleware;
-using Microsoft.Bot.Solutions.Proactive;
using Microsoft.Bot.Solutions.Util;
using Microsoft.VisualStudio.TestTools.UnitTesting;