targeting 2.1 (#15079)

sdk/formrecognizer/Azure.AI.FormRecognizer/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Release History
 
 ## 3.1.0-beta.1 (Unreleased)
-
+- It defaults to the latest supported API version, which currently is `2.1-preview.1`.
+Note that new functionality hasn't been implemented in the client library.
 
 ## 3.0.0 (2020-08-20)
 

sdk/formrecognizer/Azure.AI.FormRecognizer/api/Azure.AI.FormRecognizer.netstandard2.0.cs

@@ -104,6 +104,7 @@ public enum FieldValueType
         Int64 = 5,
         List = 6,
         Dictionary = 7,
+        SelectionMark = 8,
     }
     public abstract partial class FormElement
     {

sdk/formrecognizer/Azure.AI.FormRecognizer/src/Attributes.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
+
+namespace Azure.AI.FormRecognizer.Training
+{
+    [CodeGenModel("Attributes")]
+    internal partial class Attributes
+    {
+    }
+}

sdk/formrecognizer/Azure.AI.FormRecognizer/src/CustomFormModelInfo.cs

@@ -48,5 +48,10 @@ internal CustomFormModelInfo(string modelId, DateTimeOffset trainingStartedOn, D
         /// </summary>
         [CodeGenMember("LastUpdatedDateTime")]
         public DateTimeOffset TrainingCompletedOn { get; }
+
+        /// <summary> Optional user defined model name (max length: 1024). </summary>
+        private string ModelName { get; }
+        /// <summary> Optional model attributes. </summary>
+        private Attributes Attributes { get; }
     }
 }

sdk/formrecognizer/Azure.AI.FormRecognizer/src/FieldValueSelectionMark.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
+
+namespace Azure.AI.FormRecognizer.Models
+{
+    [CodeGenModel("FieldValueSelectionMark")]
+    internal readonly partial struct FieldValueSelectionMark
+    {
+    }
+}

sdk/formrecognizer/Azure.AI.FormRecognizer/src/FieldValueType.cs

@@ -55,6 +55,11 @@ public enum FieldValueType
         /// Used for <see cref="Dictionary{TKey, TValue}"/> type.
         /// </summary>
         [CodeGenMember("Object")]
-        Dictionary
+        Dictionary,
+
+        /// <summary>
+        /// Used for <see cref="FieldValueSelectionMark"/> type.
+        /// </summary>
+        SelectionMark
     }
 }

sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormRecognizerClient.cs

@@ -271,7 +271,7 @@ public virtual async Task<RecognizeReceiptsOperation> StartRecognizeReceiptsAsyn
             {
                 FormContentType contentType = recognizeReceiptsOptions.ContentType ?? DetectContentType(receipt, nameof(receipt));
 
-                Response response = await ServiceClient.AnalyzeReceiptAsyncAsync(contentType, receipt, includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, cancellationToken).ConfigureAwait(false);
+                Response response = await ServiceClient.AnalyzeReceiptAsyncAsync(contentType, receipt, includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, default, cancellationToken).ConfigureAwait(false);
                 string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
 
                 return new RecognizeReceiptsOperation(ServiceClient, Diagnostics, location);
@@ -304,7 +304,7 @@ public virtual RecognizeReceiptsOperation StartRecognizeReceipts(Stream receipt,
             {
                 FormContentType contentType = recognizeReceiptsOptions.ContentType ?? DetectContentType(receipt, nameof(receipt));
 
-                Response response = ServiceClient.AnalyzeReceiptAsync(contentType, receipt, includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, cancellationToken);
+                Response response = ServiceClient.AnalyzeReceiptAsync(contentType, receipt, includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, default, cancellationToken);
                 string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
 
                 return new RecognizeReceiptsOperation(ServiceClient, Diagnostics, location);
@@ -336,7 +336,7 @@ public virtual async Task<RecognizeReceiptsOperation> StartRecognizeReceiptsFrom
             try
             {
                 SourcePath sourcePath = new SourcePath() { Source = receiptUri.AbsoluteUri };
-                Response response = await ServiceClient.AnalyzeReceiptAsyncAsync(includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, sourcePath, cancellationToken).ConfigureAwait(false);
+                Response response = await ServiceClient.AnalyzeReceiptAsyncAsync(includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, locale:default, fileStream: sourcePath, cancellationToken).ConfigureAwait(false);
                 string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
 
                 return new RecognizeReceiptsOperation(ServiceClient, Diagnostics, location);
@@ -368,7 +368,7 @@ public virtual RecognizeReceiptsOperation StartRecognizeReceiptsFromUri(Uri rece
             try
             {
                 SourcePath sourcePath = new SourcePath() { Source = receiptUri.AbsoluteUri };
-                Response response = ServiceClient.AnalyzeReceiptAsync(includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, sourcePath, cancellationToken);
+                Response response = ServiceClient.AnalyzeReceiptAsync(includeTextDetails: recognizeReceiptsOptions.IncludeFieldElements, locale: default, fileStream:sourcePath, cancellationToken);
                 string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
 
                 return new RecognizeReceiptsOperation(ServiceClient, Diagnostics, location);