Add basic multi-version support to FR (Azure#20693)

tg-msft · maririos · web-flow · commit bfd0e2f8fc07 · 2021-04-29T10:41:37.000-07:00
* Add basic multi-version support to FR

* enable multi-api testing with mostly 2.1p3

Co-authored-by: Mariana Rios Flores &lt;mariari@microsoft.com&gt;
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormRecognizerClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormRecognizerClient.cs
@@ -58,7 +58,7 @@ public FormRecognizerClient(Uri endpoint, AzureKeyCredential credential, FormRec
 
             Diagnostics = new ClientDiagnostics(options);
             var pipeline = HttpPipelineBuilder.Build(options, new AzureKeyCredentialPolicy(credential, Constants.AuthorizationHeader));
-            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);
+            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));
         }
 
         /// <summary>
@@ -93,7 +93,7 @@ public FormRecognizerClient(Uri endpoint, TokenCredential credential, FormRecogn
 
             Diagnostics = new ClientDiagnostics(options);
             var pipeline = HttpPipelineBuilder.Build(options, new BearerTokenAuthenticationPolicy(credential, Constants.DefaultCognitiveScope));
-            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);
+            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));
         }
 
         /// <summary>
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormTrainingClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormTrainingClient.cs
@@ -66,7 +66,7 @@ public FormTrainingClient(Uri endpoint, AzureKeyCredential credential, FormRecog
 
             Diagnostics = new ClientDiagnostics(options);
             HttpPipeline pipeline = HttpPipelineBuilder.Build(options, new AzureKeyCredentialPolicy(credential, Constants.AuthorizationHeader));
-            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);
+            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));
         }
 
         /// <summary>
