Merge pull request #112 from watson-developer-cloud/rc-1.0.0

.NET Standard SDK v1.0.0

Author: mediumTaj

.gitignore

@@ -7,7 +7,8 @@
 *.userosscache
 *.sln.docstates
 config
-
+packages/
+coverage/
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
@@ -236,4 +237,4 @@ _Pvt_Extensions
 # FAKE - F# Make
 .fake/
 /src/IBM.WatsonDeveloperCloud.LanguageTranslator.Test/appsettings.json
-/test/IBM.WatsonDeveloperCloud.LanguageTranslator.IntegrationTests/appsettings.json
+/test/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests/appsettings.json

CHANGELOG.md

@@ -1,5 +1,11 @@
 Change Log
 ==========
+## Version 1.0.0
+_2017-06_19_
+* Breaking Change: Refactor SDK to integrate generated services including adding service version to the package namespace.
+* New: Generate services for `Personality Insights`, `Tone Analyzer`, `Conversation`, `Natural Language Understanding` and `Discovery` via Swagger Codegen.
+* Integration and unit test for all generated services.
+
 ## Version 0.2.0
 _2017-04-25_
 

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Watson Developer Cloud .NET Standard SDK"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.1.0
+PROJECT_NUMBER         = 1.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

IBM.WatsonDeveloperCloud.sln

@@ -23,14 +23,15 @@ Ensure you have the following prerequisites:
 ## Installing the Watson .NET Standard SDK
 You can get the latest SDK packages through NuGet. Installation instructions can be found in the ReadMe of each package.
 
-* [Speech to Text](/src/IBM.WatsonDeveloperCloud.SpeechToText)
-* [Text to Speech](/src/IBM.WatsonDeveloperCloud.TextToSpeech)
-* [Conversation](/src/IBM.WatsonDeveloperCloud.Conversation)
-* [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) -->
+* [Conversation](/src/IBM.WatsonDeveloperCloud.Conversation.v1)
+* [Discovery](/src/IBM.WatsonDeveloperCloud.Discovery.v1)
+* [Language Translator](/src/IBM.WatsonDeveloperCloud.LanguageTranslator.v2)
+* [Natural Language Understanding](/src/IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1)
+* [Personality Insights](/src/IBM.WatsonDeveloperCloud.PersonalityInsights.v3)
+* [Speech to Text](/src/IBM.WatsonDeveloperCloud.SpeechToText.v1)
+* [Text to Speech](/src/IBM.WatsonDeveloperCloud.TextToSpeech.v1)
+* [Tone Analyzer](/src/IBM.WatsonDeveloperCloud.ToneAnalyzer.v3)
+* [Visual Recognition](/src/IBM.WatsonDeveloperCloud.VisualRecognition.v3)
 
 Or manually [here][latest_release].
 
@@ -60,20 +61,20 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).<TODO revise coding standard>
 [dw-answers]: https://developer.ibm.com/answers/questions/ask/?topics=watson
 [stack-overflow]: http://stackoverflow.com/questions/ask?tags=ibm-watson
 
-[conversation]:http://www.ibm.com/watson/developercloud/doc/conversation/
-[discovery]: http://www.ibm.com/watson/developercloud/discovery/api/v1/
-[speech_to_text]: http://www.ibm.com/watson/developercloud/doc/speech-to-text/
-[text_to_speech]: http://www.ibm.com/watson/developercloud/doc/text-to-speech/
-[visual_recognition]: http://www.ibm.com/watson/developercloud/visual-recognition/api/v3/
-[language_translator]: http://www.ibm.com/watson/developercloud/doc/language-translator/
-[personality_insights]: http://www.ibm.com/watson/developercloud/personality-insights/api/v2/
-[tone_analyzer]: http://www.ibm.com/watson/developercloud/doc/tone-analyzer/
-
-[document_conversion]: http://www.ibm.com/watson/developercloud/document-conversion/api/v1/
-[retrieve_and_rank]: http://www.ibm.com/watson/developercloud/retrieve-and-rank/api/v1/
-[natural_language_classifier]: http://www.ibm.com/watson/developercloud/doc/natural-language-classifier/index.html
-[alchemyData_news]: http://www.ibm.com/watson/developercloud/alchemy-data-news.html
-[tradeoff_analytics]: http://www.ibm.com/watson/developercloud/doc/tradeoff-analytics/
+[conversation]:https://www.ibm.com/watson/developercloud/conversation/api/v1/
+[discovery]: https://www.ibm.com/watson/developercloud/discovery/api/v1/
+[language_translator]: https://www.ibm.com/watson/developercloud/language-translator/api/v2/
+[natural_language_understanding]: https://www.ibm.com/watson/developercloud/natural-language-understanding/api/v1/
+[personality_insights]: https://www.ibm.com/watson/developercloud/personality-insights/api/v2/
+[speech_to_text]: https://www.ibm.com/watson/developercloud/speech-to-text/api/v1/
+[text_to_speech]: https://www.ibm.com/watson/developercloud/text-to-speech/api/v1/
+[tone_analyzer]: https://www.ibm.com/watson/developercloud/tone-analyzer/api/v3/
+[visual_recognition]: https://www.ibm.com/watson/developercloud/visual-recognition/api/v3/
+
+[document_conversion]: https://www.ibm.com/watson/developercloud/document-conversion/api/v1/
+[retrieve_and_rank]: https://www.ibm.com/watson/developercloud/retrieve-and-rank/api/v1/
+[natural_language_classifier]: https://www.ibm.com/watson/developercloud/natural-language-classifier/api/v1/
+[tradeoff_analytics]: https://www.ibm.com/watson/developercloud/tradeoff-analytics/api/v1/
 
 [dotnet-core-download]: https://www.microsoft.com/net/download/core
 [visual-studio-download]: https://www.visualstudio.com/vs/community/

