Skip to content

Commit e61bfc7

Browse files
mediumTajmediumTaj
authored
Merge pull request #245 from watson-developer-cloud/rc-2.4.0
Merge release changes into develop
2 parents b0551e7 + 25b9e14 commit e61bfc7

File tree

59 files changed

+236
-141
lines changed

Some content is hidden

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

59 files changed

+236
-141
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
Change Log
22
==========
3+
## Version 2.4.0
4+
_2018-06-12_
5+
* Regenerated SDK based on the latest API definition.
6+
* New: Support for Language Translator v3.
7+
* Fixed: Added a null header check in ErrorFilter.cs.
8+
*
39
## Version 2.3.0
410
_2018-05-29_
511
* Regenerated SDK based on the latest API definition. All services except for Natural Language Classifier support IAM authentication.

‎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 = 2.3.0
41+
PROJECT_NUMBER = 2.4.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

‎appveyor.yml‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ install:
2929
3030
nuget install -Verbosity quiet -OutputDirectory packages -Version 0.7.0 coveralls.net
3131
32-
nuget install -Verbosity quiet -OutputDirectory packages -Version 1.8.13 Doxygen
32+
nuget install -Verbosity quiet -OutputDirectory packages -Version 1.8.14 Doxygen
3333
3434
nuget install -Verbosity quiet -OutputDirectory packages secure-file -ExcludeVersion
3535
3636
before_build:
3737
- ps: >-
38-
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
38+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
39+
{
40+
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
41+
}
3942
4043
dotnet restore
4144
@@ -59,39 +62,40 @@ after_build:
5962
6063
Write-Output "branchName is " + $branchName
6164
62-
63-
.\packages\Doxygen.1.8.13\tools\doxygen.exe Doxyfile
64-
65-
66-
If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "master")
67-
65+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
6866
{
69-
git config --global user.email "[email protected]"
70-
git config --global user.name "Watson Github Bot"
71-
git clone --quiet --branch=gh-pages https://$env:[email protected]/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
72-
73-
If(Test-Path -Path gh-pages\docs\$branchName)
74-
{
75-
rm gh-pages\docs\$branchName -r -force
76-
}
77-
mkdir -p gh-pages\docs\$branchName
78-
mv .\docs\html gh-pages\docs\$branchName
79-
. .\.utility\generate_html.ps1
80-
New-TableOfContents ".\gh-pages\docs" | Out-File ".\gh-pages\index.html" -encoding utf8
81-
cd gh-pages
82-
git add -f .
83-
git commit -m "Updated documentation for $branchName"
84-
git push -f origin gh-pages
85-
cd ../
67+
.\packages\Doxygen.1.8.13\tools\doxygen.exe Doxyfile
68+
69+
70+
If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "master")
71+
72+
{
73+
git config --global user.email "[email protected]"
74+
git config --global user.name "Watson Github Bot"
75+
git clone --quiet --branch=gh-pages https://$env:[email protected]/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
76+
77+
If(Test-Path -Path gh-pages\docs\$branchName)
78+
{
79+
rm gh-pages\docs\$branchName -r -force
80+
}
81+
mkdir -p gh-pages\docs\$branchName
82+
mv .\docs\html gh-pages\docs\$branchName
83+
. .\.utility\generate_html.ps1
84+
New-TableOfContents ".\gh-pages\docs" | Out-File ".\gh-pages\index.html" -encoding utf8
85+
cd gh-pages
86+
git add -f .
87+
git commit -m "Updated documentation for $branchName"
88+
git push -f origin gh-pages
89+
cd ../
90+
}
91+
92+
else
93+
94+
{
95+
Write-Output "branchName is $branchName. Not generating documentation."
96+
}
8697
}
8798
88-
else
89-
90-
{
91-
Write-Output "branchName is $branchName. Not generating documentation."
92-
}
93-
94-
9599
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
96100
97101
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.Conversation.v1.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.Discovery.v1.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

‎examples/IBM.WatsonDeveloperCloud.PersonalityInsights.v3.Example/IBM.WatsonDeveloperCloud.PersonalityInsights.v3.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.PersonalityInsights.v3.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.3.0</VersionPrefix>
4+
<VersionPrefix>2.4.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.SpeechToText.v1.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.3.0</Version>
13+
<Version>2.4.0</Version>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)