Skip to content

Commit 84fa3f0

Browse files
mediumTajmediumTaj
authored
Merge pull request #325 from watson-developer-cloud/development
Watson .NET SDK 2.13.0
2 parents 4277694 + 81336fb commit 84fa3f0

File tree

117 files changed

+4825
-3238
lines changed

Some content is hidden

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

117 files changed

+4825
-3238
lines changed

‎.bumpversion.cfg‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[bumpversion]
22
commit = True
33
current_version = 2.12.0
4+
message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
45

56
[bumpversion:file:Doxyfile]
67

8+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.Assistant.v2.Example\IBM.WatsonDeveloperCloud.Assistant.v2.Example.csproj]
9+
710
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.Conversation.v1.Example\IBM.WatsonDeveloperCloud.Conversation.v1.Example.csproj]
811

912
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.Discovery.v1.Example\IBM.WatsonDeveloperCloud.Discovery.v1.Example.csproj]
1013

11-
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example.csproj]
12-
1314
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example.csproj]
1415

1516
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex\IBM.WatsonDeveloperCloud.NLU.v1.Example.csproj]
@@ -24,10 +25,14 @@ current_version = 2.12.0
2425

2526
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Assistant.v1\README.md]
2627

27-
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v2.csproj]
28+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Assistant.v2\IBM.WatsonDeveloperCloud.Assistant.v2.csproj]
2829

2930
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Assistant.v2\README.md]
3031

32+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.CompareComply.v1\IBM.WatsonDeveloperCloud.CompareComply.v1.csproj]
33+
34+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.CompareComply.v1\README.md]
35+
3136
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj]
3237

3338
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Conversation.v1\README.md]
@@ -36,10 +41,6 @@ current_version = 2.12.0
3641

3742
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Discovery.v1\README.md]
3843

39-
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.csproj]
40-
41-
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\README.md]
42-
4344
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj]
4445

4546
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\README.md]
@@ -80,10 +81,14 @@ current_version = 2.12.0
8081

8182
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests.csproj]
8283

83-
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v2.IntegrationTests\IBM.WatsonDeveloperCloud.Assistant.v2.IntegrationTests.csproj]
84+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v2.IntTests\IBM.WatsonDeveloperCloud.Assistant.v2.IntTests.csproj]
8485

8586
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v2.UnitTests\IBM.WatsonDeveloperCloud.Assistant.v2.UnitTests.csproj]
8687

88+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.CompareComply.v1.IT\IBM.WatsonDeveloperCloud.CompareComply.v1.IT.csproj]
89+
90+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.CompareComply.v1.UT\IBM.WatsonDeveloperCloud.CompareComply.v1.UT.csproj]
91+
8792
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests.csproj]
8893

8994
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests\IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests.csproj]
@@ -92,10 +97,6 @@ current_version = 2.12.0
9297

9398
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Discovery.v1.UnitTests\IBM.WatsonDeveloperCloud.Discovery.v1.UnitTests.csproj]
9499

95-
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests.csproj]
96-
97-
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.UnitTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.UnitTests.csproj]
98-
99100
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests.csproj]
100101

101102
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests.csproj]
@@ -121,4 +122,3 @@ current_version = 2.12.0
121122
[bumpversion:file:test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests.csproj]
122123
search = {current_version}
123124
replace = {new_version}
124-

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- repo: [email protected]:Whitewater/whitewater-detect-secrets
2+
rev: master
3+
hooks:
4+
- id: detect-secrets # pragma: whitelist secret
5+
args: [--baseline, .secrets.baseline, --no-keyword-scan ]

‎.releaserc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"branch": "master",
33
"verifyConditions": [],
4-
"prepare": [],
4+
"prepare": [
5+
{
6+
"path": "@semantic-release/exec",
7+
"cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
8+
}
9+
],
510
"publish": ["@semantic-release/github"]
6-
}
11+
}

