chore: Merge in master to resolve merge conflicts

Author: mediumTaj

IBM.Watson.sln

@@ -95,6 +95,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.NaturalLanguageU
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.ToneAnalyzer.v3.UnitTests", "test\ToneAnalyzer.v3.UnitTests\IBM.Watson.ToneAnalyzer.v3.UnitTests.csproj", "{28F5A68C-CF5B-4691-A5E5-9135C99470A0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBM.Watson.Assistant.v2.Examples", "examples\IBM.Watson.Assistant.v2.Examples\IBM.Watson.Assistant.v2.Examples.csproj", "{4CFF70FE-F96E-46EE-B7FC-E06AEE4EE2AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Assistant.v1.Examples", "examples\IBM.Watson.Assistant.v1.Examples\IBM.Watson.Assistant.v1.Examples.csproj", "{AE7F758A-A6FA-49E7-AD3C-52B784BEBA3F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBM.Watson.CompareComply.v1.Examples", "examples\IBM.Watson.CompareComply.v1.Examples\IBM.Watson.CompareComply.v1.Examples.csproj", "{58A819F6-2F99-4A79-95ED-2DED2F9D5DB4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBM.Watson.Discovery.v1.Examples", "examples\IBM.Watson.Discovery.v1.Examples\IBM.Watson.Discovery.v1.Examples.csproj", "{D3FBC964-AF1B-4416-9FE8-8F0A511908D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBM.Watson.LanguageTranslator.v3.Examples", "examples\IBM.Watson.LanguageTranslator.v3.Examples\IBM.Watson.LanguageTranslator.v3.Examples.csproj", "{03B2FA0D-14C8-485C-8EE8-16715871E813}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBM.Watson.NaturalLangaugeClassifier.v1.Examples", "examples\IBM.Watson.NaturalLangaugeClassifier.v1.Examples\IBM.Watson.NaturalLangaugeClassifier.v1.Examples.csproj", "{B74E72B5-E2C9-43EE-88D2-34315AF3AD33}"
 EndProject
 Global
@@ -235,6 +245,26 @@ Global
 		{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CFF70FE-F96E-46EE-B7FC-E06AEE4EE2AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CFF70FE-F96E-46EE-B7FC-E06AEE4EE2AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CFF70FE-F96E-46EE-B7FC-E06AEE4EE2AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CFF70FE-F96E-46EE-B7FC-E06AEE4EE2AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE7F758A-A6FA-49E7-AD3C-52B784BEBA3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE7F758A-A6FA-49E7-AD3C-52B784BEBA3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE7F758A-A6FA-49E7-AD3C-52B784BEBA3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE7F758A-A6FA-49E7-AD3C-52B784BEBA3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58A819F6-2F99-4A79-95ED-2DED2F9D5DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58A819F6-2F99-4A79-95ED-2DED2F9D5DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58A819F6-2F99-4A79-95ED-2DED2F9D5DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58A819F6-2F99-4A79-95ED-2DED2F9D5DB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3FBC964-AF1B-4416-9FE8-8F0A511908D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3FBC964-AF1B-4416-9FE8-8F0A511908D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3FBC964-AF1B-4416-9FE8-8F0A511908D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3FBC964-AF1B-4416-9FE8-8F0A511908D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03B2FA0D-14C8-485C-8EE8-16715871E813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03B2FA0D-14C8-485C-8EE8-16715871E813}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03B2FA0D-14C8-485C-8EE8-16715871E813}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03B2FA0D-14C8-485C-8EE8-16715871E813}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B74E72B5-E2C9-43EE-88D2-34315AF3AD33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B74E72B5-E2C9-43EE-88D2-34315AF3AD33}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B74E72B5-E2C9-43EE-88D2-34315AF3AD33}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -276,6 +306,11 @@ Global
 		{57C7F28F-822A-4C52-909A-F9DB6A0CFA51} = {65D78D49-E54F-4952-A1D4-7C8D0EDAA1B3}
 		{415AADD4-CC05-4B77-8E57-C1B079421875} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
 		{28F5A68C-CF5B-4691-A5E5-9135C99470A0} = {C7873F44-7188-49BE-84C5-532BE4E07147}
+		{4CFF70FE-F96E-46EE-B7FC-E06AEE4EE2AC} = {90E09BF8-A647-43B8-B721-05CAECFADD72}
+		{AE7F758A-A6FA-49E7-AD3C-52B784BEBA3F} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
+		{58A819F6-2F99-4A79-95ED-2DED2F9D5DB4} = {B368DCF7-FB57-4302-8467-4EB142394A29}
+		{D3FBC964-AF1B-4416-9FE8-8F0A511908D5} = {BE946662-3884-45E9-A3B1-B28F3081AD1B}
+		{03B2FA0D-14C8-485C-8EE8-16715871E813} = {65D78D49-E54F-4952-A1D4-7C8D0EDAA1B3}
 		{B74E72B5-E2C9-43EE-88D2-34315AF3AD33} = {5917402E-D9A2-4308-8A1A-9C0692939420}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

examples/IBM.Watson.Assistant.v1.Examples/IBM.Watson.Assistant.v1.Examples.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\IBM.Watson.Assistant.v1\IBM.Watson.Assistant.v1.csproj" />
+  </ItemGroup>
+
+</Project>