@@ -101,7 +101,7 @@ public FormTrainingClient(Uri endpoint, TokenCredential credential, FormRecogniz
 
             Diagnostics = new ClientDiagnostics(options);
             var pipeline = HttpPipelineBuilder.Build(options, new BearerTokenAuthenticationPolicy(credential, Constants.DefaultCognitiveScope));
-            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);
+            ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));
         }
 
         #region Training
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/FormRecognizerRestClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/FormRecognizerRestClient.cs
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/autorest.md b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/autorest.md
@@ -11,6 +11,25 @@ require:
     - https://github.com/Azure/azure-rest-api-specs/blob/5a260d47021d8278c26dd6f946f4e6b97e0cd023/specification/cognitiveservices/data-plane/FormRecognizer/readme.md
 ```
 
+### Make the API version parameterized so we generate a multi-versioned API
+
+This should be fixed in the swagger, but we're working around it locally for now.
+``` yaml
+directive:
+- from: swagger-document
+  where: $["x-ms-parameterized-host"]
+  transform: >
+    $.hostTemplate = "{endpoint}/formrecognizer/{apiVersion}";
+    $.parameters.push({
+      "name": "apiVersion",
+      "description": "Form Recognizer API version (for example: v2.0).",
+      "x-ms-parameter-location": "client",
+      "required": true,
+      "type": "string",
+      "in": "path",
+      "x-ms-skip-url-encoding": true
+    });
+```
 
 ### Make AnalyzeResult.readResult optional
 This is a temporary work-around
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormRecognizerClient/FormRecognizerClientLiveTests.cs
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs
@@ -25,8 +25,8 @@ public class FormTrainingClientLiveTests : FormRecognizerLiveTestBase
         /// Initializes a new instance of the <see cref="FormTrainingClientLiveTests"/> class.
         /// </summary>
         /// <param name="isAsync">A flag used by the Azure Core Test Framework to differentiate between tests for asynchronous and synchronous methods.</param>
-        public FormTrainingClientLiveTests(bool isAsync)
-            : base(isAsync)
+        public FormTrainingClientLiveTests(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)
+            : base(isAsync, serviceVersion)
         {
         }
 
@@ -72,6 +72,7 @@ public async Task StartTraining(bool singlePage, bool labeled)
             CustomFormModel model = operation.Value;
 
             Assert.IsNotNull(model.ModelId);
+            Assert.IsNull(model.ModelName);
             Assert.IsNotNull(model.Properties);
             Assert.IsFalse(model.Properties.IsComposedModel);
             Assert.IsNotNull(model.TrainingStartedOn);
@@ -108,6 +109,7 @@ public async Task StartTraining(bool singlePage, bool labeled)
         [RecordedTest]
         [TestCase(true)]
         [TestCase(false)]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task CheckFormTypeinSubmodelAndRecognizedForm(bool labeled)
         {
             var client = CreateFormTrainingClient();
@@ -135,6 +137,7 @@ public async Task CheckFormTypeinSubmodelAndRecognizedForm(bool labeled)
         [RecordedTest]
         [TestCase(false)]
         [TestCase(true)]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task StartCreateComposedModel(bool useTokenCredential)
         {
             var client = CreateFormTrainingClient(useTokenCredential);
@@ -203,6 +206,7 @@ public async Task StartCreateComposedModel(bool useTokenCredential)
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task StartCreateComposedModelFailsWithInvalidId()
         {
             var client = CreateFormTrainingClient();
@@ -245,6 +249,7 @@ public async Task StartTrainingFailsWithInvalidPrefix()
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task StartTrainingWithLabelsModelName()
         {
             var client = CreateFormTrainingClient();
@@ -260,6 +265,7 @@ public async Task StartTrainingWithLabelsModelName()
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task StartTrainingWithNoLabelsModelName()
         {
             var client = CreateFormTrainingClient();
@@ -401,6 +407,7 @@ public async Task CopyModel(bool useTokenCredential)
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task CopyModelWithLabelsAndModelName()
         {
             var sourceClient = CreateFormTrainingClient();
@@ -431,6 +438,7 @@ public async Task CopyModelWithLabelsAndModelName()
         [RecordedTest]
         [TestCase(true)]
         [TestCase(false)]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task CopyComposedModel(bool useTokenCredential)
         {
             var sourceClient = CreateFormTrainingClient(useTokenCredential);
@@ -468,6 +476,7 @@ public async Task CopyComposedModel(bool useTokenCredential)
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task CopyModelWithoutLabelsAndModelName()
         {
             var sourceClient = CreateFormTrainingClient();
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerLiveTestBase.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Infrastructure/FormRecognizerLiveTestBase.cs
@@ -9,11 +9,21 @@
 
 namespace Azure.AI.FormRecognizer.Tests
 {
+    [ClientTestFixture(
+    FormRecognizerClientOptions.ServiceVersion.V2_0,
+    FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
     public class FormRecognizerLiveTestBase : RecordedTestBase<FormRecognizerTestEnvironment>
     {
-        public FormRecognizerLiveTestBase(bool isAsync)
+        /// <summary>
+        /// The version of the REST API to test against.  This will be passed
+        /// to the .ctor via ClientTestFixture's values.
+        /// </summary>
+        private readonly FormRecognizerClientOptions.ServiceVersion _serviceVersion;
+
+        public FormRecognizerLiveTestBase(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)
             : base(isAsync)
         {
+            _serviceVersion = serviceVersion;
             Sanitizer = new FormRecognizerRecordedTestSanitizer();
         }
 
@@ -39,7 +49,7 @@ public FormRecognizerLiveTestBase(bool isAsync)
         protected FormRecognizerClient CreateFormRecognizerClient(out FormRecognizerClient nonInstrumentedClient, bool useTokenCredential = false, string apiKey = default)
         {
             var endpoint = new Uri(TestEnvironment.Endpoint);
-            var options = InstrumentClientOptions(new FormRecognizerClientOptions());
+            var options = InstrumentClientOptions(new FormRecognizerClientOptions(_serviceVersion));
 
             if (useTokenCredential)
             {
@@ -77,7 +87,7 @@ protected FormRecognizerClient CreateFormRecognizerClient(out FormRecognizerClie
         protected FormTrainingClient CreateFormTrainingClient(out FormTrainingClient nonInstrumentedClient, bool useTokenCredential = false, string apiKey = default)
         {
             var endpoint = new Uri(TestEnvironment.Endpoint);
-            var options = InstrumentClientOptions(new FormRecognizerClientOptions());
+            var options = InstrumentClientOptions(new FormRecognizerClientOptions(_serviceVersion));
 
             if (useTokenCredential)
             {
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Models/OperationsLiveTests.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/tests/Models/OperationsLiveTests.cs
@@ -24,8 +24,8 @@ public class OperationsLiveTests : FormRecognizerLiveTestBase
         /// Initializes a new instance of the <see cref="OperationsLiveTests"/> class.
         /// </summary>
         /// <param name="isAsync">A flag used by the Azure Core Test Framework to differentiate between tests for asynchronous and synchronous methods.</param>
-        public OperationsLiveTests(bool isAsync)
-            : base(isAsync)
+        public OperationsLiveTests(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)
+            : base(isAsync, serviceVersion)
         {
         }
 
@@ -60,6 +60,7 @@ public async Task RecognizeReceiptsOperationCanPollFromNewObject()
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task RecognizeInvoicesOperationCanPollFromNewObject()
         {
             var client = CreateFormRecognizerClient(out var nonInstrumentedClient);
@@ -75,6 +76,7 @@ public async Task RecognizeInvoicesOperationCanPollFromNewObject()
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task RecognizeIdDocumentsOperationCanPollFromNewObject()
         {
             var client = CreateFormRecognizerClient(out var nonInstrumentedClient);
@@ -126,6 +128,7 @@ public async Task TrainingOperationCanPollFromNewObject()
         }
 
         [RecordedTest]
+        [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]
         public async Task CreateComposedModelOperationCanPollFromNewObject()
         {
             var client = CreateFormTrainingClient(out var nonInstrumentedClient);

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public FormRecognizerClient(Uri endpoint, AzureKeyCredential credential, FormRec`
`58`	`58`
`59`	`59`	`Diagnostics = new ClientDiagnostics(options);`
`60`	`60`	`var pipeline = HttpPipelineBuilder.Build(options, new AzureKeyCredentialPolicy(credential, Constants.AuthorizationHeader));`
`61`		`- ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);`
	`61`	`+ ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/// <summary>`
