Merge pull request #95 from watson-developer-cloud/development

Release 0.2.0

Author: mediumTaj

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+config
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -137,7 +138,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj

CHANGELOG.md

@@ -0,0 +1,23 @@
+Change Log
+==========
+## Version 0.2.0
+_2017-04-25_
+
+* New: Abstracted `Visual Recognition` service.
+* New: Completed `Speech to Text` abstraction.
+* New: Completed `Conversation` abstraction.
+* New: Integration and Unit tests.
+* New: Example service calls.
+* Fix: Enabled fail build on failed test in AppVeyor.
+* Fix: Fixed all integration and unit tests.
+
+## Version 0.1.0-alpha
+_2017-02-12_
+
+Initial alpha release of .NET Standard SDK. Service supported include:
+* Conversation
+* Speech to Text
+* Text to Speech
+* Language Translator
+* Personality Insights
+* Tone Analyzer

IBM.WatsonDeveloperCloud.sln

@@ -92,6 +92,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Pe
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.Conversation.Example", "examples\IBM.WatsonDeveloperCloud.Conversation.Example\IBM.WatsonDeveloperCloud.Conversation.Example.xproj", "{FE6E9777-A5FC-4842-98EC-159CB3471D08}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IBM.WatsonDeveloperCloud.VisualRecognition.Example", "examples\IBM.WatsonDeveloperCloud.VisualRecognition.Example\IBM.WatsonDeveloperCloud.VisualRecognition.Example.xproj", "{8F6C1BE5-D4C6-428F-B196-610297951444}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -222,6 +224,10 @@ Global
 		{FE6E9777-A5FC-4842-98EC-159CB3471D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE6E9777-A5FC-4842-98EC-159CB3471D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE6E9777-A5FC-4842-98EC-159CB3471D08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F6C1BE5-D4C6-428F-B196-610297951444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F6C1BE5-D4C6-428F-B196-610297951444}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F6C1BE5-D4C6-428F-B196-610297951444}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F6C1BE5-D4C6-428F-B196-610297951444}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -268,5 +274,6 @@ Global
 		{B46F9958-1284-4EBD-A5B3-C4EE6ED14D8D} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
 		{2A13BC39-4315-4501-AB8E-68F6E7F97EAB} = {D65AC99F-4E63-4362-8765-EB6F15838CA0}
 		{FE6E9777-A5FC-4842-98EC-159CB3471D08} = {8B927AB2-21F8-40DE-BE6B-5B1105453133}
+		{8F6C1BE5-D4C6-428F-B196-610297951444} = {A1BC3262-1837-40D9-A530-DCFE679927C2}
 	EndGlobalSection
 EndGlobal

README.md

@@ -26,11 +26,11 @@ You can get the latest SDK packages through NuGet. Installation instructions can
 * [Speech to Text](/src/IBM.WatsonDeveloperCloud.SpeechToText)
 * [Text to Speech](/src/IBM.WatsonDeveloperCloud.TextToSpeech)
 * [Conversation](/src/IBM.WatsonDeveloperCloud.Conversation)
-<!-- * [Discovery](/src/IBM.WatsonDeveloperCloud.Discovery) -->
-<!-- * [Visual Recognition](/src/IBM.WatsonDeveloperCloud.VisualRecognition) -->
+* [Visual Recognition](/src/IBM.WatsonDeveloperCloud.VisualRecognition)
 * [Language Translator](/src/IBM.WatsonDeveloperCloud.LanguageTranslator)
 * [Tone Analyzer](/src/IBM.WatsonDeveloperCloud.ToneAnalyzer)
 * [Personality Insights](/src/IBM.WatsonDeveloperCloud.PersonalityInsights)
+<!-- * [Discovery](/src/IBM.WatsonDeveloperCloud.Discovery) -->
 
 Or manually [here][latest_release].
 
@@ -55,7 +55,7 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).<TODO revise coding standard>
 [wdc]: http://www.ibm.com/watson/developercloud/
 [bluemix_registration]: http://bluemix.net/registration
 [ibm-github]: http://ibm.github.io/
-<TODO latest release url>
+
 [latest_release]: https://github.com/watson-developer-cloud/dotnet-standard-sdk/releases/latest
 [dw-answers]: https://developer.ibm.com/answers/questions/ask/?topics=watson
 [stack-overflow]: http://stackoverflow.com/questions/ask?tags=ibm-watson

appveyor.yml

@@ -4,11 +4,15 @@ branches:
   - gh-pages
 configuration: Release
 platform: Any CPU
+clone_folder: C:\projects\dotnet-standard-sdk
 environment:
   COVERALLS_REPO_TOKEN:
     secure: Dnsrk2n+VNE4swcbTLXpfnHwUwTWT8TqMiMkthU6mq/ohNq9dA2rrSA6kdLDBKME
   GH_TOKEN:
     secure: J0LjUlYl+lGJMLBcOgVF1m1I07nyr+8yFOMaNBA23RGLMJKvYnRlhmGWXp07ejgu
+  CRED_SECRET:
+    secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8=
+  VCAP_SERVICES: C:\projects\dotnet-standard-sdk\config
 install:
 - cmd: >-
     rm -rf packages
