Skip to content

Commit 7ec0119

Browse files
mediumTajmediumTaj
authored
Merge pull request watson-developer-cloud#186 from watson-developer-cloud/rc-2.0.0
Rc 2.0.0
2 parents d93544f + 475c3ec commit 7ec0119

File tree

496 files changed

+14965
-16405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+14965
-16405
lines changed

‎.utility/generate_html.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ function New-TableOfContents($path)
1717
<div class=`"page-header`">
1818
<h1>IBM Watson Developer Cloud .NET Standard SDK</h1>
1919
</div>
20-
<p><a href=`"http://www.ibm.com/watson/developercloud/`">Info</a>
21-
| <a href=`"http://www.ibm.com/watson/developercloud/doc/index.html`">Documentation</a>
20+
<p><a href=`"https://www.ibm.com/watson/developer/`">Info</a>
21+
| <a href=`"https://console.bluemix.net/developer/watson/documentation`">Documentation</a>
2222
</p>
2323
<p>Documentation by branch/tag:</p>
2424
<ul>

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Change Log
22
==========
3+
## Version 2.0.0
4+
_2018-03-09_
5+
* Breaking Change: Migrate to Visual Studio 2017.
6+
* Breaking Change: Regenerate all services using latest code generator & templates.
7+
* New: Revised integration tests.
8+
* New: Added documentation about publishing a release.
9+
* New: Generate Speech to Text service.
10+
* New: Generate Text to Speech service.
11+
* New: Generate Natural Language Classifier service.
12+
* New: Generate Visual Recognition service.
13+
314
## Version 1.3.1
15+
_2018-01-09_
416
* Fix: Change `Context` in `MessageRequest` to `dynamic`.
517

618
## Version 1.3.0

‎Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Watson Developer Cloud .NET Standard SDK"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 1.3.1
41+
PROJECT_NUMBER = 2.0.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎IBM.WatsonDeveloperCloud.sln

Lines changed: 74 additions & 92 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The .Net SDK uses the [Watson Developer Cloud][wdc] services, a collection of RE
1616
## Before you begin
1717
Ensure you have the following prerequisites:
1818

19-
* An IBM Bluemix account. If you don't have one, [sign up][bluemix_registration].
19+
* An IBM Cloud account. If you don't have one, [sign up][bluemix_registration].
2020
* Install [Visual Studio][visual-studio-download] for Windows or [Visual Studio Code][visual-studio-code-download] for OSX or Linux.
2121
* Install [.NET Core][dotnet-core-download].
2222

@@ -27,6 +27,7 @@ You can get the latest SDK packages through NuGet. Installation instructions can
2727
* [Discovery](/src/IBM.WatsonDeveloperCloud.Discovery.v1)
2828
* [Language Translator](/src/IBM.WatsonDeveloperCloud.LanguageTranslator.v2)
2929
* [Natural Language Understanding](/src/IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1)
30+
* [Natural Language Classifier](/src/IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1)
3031
* [Personality Insights](/src/IBM.WatsonDeveloperCloud.PersonalityInsights.v3)
3132
* [Speech to Text](/src/IBM.WatsonDeveloperCloud.SpeechToText.v1)
3233
* [Text to Speech](/src/IBM.WatsonDeveloperCloud.TextToSpeech.v1)
@@ -53,7 +54,7 @@ This library is licensed under Apache 2.0. Full license text is available in [LI
5354
## Contributing
5455
See [CONTRIBUTING.md](.github/CONTRIBUTING.md).<TODO revise coding standard>
5556

56-
[wdc]: http://www.ibm.com/watson/developercloud/
57+
[wdc]: https://www.ibm.com/watson/developer/
5758
[bluemix_registration]: http://bluemix.net/registration
5859
[ibm-github]: http://ibm.github.io/
5960

‎appveyor.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ after_build:
9191
}
9292
9393
94-
Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
94+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
9595
96-
Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData
96+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData
9797
98-
Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
98+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
9999
100-
Move-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\glossary.tmx C:\projects\dotnet-standard-sdk\glossary.tmx
100+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\glossary.tmx C:\projects\dotnet-standard-sdk\glossary.tmx
101101
test_script:
102-
- 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}"
102+
- 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($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\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}"
103103
artifacts:
104104
- path: '\src\IBM.WatsonDeveloperCloud\bin\$(configuration)\*.nupkg'
105105
name: IBM.WatsonDeveloperCloud
@@ -121,10 +121,12 @@ artifacts:
121121
name: IBM.WatsonDeveloperCloud.Discovery.v1
122122
- path: '\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\bin\$(configuration)\*.nupkg'
123123
name: IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1
124+
- path: '\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\bin\$(configuration)\*.nupkg'
125+
name: IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1
124126
deploy:
125127
- provider: NuGet
126128
api_key:
127-
secure: 2W1iN8vudnfbSezg9ZE4bfBBacbBHjhVuseZqsKsd2nCIydYaLRnW3kordCyeI/O
129+
secure: jVMsvYb86JW+UMN2Gb2m1JazRkouGMzd58NHWxWVAY1BsQbehIU+YTxdsAeMo1qy
128130
on:
129131
branch: master
130132
APPVEYOR_REPO_TAG: true