README.md

@@ -1,4 +1,4 @@
-version: 0.1.{build}
+version: 0.3.{build}
 branches:
   except:
   - gh-pages
@@ -54,10 +54,12 @@ after_build:
     Write-Output "branchName  is " + $branchName
 
 
-    If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "release")
+    .\packages\Doxygen.1.8.13\tools\doxygen.exe Doxyfile
+
+
+    If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "master")
 
     {
-        .\packages\Doxygen.1.8.13\tools\doxygen.exe Doxyfile
         git config --global user.email "[email protected]"
         git config --global user.name "Watson Github Bot"
         git clone --quiet --branch=gh-pages https://$env:[email protected]/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
@@ -84,32 +86,38 @@ after_build:
     }
 
 
-    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.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
+
+    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.SpeechToText.IntegrationTests\Assets C:\projects\dotnet-standard-sdk
+    Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
 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(\"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}"
+- 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:
 - 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.LanguageTranslator
-- path: '\src\IBM.WatsonDeveloperCloud.PersonalityInsights\bin\$(configuration)\*.nupkg'
-  name: IBM.WatsonDeveloperCloud.PersonalityInsights
-- path: '\src\IBM.WatsonDeveloperCloud.SpeechToText\bin\$(configuration)\*.nupkg'
-  name: IBM.WatsonDeveloperCloud.SpeechToText
-- path: '\src\IBM.WatsonDeveloperCloud.TextToSpeech\bin\$(configuration)\*.nupkg'
-  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
+- path: '\src\IBM.WatsonDeveloperCloud.Conversation.v1\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.Conversation.v1
+- path: '\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.LanguageTranslator.v2
+- path: '\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.PersonalityInsights.v3
+- path: '\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.SpeechToText.v1
+- path: '\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.TextToSpeech.v1
+- path: '\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.ToneAnalyzer.v3
+- path: '\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.VisualRecognition.v3
+- path: '\src\IBM.WatsonDeveloperCloud.Discovery.v1\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.Discovery.v1
+- path: '\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\bin\$(configuration)\*.nupkg'
+  name: IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1
 deploy:
 - provider: NuGet
   api_key:
     secure: AaqUbQ5mJm8bYbpNH7GbAzYl45fZZHpqeNdtSd0wQNxjgYmLmvtMU5eByA/mkhxB
   on:
-    branch: release
+    branch: master
     APPVEYOR_REPO_TAG: true

appveyor.yml

@@ -0,0 +1,47 @@
+if((Test-Path -Path coverage))
+{
+  Remove-Item .\coverage -recurse
+}
+
+dotnet restore
+
+if((Test-Path -Path packages))
+{
+    Remove-Item .\packages -recurse
+}
+
+New-Item -path . -name packages -itemtype directory
+nuget install -Verbosity quiet -OutputDirectory packages -Version 4.6.519 OpenCover
+nuget install -Verbosity quiet -OutputDirectory packages -Version 2.4.5.0 ReportGenerator
+
+New-Item -path . -name coverage -itemtype directory
+Copy-Item .\test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData .\VisualRecognitionTestData -recurse
+Copy-Item .\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData .\SpeechToTextTestData -recurse
+Copy-Item .\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData .\DiscoveryTestData -recurse
+
+$openCover = '.\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe'
+
+ForEach($projectFolder in (Get-ChildItem -Path .\src -Directory))
+{
+    $projectJson = $projectFolder.FullName + '\project.json'
+    echo 'building ' $projectFolder.Name
+    dotnet build $projectJson
+}
+
+ForEach ($folder in (Get-ChildItem -Path .\test -Directory)) 
+{ 
+    if(!$folder.Name.Contains("TextToSpeech"))
+    {  
+        $targetArgs = '-targetargs: test \"' + $folder.FullName + '\" -c Debug -f netcoreapp1.0'
+        $filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
+        & $openCover '-target:C:\Program Files\dotnet\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\bin\Debug\netstandard1.6' '-output:coverage\coverage.xml'
+    }
+}
+
+$reportGenerator = '.\packages\ReportGenerator.2.4.5.0\tools\ReportGenerator.exe'
+& $reportGenerator -reports:coverage\coverage.xml -targetdir:coverage -verbosity:Error
+
+Remove-Item .\VisualRecognitionTestData -recurse
+Remove-Item .\SpeechToTextTestData -recurse
+Remove-Item .\DiscoveryTestData -recurse
+Remove-Item .\packages -recurse