Merge pull request #405 from watson-developer-cloud/7749-november-2019-release

.NET Standard SDK 4.1.0

Author: mediumTaj

IBM.Watson.sln

@@ -91,8 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v1.Uni
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.LanguageTranslator.v3.UnitTests", "test\LanguageTranslator.v3.UnitTests\IBM.Watson.LanguageTranslator.v3.UnitTests.csproj", "{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests", "test\NaturalLangaugeUnderstanding.v1.UnitTests\IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests.csproj", "{415AADD4-CC05-4B77-8E57-C1B079421875}"
-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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Assistant.v1.Examples", "examples\IBM.Watson.Assistant.v1.Examples\IBM.Watson.Assistant.v1.Examples.csproj", "{66BE9211-8888-41AC-B521-54C2603F795F}"
@@ -129,6 +127,28 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognitio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v4.Examples", "examples\IBM.Watson.VisualRecognition.v4.Examples\IBM.Watson.VisualRecognition.v4.Examples.csproj", "{EAB0C966-76C7-4457-AAC4-383A298A5EAB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DiscoveryV2", "DiscoveryV2", "{9A62662C-AB8A-4683-B251-B9B8B95B5F49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v2", "src\IBM.Watson.Discovery.v2\IBM.Watson.Discovery.v2.csproj", "{BA689C8D-4763-4569-88BC-5D4BE3EB3021}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v2.IntegrationTests", "test\Discovery.v2.IntegrationTests\IBM.Watson.Discovery.v2.IntegrationTests.csproj", "{3D256EE8-CEB5-4871-983B-A8240571347E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v2.UnitTests", "test\Discovery.v2.UnitTests\IBM.Watson.Discovery.v2.UnitTests.csproj", "{94C03BD6-DC16-4ADA-ABCE-14F3CB8155C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.NaturalLanguageClassifier.v1.UnitTests", "test\NaturalLanguageClassifier.v1.UnitTests\IBM.Watson.NaturalLanguageClassifier.v1.UnitTests.csproj", "{E9D49077-0A18-42BE-80EB-B0BAC73B4953}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.PersonalityInsights.v3.UnitTests", "test\PersonalityInsights.v3.UnitTests\IBM.Watson.PersonalityInsights.v3.UnitTests.csproj", "{D7FA3744-BD2E-4CC5-B545-C3191FE2F9A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.SpeechToText.v1.UnitTests", "test\SpeechToText.v1.UnitTests\IBM.Watson.SpeechToText.v1.UnitTests.csproj", "{087B907E-951F-460B-A4A5-FCE3C5E017C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.TextToSpeech.v1.UnitTests", "test\TextToSpeech.v1.UnitTests\IBM.Watson.TextToSpeech.v1.UnitTests.csproj", "{12108388-6DAD-492F-80BC-080163F4FAAB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v3.UnitTests", "test\VisualRecognition.v3.UnitTests\IBM.Watson.VisualRecognition.v3.UnitTests.csproj", "{6BFCB413-77F6-494D-9381-08CB39D79316}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.Discovery.v2.Examples", "examples\IBM.Watson.Discovery.v2.Examples\IBM.Watson.Discovery.v2.Examples.csproj", "{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests", "test\NaturalLanguageUnderstanding.v1.UnitTests\IBM.Watson.NaturalLanguageUnderstanding.v1.UnitTests.csproj", "{41D9E469-B1B5-415E-9F13-7780F321FD62}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -259,10 +279,6 @@ Global
 		{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57C7F28F-822A-4C52-909A-F9DB6A0CFA51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{415AADD4-CC05-4B77-8E57-C1B079421875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{415AADD4-CC05-4B77-8E57-C1B079421875}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{415AADD4-CC05-4B77-8E57-C1B079421875}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{415AADD4-CC05-4B77-8E57-C1B079421875}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28F5A68C-CF5B-4691-A5E5-9135C99470A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{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
@@ -331,6 +347,46 @@ Global
 		{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA689C8D-4763-4569-88BC-5D4BE3EB3021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA689C8D-4763-4569-88BC-5D4BE3EB3021}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA689C8D-4763-4569-88BC-5D4BE3EB3021}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA689C8D-4763-4569-88BC-5D4BE3EB3021}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D256EE8-CEB5-4871-983B-A8240571347E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D256EE8-CEB5-4871-983B-A8240571347E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D256EE8-CEB5-4871-983B-A8240571347E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D256EE8-CEB5-4871-983B-A8240571347E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94C03BD6-DC16-4ADA-ABCE-14F3CB8155C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94C03BD6-DC16-4ADA-ABCE-14F3CB8155C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94C03BD6-DC16-4ADA-ABCE-14F3CB8155C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94C03BD6-DC16-4ADA-ABCE-14F3CB8155C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9D49077-0A18-42BE-80EB-B0BAC73B4953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9D49077-0A18-42BE-80EB-B0BAC73B4953}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9D49077-0A18-42BE-80EB-B0BAC73B4953}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9D49077-0A18-42BE-80EB-B0BAC73B4953}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7FA3744-BD2E-4CC5-B545-C3191FE2F9A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7FA3744-BD2E-4CC5-B545-C3191FE2F9A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7FA3744-BD2E-4CC5-B545-C3191FE2F9A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7FA3744-BD2E-4CC5-B545-C3191FE2F9A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{087B907E-951F-460B-A4A5-FCE3C5E017C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{087B907E-951F-460B-A4A5-FCE3C5E017C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{087B907E-951F-460B-A4A5-FCE3C5E017C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{087B907E-951F-460B-A4A5-FCE3C5E017C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12108388-6DAD-492F-80BC-080163F4FAAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12108388-6DAD-492F-80BC-080163F4FAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12108388-6DAD-492F-80BC-080163F4FAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12108388-6DAD-492F-80BC-080163F4FAAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BFCB413-77F6-494D-9381-08CB39D79316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BFCB413-77F6-494D-9381-08CB39D79316}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BFCB413-77F6-494D-9381-08CB39D79316}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BFCB413-77F6-494D-9381-08CB39D79316}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2197FF1E-EE63-4CA0-9742-140B49EBC0AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41D9E469-B1B5-415E-9F13-7780F321FD62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41D9E469-B1B5-415E-9F13-7780F321FD62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41D9E469-B1B5-415E-9F13-7780F321FD62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41D9E469-B1B5-415E-9F13-7780F321FD62}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -366,7 +422,6 @@ Global
 		{14E2BB2F-FE6F-43D9-AC5E-727E1E327FE9} = {B368DCF7-FB57-4302-8467-4EB142394A29}
 		{DADD6C25-5ED6-48B9-9A33-397228F392E6} = {BE946662-3884-45E9-A3B1-B28F3081AD1B}
 		{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}
 		{66BE9211-8888-41AC-B521-54C2603F795F} = {E3D238D7-7A09-4447-B836-8D6ABF4BFF80}
 		{D5F8C28F-1295-4510-B3EB-A9B367256B51} = {90E09BF8-A647-43B8-B721-05CAECFADD72}
@@ -384,6 +439,16 @@ Global
 		{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
 		{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
 		{EAB0C966-76C7-4457-AAC4-383A298A5EAB} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
+		{BA689C8D-4763-4569-88BC-5D4BE3EB3021} = {9A62662C-AB8A-4683-B251-B9B8B95B5F49}
+		{3D256EE8-CEB5-4871-983B-A8240571347E} = {9A62662C-AB8A-4683-B251-B9B8B95B5F49}
+		{94C03BD6-DC16-4ADA-ABCE-14F3CB8155C5} = {9A62662C-AB8A-4683-B251-B9B8B95B5F49}
+		{E9D49077-0A18-42BE-80EB-B0BAC73B4953} = {5917402E-D9A2-4308-8A1A-9C0692939420}
+		{D7FA3744-BD2E-4CC5-B545-C3191FE2F9A6} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
+		{087B907E-951F-460B-A4A5-FCE3C5E017C2} = {254924C9-64CD-4902-97C4-5F9E48DCDF7F}
+		{12108388-6DAD-492F-80BC-080163F4FAAB} = {A86D4D5B-AECE-49F2-A2BC-F6897B3EB2E8}
+		{6BFCB413-77F6-494D-9381-08CB39D79316} = {A1BC3262-1837-40D9-A530-DCFE679927C2}
+		{2197FF1E-EE63-4CA0-9742-140B49EBC0AF} = {9A62662C-AB8A-4683-B251-B9B8B95B5F49}
+		{41D9E469-B1B5-415E-9F13-7780F321FD62} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B9D9D17B-1C17-402F-B701-DC671528690A}

README.md

@@ -213,6 +213,9 @@ void Example()
 }
 ```
 
+## Discovery V2
+Discovery v2 is only available on Cloud Pak for Data.
+
 ## Documentation
 Click [here][dotnet-standard-sdk-documentation] for documentation by release and branch.
 

appveyor.yml

@@ -255,6 +255,8 @@ test_script:
 
         dotnet pack .\src\IBM.Watson.Discovery.v1\IBM.Watson.Discovery.v1.csproj --configuration Release
 
+        dotnet pack .\src\IBM.Watson.Discovery.v1\IBM.Watson.Discovery.v2.csproj --configuration Release
+
         dotnet pack .\src\IBM.Watson.LanguageTranslator.v3\IBM.Watson.LanguageTranslator.v3.csproj --configuration Release
 
         dotnet pack .\src\IBM.Watson.NaturalLanguageClassifier.v1\IBM.Watson.NaturalLanguageClassifier.v1.csproj --configuration Release
@@ -285,6 +287,8 @@ artifacts:
   name: IBM.Watson.CompareComply.v1
 - path: '\src\IBM.Watson.Discovery.v1\bin\$(configuration)\*.nupkg'
   name: IBM.Watson.Discovery.v1
+- path: '\src\IBM.Watson.Discovery.v2\bin\$(configuration)\*.nupkg'
+  name: IBM.Watson.Discovery.v2
 - path: '\src\IBM.Watson.LanguageTranslator.v3\bin\$(configuration)\*.nupkg'
   name: IBM.Watson.LanguageTranslator.v3
 - path: '\src\IBM.Watson.PersonalityInsights.v3\bin\$(configuration)\*.nupkg'

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

examples/IBM.Watson.Discovery.v2.Examples/IBM.Watson.Discovery.v2.Examples.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.1" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\IBM.Watson.Discovery.v2\IBM.Watson.Discovery.v2.csproj" />
+  </ItemGroup>
+
+</Project>