Merge pull request #402 from watson-developer-cloud/4.0.0/regeneration

4.0.0 Regeneration

Author: mediumTaj

.bumpversion.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 4.0.0-rc1
+current_version = 3.5.0
 message = docs: Update version numbers from {current_version} -> {new_version}
 
 [bumpversion:file:Doxyfile]

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Watson Developer Cloud .NET Standard SDK"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.0.0-rc1
+PROJECT_NUMBER         = 3.5.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

MIGRATION-V4.md

@@ -186,12 +186,16 @@ void Example()
 * `returnFields` was renamed to `_return` in the `QueryNotices()` method
 * `loggingOptOut` was renamed to `xWatsonLoggingOptOut` in the `FederatedQuery()` method
 * `collectionIds` is now required in the `FederatedQuery()` method
+* `collectionIds` changed position in the `FederatedQuery()` method
 * `returnFields` was renamed to `_return` in the `FederatedQuery()` method
 * `returnFields` was renamed to `_return` in the `FederatedQueryNotices()` method
 * `EnrichmentName` was renamed to `_Enrichment` in the `Enrichment` model
 * `FieldTypeEnumValue` was renamed to `TypeEnumValue` in the `Field` model
 * `FieldType` was renamed to `Type` in the `Field` model
 * `FieldName` was renamed to `_Field` in the `Field` model
+* `TestConfigurationInEnvironment()` method was removed
+* `QueryEntities()` method was removed
+* `QueryRelations()` method was removed
 
 ##### Language Translator v3
 
@@ -213,7 +217,7 @@ void Example()
 
 ##### Visual Recognition v3
 
-* Detect faces was removed
+* `DetectFaces()` method was removed
 * `ClassName` was renamed to `_Class` in the `ClassResult` model
 * `ClassName` was renamed to `_Class` in the `ModelClass` model
 

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

examples/IBM.Watson.Discovery.v1.Examples/ServiceExample.cs

@@ -67,8 +67,6 @@ static void Main(string[] args)
             example.GetConfiguration();
             example.UpdateConfiguration();
 
-            example.TestConfigurationInEnvironment();
-
             example.ListCollections();
             example.CreateCollection();
             example.GetCollection();
@@ -91,8 +89,6 @@ static void Main(string[] args)
             example.QueryNotices();
             example.FederatedQuery();
             example.FederatedQueryNotices();
-            example.QueryEntities();
-            example.QueryRelations();
 
             example.ListTrainingData();
             example.AddTrainingData();
@@ -324,34 +320,6 @@ public void DeleteConfiguration()
         }
         #endregion
 
-        #region Test Configuration in Environment
-        public void TestConfigurationInEnvironment()
-        {
-            IamAuthenticator authenticator = new IamAuthenticator(
-                apikey: "{apikey}");
-
-            DiscoveryService service = new DiscoveryService("2019-04-30", authenticator);
-            service.SetServiceUrl("{serviceUrl}");
-
-            using (FileStream fs = File.OpenRead("{path_to_document}"))
-            {
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    fs.CopyTo(ms);
-                    var result = service.TestConfigurationInEnvironment(
-                        environmentId: "{environmentId}",
-                        configurationId: "{configurationId}",
-                        file: ms,
-                        filename: "{test_file}",
-                        fileContentType: "{document_content_type}"
-                        );
-
-                    Console.WriteLine(result.Response);
-                }
-            }
-        }
-        #endregion
-
         #region Collections
         public void ListCollections()
         {
@@ -789,6 +757,7 @@ public void FederatedQuery()
 
             var result = service.FederatedQuery(
                 environmentId: "{environmentId}",
+                collectionIds: "{collectionIds}",
                 naturalLanguageQuery: "{naturalLanguageQuery}",
                 _return: "{returnFields}"
                 );
@@ -812,38 +781,6 @@ public void FederatedQueryNotices()
 
             Console.WriteLine(result.Response);
         }
-
-        public void QueryEntities()
-        {
-            IamAuthenticator authenticator = new IamAuthenticator(
-                apikey: "{apikey}");
-
-            DiscoveryService service = new DiscoveryService("2019-04-30", authenticator);
-            service.SetServiceUrl("{serviceUrl}");
-
-            var result = service.QueryEntities(
-                environmentId: "{environmentId}",
-                collectionId: "{collectionId}"
-                );
-
-            Console.WriteLine(result.Response);
-        }
-
-        public void QueryRelations()
-        {
-            IamAuthenticator authenticator = new IamAuthenticator(
-                apikey: "{apikey}");
-
-            DiscoveryService service = new DiscoveryService("2019-04-30", authenticator);
-            service.SetServiceUrl("{serviceUrl}");
-
-            var result = service.QueryRelations(
-                environmentId: "{environmentId}",
-                collectionId: "{collectionId}"
-                );
-
-            Console.WriteLine(result.Response);
-        }
         #endregion
 
         #region Training Data

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc91" />
+    <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>