‎.secrets.baseline‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"exclude_regex": null,
3+
"generated_at": "2019-01-08T20:42:05Z",
4+
"plugins_used": [
5+
{
6+
"base64_limit": 4.5,
7+
"name": "Base64HighEntropyString"
8+
},
9+
{
10+
"name": "BasicAuthDetector"
11+
},
12+
{
13+
"hex_limit": 3,
14+
"name": "HexHighEntropyString"
15+
},
16+
{
17+
"name": "PrivateKeyDetector"
18+
},
19+
{
20+
"name": "SlackDetector"
21+
}
22+
],
23+
"results": {
24+
"appveyor.yml": [
25+
{
26+
"hashed_secret": "81cc82ec4503a5349cbd49bff33b018dda08791e",
27+
"is_secret": false,
28+
"line_number": 11,
29+
"type": "Base64 High Entropy String"
30+
},
31+
{
32+
"hashed_secret": "fbc5cc2fb172ff872face8cbba0b5c17ac92123a",
33+
"is_secret": false,
34+
"line_number": 13,
35+
"type": "Base64 High Entropy String"
36+
},
37+
{
38+
"hashed_secret": "c7f4f2c1eb2586e68317d0e027e140f3f4aa2ea0",
39+
"is_secret": false,
40+
"line_number": 15,
41+
"type": "Base64 High Entropy String"
42+
},
43+
{
44+
"hashed_secret": "9e1bd5ccb96a264a4b392780dccd7e83b2d4d57f",
45+
"is_secret": false,
46+
"line_number": 17,
47+
"type": "Base64 High Entropy String"
48+
},
49+
{
50+
"hashed_secret": "9ba7161a4cf3d2ed761daa7a5bddae8620bb1d53",
51+
"is_secret": false,
52+
"line_number": 19,
53+
"type": "Base64 High Entropy String"
54+
},
55+
{
56+
"hashed_secret": "c51238bc51c3b0abee7f61d90c414aec89009734",
57+
"is_secret": false,
58+
"line_number": 47,
59+
"type": "Basic Auth Credentials"
60+
},
61+
{
62+
"hashed_secret": "3f820839b94508b2a9dc3b3e6e1149080af8780c",
63+
"is_secret": false,
64+
"line_number": 82,
65+
"type": "Basic Auth Credentials"
66+
}
67+
]
68+
},
69+
"version": "0.10.3"
70+
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Ensure you have the following prerequisites:
2727
You can get the latest SDK packages through NuGet. Installation instructions can be found in the ReadMe of each package.
2828

2929
* [Assistant V1](/src/IBM.WatsonDeveloperCloud.Assistant.v1)
30-
* [Assistant V2](/src/IBM.WatsonDeveloperCloud.Assistant.v2) (private beta)
30+
* [Assistant V2](/src/IBM.WatsonDeveloperCloud.Assistant.v2)
3131
* [Compare Comply](/src/IBM.WatsonDeveloperCloud.CompareComply.v1)
3232
* [Conversation](/src/IBM.WatsonDeveloperCloud.Conversation.v1) (deprecated - Use Assistant V1 or Assistant V2)
3333
* [Discovery](/src/IBM.WatsonDeveloperCloud.Discovery.v1)

‎appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install:
2121
# Get the latest stable version of Node.js or io.js
2222
- ps: Install-Product node $env:nodejs_version
2323
# install modules
24-
- pip install --user bumpversion
24+
- pip install --user git+git://github.com/smsearcy/bumpversion.git@issue-135
2525
- npm install @semantic-release/exec
2626
- cmd: >-
2727
rm -rf packages
@@ -98,6 +98,8 @@ after_build:
9898
If($branchName -eq "master")
9999
100100
{
101+
npx semantic-release
102+
101103
Write-Output "branchName is master - building nuget packages"
102104
dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
103105
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
@@ -112,14 +114,12 @@ after_build:
112114
dotnet pack .\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1.csproj --configuration Release
113115
dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj --configuration Release
114116
dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj --configuration Release
115-
116-
npx semantic-release
117117
}
118118
119119
else
120120
121121
{
122-
Write-Output "branchName is not master - do not pack."
122+
Write-Output "branchName is not master - do not pack or run semantic-release."
123123
}
124124
125125
}