@@ -22,6 +26,11 @@ install:
     nuget install -Verbosity quiet -OutputDirectory packages -Version 0.7.0 coveralls.net
 
     nuget install -Verbosity quiet -OutputDirectory packages -Version 1.8.13 Doxygen
+
+    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:
@@ -73,15 +82,20 @@ after_build:
     {
         Write-Output "branchName is $branchName. Not generating documentation."
     }
+
+
+    Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.VisualRecognition.IntegrationTests\exampleData C:\projects\dotnet-standard-sdk
+
+    Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.IntegrationTests\Assets C:\projects\dotnet-standard-sdk
 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(\"VisualRecognition\") -and !$folder.Name.Contains(\"Discovery\"))\n  {\n    dotnet test $folder.FullName\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}\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}"
+- 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(\"Discovery\") -and !$folder.Name.Contains(\"TextToSpeech\") -and !$folder.Name.Contains(\"PersonalityInsights\"))\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:
 - path: '\src\IBM.WatsonDeveloperCloud\bin\$(configuration)\*.nupkg'
   name: IBM.WatsonDeveloperCloud
 - path: '\src\IBM.WatsonDeveloperCloud.Conversation\bin\$(configuration)\*.nupkg'
   name: IBM.WatsonDeveloperCloud.Conversation
 - path: '\src\IBM.WatsonDeveloperCloud.LanguageTranslator\bin\$(configuration)\*.nupkg'
-  name: IBM.WatsonDeveloperCloud.LanguageTranslation
+  name: IBM.WatsonDeveloperCloud.LanguageTranslator
 - path: '\src\IBM.WatsonDeveloperCloud.PersonalityInsights\bin\$(configuration)\*.nupkg'
   name: IBM.WatsonDeveloperCloud.PersonalityInsights
 - path: '\src\IBM.WatsonDeveloperCloud.SpeechToText\bin\$(configuration)\*.nupkg'
@@ -90,9 +104,12 @@ artifacts:
   name: IBM.WatsonDeveloperCloud.TextToSpeech
 - path: '\src\IBM.WatsonDeveloperCloud.ToneAnalyzer\bin\$(configuration)\*.nupkg'
   name: IBM.WatsonDeveloperCloud.ToneAnalyzer
+- path: '\src\IBM.WatsonDeveloperCloud.VisualRecognition\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.VisualRecognition
 deploy:
 - provider: NuGet
   api_key:
     secure: AaqUbQ5mJm8bYbpNH7GbAzYl45fZZHpqeNdtSd0wQNxjgYmLmvtMU5eByA/mkhxB
   on:
     branch: release
+    APPVEYOR_REPO_TAG: true

config.enc

@@ -40,10 +40,7 @@ private void Message()
         {
             MessageRequest messageRequest = new MessageRequest()
             {
-                Input = new InputData()
-                {
-                    Text = _inputString
-                }
+                Input = new { Text = _inputString }
             };
 
             Console.WriteLine(string.Format("Calling Message(\"{0}\")...", _inputString));

examples/IBM.WatsonDeveloperCloud.Conversation.Example/ConversationServiceExample.cs

@@ -1,8 +1,8 @@
 {
-  "version": "0.1.1-alpha",
+  "version": "0.2.0",
   "dependencies": {
-    "IBM.WatsonDeveloperCloud": "0.1.1-alpha",
-    "IBM.WatsonDeveloperCloud.Conversation": "0.1.1-alpha",
+    "IBM.WatsonDeveloperCloud": "0.2.0",
+    "IBM.WatsonDeveloperCloud.Conversation": "0.2.0",
     "Microsoft.AspNet.WebApi.Client": "5.2.3",
     "Microsoft.NETCore.App": {
       "type": "platform",

examples/IBM.WatsonDeveloperCloud.Conversation.Example/project.json

@@ -1,8 +1,8 @@
 {
-  "version": "0.1.1-alpha",
+  "version": "0.2.0",
   "dependencies": {
-    "IBM.WatsonDeveloperCloud": "0.1.1-alpha",
-    "IBM.WatsonDeveloperCloud.LanguageTranslator": "0.1.1-alpha",
+    "IBM.WatsonDeveloperCloud": "0.2.0",
+    "IBM.WatsonDeveloperCloud.LanguageTranslator": "0.2.0",
     "Microsoft.AspNet.WebApi.Client": "5.2.3",
     "Microsoft.NETCore.App": {
       "type": "platform",

examples/IBM.WatsonDeveloperCloud.LanguageTranslator.Example/project.json

@@ -1,8 +1,8 @@
 {
-  "version": "0.1.1-alpha",
+  "version": "0.2.0",
   "dependencies": {
-    "IBM.WatsonDeveloperCloud": "0.1.1-alpha",
-    "IBM.WatsonDeveloperCloud.PersonalityInsights": "0.1.1-alpha",
+    "IBM.WatsonDeveloperCloud": "0.2.0",
+    "IBM.WatsonDeveloperCloud.PersonalityInsights": "0.2.0",
     "Microsoft.AspNet.WebApi.Client": "5.2.3",
     "Microsoft.NETCore.App": {
       "type": "platform",