Merge pull request watson-developer-cloud#168 from watson-developer-cloud/rc-1.3.0

Watson Developer Cloud .NET SDK 1.3.0

Author: mediumTaj

.gitignore

@@ -11,6 +11,7 @@ packages/
 coverage/
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
+.nuget
 
 # Build results
 [Dd]ebug/

CHANGELOG.md

@@ -1,5 +1,11 @@
 Change Log
 ==========
+## Version 1.3.0
+_2018-01-07_
+* New: Generate Language Translator service.
+* Fix: Update Visual Recognition service to reflect API changes.
+* New: Use credential service for testing credentials.
+
 ## Version 1.2.0
 _2017-07-18_
 * Fix: Update input and context in MessageRequest and MessageResponse for `Conversation` to be dynamic.

IBM.WatsonDeveloperCloud.sln

@@ -82,8 +82,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Pe
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.Example", "examples\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.Example\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.Example.xproj", "{40ADCBF1-2FC1-4ACC-8DA0-2DB0174B7E03}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests", "test\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests.xproj", "{F4448D3D-913D-4FE0-85F6-60F04EB7C134}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests", "test\IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests\IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests.xproj", "{7DA05E71-3503-4982-AAB6-26C9B76BDD5F}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.IntTests", "test\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.IntTests\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.IntTests.xproj", "{A6BC7470-79A2-4C7E-923A-748540791D97}"
@@ -106,6 +104,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Di
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Discovery.v1.Example", "examples\IBM.WatsonDeveloperCloud.Discovery.v1.Example\IBM.WatsonDeveloperCloud.Discovery.v1.Example.xproj", "{F15ADA39-381E-4E5F-8E18-E08B51635016}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests", "test\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests.xproj", "{F4448D3D-913D-4FE0-85F6-60F04EB7C134}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -212,10 +212,6 @@ Global
 		{40ADCBF1-2FC1-4ACC-8DA0-2DB0174B7E03}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40ADCBF1-2FC1-4ACC-8DA0-2DB0174B7E03}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40ADCBF1-2FC1-4ACC-8DA0-2DB0174B7E03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7DA05E71-3503-4982-AAB6-26C9B76BDD5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DA05E71-3503-4982-AAB6-26C9B76BDD5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DA05E71-3503-4982-AAB6-26C9B76BDD5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -260,6 +256,10 @@ Global
 		{F15ADA39-381E-4E5F-8E18-E08B51635016}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F15ADA39-381E-4E5F-8E18-E08B51635016}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F15ADA39-381E-4E5F-8E18-E08B51635016}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4448D3D-913D-4FE0-85F6-60F04EB7C134}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -301,7 +301,6 @@ Global
 		{9F05DE48-0665-4691-8687-AE428A19B09A} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
 		{80915AD4-F490-4CCB-A0E2-83CF18A8D510} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
 		{40ADCBF1-2FC1-4ACC-8DA0-2DB0174B7E03} = {C7873F44-7188-49BE-84C5-532BE4E07147}
-		{F4448D3D-913D-4FE0-85F6-60F04EB7C134} = {8B927AB2-21F8-40DE-BE6B-5B1105453133}
 		{7DA05E71-3503-4982-AAB6-26C9B76BDD5F} = {8B927AB2-21F8-40DE-BE6B-5B1105453133}
 		{A6BC7470-79A2-4C7E-923A-748540791D97} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
 		{B401A97F-FD61-4CC9-9392-26324A8E5461} = {89D715BF-7464-45FB-8DA0-9D7B46AB8C7F}
@@ -313,5 +312,6 @@ Global
 		{0248BA8F-0351-4F9C-ACB3-7D9FE42A4CB1} = {BE946662-3884-45E9-A3B1-B28F3081AD1B}
 		{4302B718-98DA-4922-84D6-6839495F4B71} = {BE946662-3884-45E9-A3B1-B28F3081AD1B}
 		{F15ADA39-381E-4E5F-8E18-E08B51635016} = {BE946662-3884-45E9-A3B1-B28F3081AD1B}