‎examples/IBM.WatsonDeveloperCloud.Discovery.v1.Example/DiscoveryTestData/stopwords.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
| US English default stopword list
2+
3+
a
4+
an
5+
and
6+
are
7+
as
8+
at
9+
be
10+
but
11+
by
12+
for
13+
if
14+
in
15+
into
16+
is
17+
it
18+
no
19+
not
20+
of
21+
on
22+
or
23+
such
24+
that
25+
the
26+
their
27+
then
28+
there
29+
these
30+
they
31+
this
32+
to
33+
was
34+
will
35+
with

‎examples/IBM.WatsonDeveloperCloud.SpeechToText.v1.Example/SpeechToTextTestData/confirm.abnf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#ABNF 1.0 ISO-8859-1;
2+
language en-US;
3+
mode voice;
4+
root $yesno;
5+
6+
$yesno = affirmative | nah | no | nope | yeah | yep | yes | yup | fine
7+
| negative | OK | sure ;

‎src/IBM.WatsonDeveloperCloud.Assistant.v1/AssistantService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2617,7 +2617,7 @@ public DialogNode UpdateDialogNode(string workspaceId, string dialogNode, Update
26172617
/// <param name="filter">A cacheable parameter that limits the results to those matching the specified filter.
26182618
/// You must specify a filter query that includes a value for `language`, as well as a value for `workspace_id`
26192619
/// or `request.context.metadata.deployment`. For more information, see the
2620-
/// [documentation](https://console.bluemix.net/docs/services/conversation/filter-reference.html#filter-query-syntax).</param>
2620+
/// [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-query-syntax).</param>
26212621
/// <param name="sort">How to sort the returned log events. You can sort by **request_timestamp**. To reverse
26222622
/// the sort order, prefix the parameter value with a minus sign (`-`). (optional, default to
26232623
/// request_timestamp)</param>
@@ -2687,7 +2687,7 @@ public LogCollection ListAllLogs(string filter, string sort = null, long? pageLi
26872687
/// request_timestamp)</param>
26882688
/// <param name="filter">A cacheable parameter that limits the results to those matching the specified filter.
26892689
/// For more information, see the
2690-
/// [documentation](https://console.bluemix.net/docs/services/conversation/filter-reference.html#filter-query-syntax).
2690+
/// [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-query-syntax).
26912691
/// (optional)</param>
26922692
/// <param name="pageLimit">The number of records to return in each page of results. (optional, default to
26932693
/// 100)</param>
@@ -2748,7 +2748,7 @@ public LogCollection ListLogs(string workspaceId, string sort = null, string fil
27482748
///
27492749
/// You associate a customer ID with data by passing the `X-Watson-Metadata` header with a request that passes
27502750
/// data. For more information about personal data and customer IDs, see [Information
2751-
/// security](https://console.bluemix.net/docs/services/conversation/information-security.html).
2751+
/// security](https://cloud.ibm.com/docs/services/assistant/information-security.html).
27522752
/// </summary>
27532753
/// <param name="customerId">The customer ID for which all data is to be deleted.</param>
27542754
/// <param name="customData">Custom data object to pass data including custom request headers.</param>

‎src/IBM.WatsonDeveloperCloud.Assistant.v1/Model/CreateDialogNode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public enum DigressOutSlotsEnum
282282
public string PreviousSibling { get; set; }
283283
/// <summary>
284284
/// The output of the dialog node. For more information about how to specify dialog node output, see the
285-
/// [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
285+
/// [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
286286
/// </summary>
287287
[JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
288288
public dynamic Output { get; set; }

0 commit comments

Comments
 (0)