Merge branch 'development' into gh-85-dynamicInputContext

Author: mediumTaj

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,14 +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: config
+  VCAP_SERVICES: C:\projects\dotnet-standard-sdk\config
 install:
 - cmd: >-
     rm -rf packages
@@ -81,8 +82,13 @@ 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    echo \"isPullRequest: $isPullRequest\"\n    $isPullRequest = Test-Path $env:APPVEYOR_PULL_REQUEST_NUMBER\n    if(!$isPullRequest)\n    {\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  }\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\"))\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

config.enc

@@ -0,0 +1,44 @@
+/**
+* Copyright 2017 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using Newtonsoft.Json.Linq;
+using System;
+using System.IO;
+
+namespace IBM.WatsonDeveloperCloud.VisualRecognition.Example
+{
+    public class Example
+    {
+        static void Main(string[] args)
+        {
+            var environmentVariable =
+            Environment.GetEnvironmentVariable("VCAP_SERVICES");
+
+            var fileContent =
+            File.ReadAllText(environmentVariable);
+
+            var vcapServices =
+            JObject.Parse(fileContent);
+
+            var apikey =
+            vcapServices["visual_recognition"][0]["credentials"]["apikey"];
+
+            VisualRecognitionServiceExample _visualRecognitionExample = new VisualRecognitionServiceExample(apikey.ToString());
+            Console.ReadKey();
+        }
+    }
+}

examples/IBM.WatsonDeveloperCloud.VisualRecognition.Example/Example.cs

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>8f6c1be5-d4c6-428f-b196-610297951444</ProjectGuid>
+    <RootNamespace>IBM.WatsonDeveloperCloud.VisualRecognition.Example</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

examples/IBM.WatsonDeveloperCloud.VisualRecognition.Example/IBM.WatsonDeveloperCloud.VisualRecognition.Example.xproj

@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("IBM.WatsonDeveloperCloud.VisualRecognition.Example")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8f6c1be5-d4c6-428f-b196-610297951444")]