+		{F4448D3D-913D-4FE0-85F6-60F04EB7C134} = {8B927AB2-21F8-40DE-BE6B-5B1105453133}
 	EndGlobalSection
 EndGlobal

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.2.{build}
+version: 1.3.{build}
 branches:
   except:
   - gh-pages
@@ -12,9 +12,12 @@ environment:
     secure: J0LjUlYl+lGJMLBcOgVF1m1I07nyr+8yFOMaNBA23RGLMJKvYnRlhmGWXp07ejgu
   CRED_SECRET:
     secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8=
-  VCAP_SERVICES: C:\projects\dotnet-standard-sdk\config
-init:
-- ps: '[System.IO.File]::AppendAllText("C:\Windows\System32\drivers\etc\hosts", "`n93.184.221.200  api.nuget.org")'
+  VCAP_URL:
+    secure: z68QwNPZhdBxLtcf9lx5CrAIJe2AstVlaygEV2vBjfNWpSDTssdX+U5edJZjhk2mZ1u71BOlKd/aOL0yuVn3Ew==
+  VCAP_USERNAME:
+    secure: xRHH3z2B+DfQKsmd9CWOhA==
+  VCAP_PASSWORD:
+    secure: 3YoxDjzz7qMIbDqokgsB1A==
 install:
 - cmd: >-
     rm -rf packages
@@ -33,8 +36,6 @@ install:
 
     nuget install -Verbosity quiet -OutputDirectory packages secure-file -ExcludeVersion
 
-
-    if "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" packages\secure-file\tools\secure-file -decrypt config.enc -secret %CRED_SECRET%
 before_build:
 - ps: dotnet restore
 build:
@@ -95,6 +96,8 @@ after_build:
     Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData
 
     Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
+
+    Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\glossary.tmx C:\projects\dotnet-standard-sdk\glossary.tmx
 test_script:
 - ps: "if((Test-Path -Path coverage))\n{\n  rm coverage -r -force\n}\nNew-Item -path . -name coverage -itemtype directory\nForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory)) { \n  if(!$folder.Name.Contains(\"TextToSpeech\"))\n  {\n    if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)\n    {\n      Write-Output \"No pull request number. Executing tests\"\n      dotnet test $folder.FullName\n      if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode )  }\n      echo \"Test passed: $?\"\n      echo \"LastExitCode: $LastExitCode\"\n      $openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'    \n      $targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'\n      $filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'\n      & $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'\n    }\n    else\n    {\n        Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping tests.\"\n    }\n  }\n}\n\nC:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error\n\nif($env:COVERALLS_REPO_TOKEN)\n{\n  C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths\n}\nelse\n{\n  Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"\n}"
 artifacts:

config.enc

@@ -29,9 +29,11 @@ public class ConversationContextExample
         private int _questionIndex = 0;
         private dynamic _questionContext = null;
 
-        public ConversationContextExample(string username, string password, string workspaceId)
+        public ConversationContextExample(string url, string username, string password, string workspaceId)
         {
-            _conversation = new ConversationService(username, password, ConversationService.CONVERSATION_VERSION_DATE_2017_05_26);
+            _conversation = new ConversationService(username, password, ConversationService.CONVERSATION_VERSION_DATE_2017_05_26);
+            _conversation.Endpoint = url;
+
             _workspaceID = workspaceId;
 
             CallConversation(_questionIndex);
@@ -44,12 +46,15 @@ public void CallConversation(int questionIndex)
                 Input = new InputData()
                 {
                     Text = _questionArray[questionIndex]
-                }
+                },
+                AlternateIntents = true
             };
 
             if(_questionContext != null)
             {
-                messageRequest.Context = _questionContext;
+                messageRequest.Context = new Context();
+                messageRequest.Context.ConversationId = _questionContext.conversation_id;
+                messageRequest.Context.System = _questionContext.system;
             }
 
             var result = _conversation.Message(_workspaceID, messageRequest);