`@@ -93,7 +93,7 @@ public FormRecognizerClient(Uri endpoint, TokenCredential credential, FormRecogn`
`93`	`93`
`94`	`94`	`Diagnostics = new ClientDiagnostics(options);`
`95`	`95`	`var pipeline = HttpPipelineBuilder.Build(options, new BearerTokenAuthenticationPolicy(credential, Constants.DefaultCognitiveScope));`
`96`		`- ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);`
	`96`	`+ ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public FormTrainingClient(Uri endpoint, AzureKeyCredential credential, FormRecog`
`66`	`66`
`67`	`67`	`Diagnostics = new ClientDiagnostics(options);`
`68`	`68`	`HttpPipeline pipeline = HttpPipelineBuilder.Build(options, new AzureKeyCredentialPolicy(credential, Constants.AuthorizationHeader));`
`69`		`- ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);`
	`69`	`+ ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/// <summary>`
`@@ -101,7 +101,7 @@ public FormTrainingClient(Uri endpoint, TokenCredential credential, FormRecogniz`
`101`	`101`
`102`	`102`	`Diagnostics = new ClientDiagnostics(options);`
`103`	`103`	`var pipeline = HttpPipelineBuilder.Build(options, new BearerTokenAuthenticationPolicy(credential, Constants.DefaultCognitiveScope));`
`104`		`- ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri);`
	`104`	`+ ServiceClient = new FormRecognizerRestClient(Diagnostics, pipeline, endpoint.AbsoluteUri, FormRecognizerClientOptions.GetVersionString(options.Version));`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`#region Training`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public class FormTrainingClientLiveTests : FormRecognizerLiveTestBase`
`25`	`25`	`/// Initializes a new instance of the <see cref="FormTrainingClientLiveTests"/> class.`
`26`	`26`	`/// </summary>`
`27`	`27`	`/// <param name="isAsync">A flag used by the Azure Core Test Framework to differentiate between tests for asynchronous and synchronous methods.</param>`
`28`		`- public FormTrainingClientLiveTests(bool isAsync)`
`29`		`- : base(isAsync)`
	`28`	`+ public FormTrainingClientLiveTests(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)`
	`29`	`+ : base(isAsync, serviceVersion)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`@@ -72,6 +72,7 @@ public async Task StartTraining(bool singlePage, bool labeled)`
`72`	`72`	`CustomFormModel model = operation.Value;`
`73`	`73`
`74`	`74`	`Assert.IsNotNull(model.ModelId);`
	`75`	`+ Assert.IsNull(model.ModelName);`
`75`	`76`	`Assert.IsNotNull(model.Properties);`
`76`	`77`	`Assert.IsFalse(model.Properties.IsComposedModel);`
`77`	`78`	`Assert.IsNotNull(model.TrainingStartedOn);`
`@@ -108,6 +109,7 @@ public async Task StartTraining(bool singlePage, bool labeled)`
`108`	`109`	`[RecordedTest]`
`109`	`110`	`[TestCase(true)]`
`110`	`111`	`[TestCase(false)]`
	`112`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`111`	`113`	`public async Task CheckFormTypeinSubmodelAndRecognizedForm(bool labeled)`
`112`	`114`	`{`
`113`	`115`	`var client = CreateFormTrainingClient();`
`@@ -135,6 +137,7 @@ public async Task CheckFormTypeinSubmodelAndRecognizedForm(bool labeled)`
`135`	`137`	`[RecordedTest]`
`136`	`138`	`[TestCase(false)]`
`137`	`139`	`[TestCase(true)]`
	`140`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`138`	`141`	`public async Task StartCreateComposedModel(bool useTokenCredential)`
`139`	`142`	`{`
`140`	`143`	`var client = CreateFormTrainingClient(useTokenCredential);`
`@@ -203,6 +206,7 @@ public async Task StartCreateComposedModel(bool useTokenCredential)`
`203`	`206`	`}`
`204`	`207`
`205`	`208`	`[RecordedTest]`
	`209`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`206`	`210`	`public async Task StartCreateComposedModelFailsWithInvalidId()`
`207`	`211`	`{`
`208`	`212`	`var client = CreateFormTrainingClient();`
`@@ -245,6 +249,7 @@ public async Task StartTrainingFailsWithInvalidPrefix()`
`245`	`249`	`}`
`246`	`250`
`247`	`251`	`[RecordedTest]`
	`252`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`248`	`253`	`public async Task StartTrainingWithLabelsModelName()`
`249`	`254`	`{`
`250`	`255`	`var client = CreateFormTrainingClient();`
`@@ -260,6 +265,7 @@ public async Task StartTrainingWithLabelsModelName()`
`260`	`265`	`}`
`261`	`266`
`262`	`267`	`[RecordedTest]`
	`268`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`263`	`269`	`public async Task StartTrainingWithNoLabelsModelName()`
`264`	`270`	`{`
`265`	`271`	`var client = CreateFormTrainingClient();`
`@@ -401,6 +407,7 @@ public async Task CopyModel(bool useTokenCredential)`
`401`	`407`	`}`
`402`	`408`
`403`	`409`	`[RecordedTest]`
	`410`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`404`	`411`	`public async Task CopyModelWithLabelsAndModelName()`
`405`	`412`	`{`
`406`	`413`	`var sourceClient = CreateFormTrainingClient();`
`@@ -431,6 +438,7 @@ public async Task CopyModelWithLabelsAndModelName()`
`431`	`438`	`[RecordedTest]`
`432`	`439`	`[TestCase(true)]`
`433`	`440`	`[TestCase(false)]`
	`441`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`434`	`442`	`public async Task CopyComposedModel(bool useTokenCredential)`
`435`	`443`	`{`
`436`	`444`	`var sourceClient = CreateFormTrainingClient(useTokenCredential);`
`@@ -468,6 +476,7 @@ public async Task CopyComposedModel(bool useTokenCredential)`
`468`	`476`	`}`
`469`	`477`
`470`	`478`	`[RecordedTest]`
	`479`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`471`	`480`	`public async Task CopyModelWithoutLabelsAndModelName()`
`472`	`481`	`{`
`473`	`482`	`var sourceClient = CreateFormTrainingClient();`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,21 @@`
`9`	`9`
`10`	`10`	`namespace Azure.AI.FormRecognizer.Tests`
`11`	`11`	`{`
	`12`	`+ [ClientTestFixture(`
	`13`	`+ FormRecognizerClientOptions.ServiceVersion.V2_0,`
	`14`	`+ FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`12`	`15`	`public class FormRecognizerLiveTestBase : RecordedTestBase<FormRecognizerTestEnvironment>`
`13`	`16`	`{`
`14`		`- public FormRecognizerLiveTestBase(bool isAsync)`
	`17`	`+ /// <summary>`
	`18`	`+ /// The version of the REST API to test against. This will be passed`
	`19`	`+ /// to the .ctor via ClientTestFixture's values.`
	`20`	`+ /// </summary>`
	`21`	`+ private readonly FormRecognizerClientOptions.ServiceVersion _serviceVersion;`
	`22`	`+`
	`23`	`+ public FormRecognizerLiveTestBase(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)`
`15`	`24`	`: base(isAsync)`
`16`	`25`	`{`
	`26`	`+ _serviceVersion = serviceVersion;`
`17`	`27`	`Sanitizer = new FormRecognizerRecordedTestSanitizer();`
`18`	`28`	`}`
`19`	`29`
`@@ -39,7 +49,7 @@ public FormRecognizerLiveTestBase(bool isAsync)`
`39`	`49`	`protected FormRecognizerClient CreateFormRecognizerClient(out FormRecognizerClient nonInstrumentedClient, bool useTokenCredential = false, string apiKey = default)`
`40`	`50`	`{`
`41`	`51`	`var endpoint = new Uri(TestEnvironment.Endpoint);`
`42`		`- var options = InstrumentClientOptions(new FormRecognizerClientOptions());`
	`52`	`+ var options = InstrumentClientOptions(new FormRecognizerClientOptions(_serviceVersion));`
`43`	`53`
`44`	`54`	`if (useTokenCredential)`
`45`	`55`	`{`
`@@ -77,7 +87,7 @@ protected FormRecognizerClient CreateFormRecognizerClient(out FormRecognizerClie`
`77`	`87`	`protected FormTrainingClient CreateFormTrainingClient(out FormTrainingClient nonInstrumentedClient, bool useTokenCredential = false, string apiKey = default)`
`78`	`88`	`{`
`79`	`89`	`var endpoint = new Uri(TestEnvironment.Endpoint);`
`80`		`- var options = InstrumentClientOptions(new FormRecognizerClientOptions());`
	`90`	`+ var options = InstrumentClientOptions(new FormRecognizerClientOptions(_serviceVersion));`
`81`	`91`
`82`	`92`	`if (useTokenCredential)`
`83`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public class OperationsLiveTests : FormRecognizerLiveTestBase`
`24`	`24`	`/// Initializes a new instance of the <see cref="OperationsLiveTests"/> class.`
`25`	`25`	`/// </summary>`
`26`	`26`	`/// <param name="isAsync">A flag used by the Azure Core Test Framework to differentiate between tests for asynchronous and synchronous methods.</param>`
`27`		`- public OperationsLiveTests(bool isAsync)`
`28`		`- : base(isAsync)`
	`27`	`+ public OperationsLiveTests(bool isAsync, FormRecognizerClientOptions.ServiceVersion serviceVersion)`
	`28`	`+ : base(isAsync, serviceVersion)`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`@@ -60,6 +60,7 @@ public async Task RecognizeReceiptsOperationCanPollFromNewObject()`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`[RecordedTest]`
	`63`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`63`	`64`	`public async Task RecognizeInvoicesOperationCanPollFromNewObject()`
`64`	`65`	`{`
`65`	`66`	`var client = CreateFormRecognizerClient(out var nonInstrumentedClient);`
`@@ -75,6 +76,7 @@ public async Task RecognizeInvoicesOperationCanPollFromNewObject()`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`[RecordedTest]`
	`79`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`78`	`80`	`public async Task RecognizeIdDocumentsOperationCanPollFromNewObject()`
`79`	`81`	`{`
`80`	`82`	`var client = CreateFormRecognizerClient(out var nonInstrumentedClient);`
`@@ -126,6 +128,7 @@ public async Task TrainingOperationCanPollFromNewObject()`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`[RecordedTest]`
	`131`	`+ [ServiceVersion(Min = FormRecognizerClientOptions.ServiceVersion.V2_1_Preview_3)]`
`129`	`132`	`public async Task CreateComposedModelOperationCanPollFromNewObject()`
`130`	`133`	`{`
`131`	`134`	`var client = CreateFormTrainingClient(out var nonInstrumentedClient);`