Skip to content

Commit cf2832d

Browse files
mediumTajmediumTaj
committed
Merge branch '4.0.0-rc' of github.com:watson-developer-cloud/dotnet-standard-sdk into 4.0.0-rc
2 parents ed4f288 + d9eab9e commit cf2832d

File tree

88 files changed

+3767
-71
lines changed

Some content is hidden

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

88 files changed

+3767
-71
lines changed

‎.bumpversion.cfg‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ replace = {new_version}
6363
search = {current_version}
6464
replace = {new_version}
6565

66+
[bumpversion:file:src/IBM.Watson.VisualRecognition.v4/IBM.Watson.VisualRecognition.v4.csproj]
67+
search = {current_version}
68+
replace = {new_version}
69+
6670
[bumpversion:file:test/Assistant.v1.IntegrationTests/IBM.Watson.Assistant.v1.IntegrationTests.csproj]
6771
search = {current_version}
6872
replace = {new_version}
@@ -143,3 +147,10 @@ replace = {new_version}
143147
search = {current_version}
144148
replace = {new_version}
145149

150+
[bumpversion:file:test/VisualRecognition.v4.IntegrationTests/IBM.Watson.VisualRecognition.v4.IntegrationTests.csproj]
151+
search = {current_version}
152+
replace = {new_version}
153+
154+
[bumpversion:file:test/VisualRecognition.v4.UnitTests/IBM.Watson.VisualRecognition.v4.UnitTests.csproj]
155+
search = {current_version}
156+
replace = {new_version}