‎examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/ConversationContextExample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ConversationContextExample
3131

3232
public ConversationContextExample(string url, string username, string password, string workspaceId)
3333
{
34-
_conversation = new ConversationService(username, password, ConversationService.CONVERSATION_VERSION_DATE_2017_05_26);
34+
_conversation = new ConversationService(username, password, "2018-02-16");
3535
_conversation.Endpoint = url;
3636

3737
_workspaceID = workspaceId;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class ConversationServiceExample
4545
#region Constructor
4646
public ConversationServiceExample(string url, string username, string password, string workspaceID)
4747
{
48-
_conversation = new ConversationService(username, password, ConversationService.CONVERSATION_VERSION_DATE_2017_05_26);
48+
_conversation = new ConversationService(username, password, "2018-02-16");
4949
_conversation.Endpoint = url;
5050

5151
_workspaceID = workspaceID;

‎examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/IBM.WatsonDeveloperCloud.Conversation.v1.Example.csproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.3.0</VersionPrefix>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
<AssemblyName>IBM.WatsonDeveloperCloud.Conversation.v1.Example</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>IBM.WatsonDeveloperCloud.Conversation.v1.Example</PackageId>
9+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj" />
17+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
22+
</ItemGroup>
23+
24+
</Project>

‎examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/IBM.WatsonDeveloperCloud.Conversation.v1.Example.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎examples/IBM.WatsonDeveloperCloud.Discovery.v1.Example/DiscoveryServiceExample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class DiscoveryServiceExample
6262
#region Constructor
6363
public DiscoveryServiceExample(string url, string username, string password)
6464
{
65-
_discovery = new DiscoveryService(username, password, DiscoveryService.DISCOVERY_VERSION_DATE_2017_11_07);
65+
_discovery = new DiscoveryService(username, password, "2017-11-07");
6666
_discovery.Endpoint = url;
6767

6868
GetEnvironments();

‎examples/IBM.WatsonDeveloperCloud.Discovery.v1.Example/IBM.WatsonDeveloperCloud.Discovery.v1.Example.csproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.3.0</VersionPrefix>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
<AssemblyName>IBM.WatsonDeveloperCloud.Discovery.v1.Example</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>IBM.WatsonDeveloperCloud.Discovery.v1.Example</PackageId>
9+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<None Update=".\DiscoveryTestData\**\*">
17+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18+
</None>
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj" />
23+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
28+
</ItemGroup>
29+
30+
</Project>

‎examples/IBM.WatsonDeveloperCloud.Discovery.v1.Example/IBM.WatsonDeveloperCloud.Discovery.v1.Example.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎examples/IBM.WatsonDeveloperCloud.Discovery.v1.Example/project.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎examples/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example.csproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.3.0</VersionPrefix>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
<AssemblyName>IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example</PackageId>
9+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<None Update=".\glossary.tmx">
17+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18+
</None>
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj" />
23+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.csproj" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
28+
</ItemGroup>
29+
30+
</Project>

‎examples/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎examples/IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex/IBM.WatsonDeveloperCloud.NLU.v1.Example.csproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.3.0</VersionPrefix>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
6+
<AssemblyName>IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
<PackageId>IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex</PackageId>
9+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
10+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj" />
17+
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.csproj" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
22+
</ItemGroup>
23+
24+
</Project>

0 commit comments

Comments
 (0)