‎IBM.Watson.sln‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.ToneAnalyzer.v3.
119119
EndProject
120120
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v3.Examples", "examples\IBM.Watson.VisualRecognition.v3.Examples\IBM.Watson.VisualRecognition.v3.Examples.csproj", "{EBED7B56-15D3-472E-A758-6452415AA941}"
121121
EndProject
122+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualRecognitionV4", "VisualRecognitionV4", "{69DE0999-CABC-4108-9B49-2B902D9A318E}"
123+
EndProject
124+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v4", "src\IBM.Watson.VisualRecognition.v4\IBM.Watson.VisualRecognition.v4.csproj", "{DC0B8384-A8F4-49E0-9A72-57FF4AA124C3}"
125+
EndProject
126+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v4.IntegrationTests", "test\VisualRecognition.v4.IntegrationTests\IBM.Watson.VisualRecognition.v4.IntegrationTests.csproj", "{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20}"
127+
EndProject
128+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v4.UnitTests", "test\VisualRecognition.v4.UnitTests\IBM.Watson.VisualRecognition.v4.UnitTests.csproj", "{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F}"
129+
EndProject
130+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IBM.Watson.VisualRecognition.v4.Examples", "examples\IBM.Watson.VisualRecognition.v4.Examples\IBM.Watson.VisualRecognition.v4.Examples.csproj", "{EAB0C966-76C7-4457-AAC4-383A298A5EAB}"
131+
EndProject
122132
Global
123133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
124134
Debug|Any CPU = Debug|Any CPU
@@ -305,6 +315,22 @@ Global
305315
{EBED7B56-15D3-472E-A758-6452415AA941}.Debug|Any CPU.Build.0 = Debug|Any CPU
306316
{EBED7B56-15D3-472E-A758-6452415AA941}.Release|Any CPU.ActiveCfg = Release|Any CPU
307317
{EBED7B56-15D3-472E-A758-6452415AA941}.Release|Any CPU.Build.0 = Release|Any CPU
318+
{DC0B8384-A8F4-49E0-9A72-57FF4AA124C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
319+
{DC0B8384-A8F4-49E0-9A72-57FF4AA124C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
320+
{DC0B8384-A8F4-49E0-9A72-57FF4AA124C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
321+
{DC0B8384-A8F4-49E0-9A72-57FF4AA124C3}.Release|Any CPU.Build.0 = Release|Any CPU
322+
{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
323+
{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20}.Debug|Any CPU.Build.0 = Debug|Any CPU
324+
{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20}.Release|Any CPU.ActiveCfg = Release|Any CPU
325+
{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20}.Release|Any CPU.Build.0 = Release|Any CPU
326+
{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
327+
{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F}.Debug|Any CPU.Build.0 = Debug|Any CPU
328+
{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F}.Release|Any CPU.ActiveCfg = Release|Any CPU
329+
{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F}.Release|Any CPU.Build.0 = Release|Any CPU
330+
{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
331+
{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
332+
{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
333+
{EAB0C966-76C7-4457-AAC4-383A298A5EAB}.Release|Any CPU.Build.0 = Release|Any CPU
308334
EndGlobalSection
309335
GlobalSection(SolutionProperties) = preSolution
310336
HideSolutionNode = FALSE
@@ -354,6 +380,10 @@ Global
354380
{D8E0E626-B930-42A9-88E7-13C05A08B868} = {A86D4D5B-AECE-49F2-A2BC-F6897B3EB2E8}
355381
{523AE6E0-11CD-40CA-ABB1-8010E35C416D} = {C7873F44-7188-49BE-84C5-532BE4E07147}
356382
{EBED7B56-15D3-472E-A758-6452415AA941} = {A1BC3262-1837-40D9-A530-DCFE679927C2}
383+
{DC0B8384-A8F4-49E0-9A72-57FF4AA124C3} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
384+
{86FC135E-3D1E-40FE-9BE6-1B0A72ACDC20} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
385+
{AF2B1FCA-118D-4ABA-B7B0-EFB6BBC7164F} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
386+
{EAB0C966-76C7-4457-AAC4-383A298A5EAB} = {69DE0999-CABC-4108-9B49-2B902D9A318E}
357387
EndGlobalSection
358388
GlobalSection(ExtensibilityGlobals) = postSolution
359389
SolutionGuid = {B9D9D17B-1C17-402F-B701-DC671528690A}

‎appveyor.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ after_build:
133133
134134
Copy-Item C:\projects\dotnet-standard-sdk\test\VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
135135
136+
Copy-Item C:\projects\dotnet-standard-sdk\test\VisualRecognition.v4.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
137+
136138
Copy-Item C:\projects\dotnet-standard-sdk\test\SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData
137139
138140
Copy-Item C:\projects\dotnet-standard-sdk\test\Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
@@ -269,6 +271,8 @@ test_script:
269271
270272
dotnet pack .\src\IBM.Watson.VisualRecognition.v3\IBM.Watson.VisualRecognition.v3.csproj --configuration Release
271273
274+
dotnet pack .\src\IBM.Watson.VisualRecognition.v4\IBM.Watson.VisualRecognition.v4.csproj --configuration Release
275+
272276
}
273277
274278
@@ -293,6 +297,8 @@ artifacts:
293297
name: IBM.Watson.ToneAnalyzer.v3
294298
- path: '\src\IBM.Watson.VisualRecognition.v3\bin\$(configuration)\*.nupkg'
295299
name: IBM.Watson.VisualRecognition.v3
300+
- path: '\src\IBM.Watson.VisualRecognition.v4\bin\$(configuration)\*.nupkg'
301+
name: IBM.Watson.VisualRecognition.v4
296302
- path: '\src\IBM.Watson.NaturalLanguageUnderstanding.v1\bin\$(configuration)\*.nupkg'
297303
name: IBM.Watson.NaturalLanguageUnderstanding.v1
298304
- path: '\src\IBM.Watson.NaturalLanguageClassifier.v1\bin\$(configuration)\*.nupkg'

‎examples/IBM.Watson.Assistant.v2.Examples/IBM.Watson.Assistant.v2.Examples.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc9" />
9+
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<!-- <ProjectReference Include="..\..\..\dotnet-sdk-core\src\IBM.Cloud.SDK.Core\IBM.Cloud.SDK.Core.csproj" /> -->
1413
<ProjectReference Include="..\..\src\IBM.Watson.Assistant.v2\IBM.Watson.Assistant.v2.csproj" />
1514
</ItemGroup>
1615

‎examples/IBM.Watson.CompareComply.v1.Examples/IBM.Watson.CompareComply.v1.Examples.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc9" />
9+
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<!-- <ProjectReference Include="..\..\..\dotnet-sdk-core\src\IBM.Cloud.SDK.Core\IBM.Cloud.SDK.Core.csproj" /> -->
1413
<ProjectReference Include="..\..\src\IBM.Watson.CompareComply.v1\IBM.Watson.CompareComply.v1.csproj" />
1514
</ItemGroup>
1615

‎examples/IBM.Watson.Discovery.v1.Examples/IBM.Watson.Discovery.v1.Examples.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc9" />
9+
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
@@ -16,7 +16,6 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<!-- <ProjectReference Include="..\..\..\dotnet-sdk-core\src\IBM.Cloud.SDK.Core\IBM.Cloud.SDK.Core.csproj" /> -->
2019
<ProjectReference Include="..\..\src\IBM.Watson.Discovery.v1\IBM.Watson.Discovery.v1.csproj" />
2120
</ItemGroup>
2221

‎examples/IBM.Watson.LanguageTranslator.v3.Examples/IBM.Watson.LanguageTranslator.v3.Examples.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc9" />
9+
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<!-- <ProjectReference Include="..\..\..\dotnet-sdk-core\src\IBM.Cloud.SDK.Core\IBM.Cloud.SDK.Core.csproj" /> -->
1413
<ProjectReference Include="..\..\src\IBM.Watson.LanguageTranslator.v3\IBM.Watson.LanguageTranslator.v3.csproj" />
1514
</ItemGroup>
1615

‎examples/IBM.Watson.NaturalLangaugeClassifier.v1.Examples/IBM.Watson.NaturalLangaugeClassifier.v1.Examples.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc9" />
9+
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<!-- <ProjectReference Include="..\..\..\dotnet-sdk-core\src\IBM.Cloud.SDK.Core\IBM.Cloud.SDK.Core.csproj" /> -->
1413
<ProjectReference Include="..\..\src\IBM.Watson.NaturalLanguageClassifier.v1\IBM.Watson.NaturalLanguageClassifier.v1.csproj" />
1514
</ItemGroup>
1615

‎examples/IBM.Watson.NaturalLanguageUnderstanding.v1.Examples/IBM.Watson.NaturalLanguageUnderstanding.v1.Examples.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc9" />
9+
<PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<!-- <ProjectReference Include="..\..\..\dotnet-sdk-core\src\IBM.Cloud.SDK.Core\IBM.Cloud.SDK.Core.csproj" /> -->
1413
<ProjectReference Include="..\..\src\IBM.Watson.NaturalLanguageUnderstanding.v1\IBM.Watson.NaturalLanguageUnderstanding.v1.csproj" />
1514
</ItemGroup>
1615

0 commit comments

Comments
 (0)