Skip to content

Update Autorest C# #11013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pakrym merged 2 commits into from
Apr 2, 2020
Merged

Update Autorest C# #11013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29e49d6
Update Autorest C#
pakrym Apr 2, 2020
5a36f73
Merge branch 'master' into pakrym/update-generator-13
pakrym Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/CodeGeneration.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6207/autorest-3.0.6207.tgz</_AutoRestVersion>
<_AutoRestCoreVersion>3.0.6257</_AutoRestCoreVersion>
<_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200402.2/autorest-csharp-v3-3.0.0-dev.20200402.2.tgz</_AutoRestCSharpVersion>
<_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200402.6/autorest-csharp-v3-3.0.0-dev.20200402.6.tgz</_AutoRestCSharpVersion>
<_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
<_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
<AutorestInput Condition="'$(AutorestInput)' == ''">$(_DefaultInputName)</AutorestInput>
Expand Down
24 changes: 12 additions & 12 deletions sdk/formrecognizer/Azure.AI.FormRecognizer/src/CustomFormClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public virtual Operation<CustomModel> StartTraining(string source, TrainingFileF
trainRequest.SourceFilter = filter;
}

ResponseWithHeaders<TrainCustomModelAsyncHeaders> response = _operations.RestClient.TrainCustomModelAsync(trainRequest);
ResponseWithHeaders<ServiceTrainCustomModelAsyncHeaders> response = _operations.RestClient.TrainCustomModelAsync(trainRequest);
return new TrainingOperation(_operations, response.Headers.Location);
}

Expand All @@ -100,7 +100,7 @@ public virtual async Task<Operation<CustomModel>> StartTrainingAsync(string sour
trainRequest.SourceFilter = filter;
}

ResponseWithHeaders<TrainCustomModelAsyncHeaders> response = await _operations.RestClient.TrainCustomModelAsyncAsync(trainRequest).ConfigureAwait(false);
ResponseWithHeaders<ServiceTrainCustomModelAsyncHeaders> response = await _operations.RestClient.TrainCustomModelAsyncAsync(trainRequest).ConfigureAwait(false);
return new TrainingOperation(_operations, response.Headers.Location);
}

Expand All @@ -122,7 +122,7 @@ public virtual Operation<CustomLabeledModel> StartTrainingWithLabels(string sour
trainRequest.SourceFilter = filter;
}

ResponseWithHeaders<TrainCustomModelAsyncHeaders> response = _operations.RestClient.TrainCustomModelAsync(trainRequest);
ResponseWithHeaders<ServiceTrainCustomModelAsyncHeaders> response = _operations.RestClient.TrainCustomModelAsync(trainRequest);
return new TrainingWithLabelsOperation(_operations, response.Headers.Location);
}

Expand All @@ -144,7 +144,7 @@ public virtual async Task<Operation<CustomLabeledModel>> StartTrainingWithLabels
trainRequest.SourceFilter = filter;
}

ResponseWithHeaders<TrainCustomModelAsyncHeaders> response = await _operations.RestClient.TrainCustomModelAsyncAsync(trainRequest).ConfigureAwait(false);
ResponseWithHeaders<ServiceTrainCustomModelAsyncHeaders> response = await _operations.RestClient.TrainCustomModelAsyncAsync(trainRequest).ConfigureAwait(false);
return new TrainingWithLabelsOperation(_operations, response.Headers.Location);
}

Expand All @@ -168,7 +168,7 @@ public virtual Operation<IReadOnlyList<ExtractedPage>> StartExtractFormPages(str
{
// TODO: automate content-type detection
// https://github.com/Azure/azure-sdk-for-net/issues/10329
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), includeTextDetails: includeRawPageExtractions, contentType, stream, cancellationToken);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), contentType, stream, includeTextDetails: includeRawPageExtractions, cancellationToken);
return new ExtractPagesOperation(_operations, modelId, response.Headers.OperationLocation);
}

Expand All @@ -184,7 +184,7 @@ public virtual Operation<IReadOnlyList<ExtractedPage>> StartExtractFormPages(str
public virtual Operation<IReadOnlyList<ExtractedPage>> StartExtractFormPages(string modelId, Uri uri, bool includeRawPageExtractions = false, CancellationToken cancellationToken = default)
{
SourcePath_internal sourcePath = new SourcePath_internal() { Source = uri.ToString() };
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken);
return new ExtractPagesOperation(_operations, modelId, response.Headers.OperationLocation);
}

Expand All @@ -202,7 +202,7 @@ public virtual async Task<Operation<IReadOnlyList<ExtractedPage>>> StartExtractF
{
// TODO: automate content-type detection
// https://github.com/Azure/azure-sdk-for-net/issues/10329
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), includeTextDetails: includeRawPageExtractions, contentType, stream, cancellationToken).ConfigureAwait(false);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), contentType, stream, includeTextDetails: includeRawPageExtractions, cancellationToken).ConfigureAwait(false);
return new ExtractPagesOperation(_operations, modelId, response.Headers.OperationLocation);
}

Expand All @@ -219,7 +219,7 @@ public virtual async Task<Operation<IReadOnlyList<ExtractedPage>>> StartExtractF
public virtual async Task<Operation<IReadOnlyList<ExtractedPage>>> StartExtractFormPagesAsync(string modelId, Uri uri, bool includeRawPageExtractions = false, CancellationToken cancellationToken = default)
{
SourcePath_internal sourcePath = new SourcePath_internal() { Source = uri.ToString() };
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken).ConfigureAwait(false);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken).ConfigureAwait(false);
return new ExtractPagesOperation(_operations, modelId, response.Headers.OperationLocation);
}
#endregion
Expand All @@ -240,7 +240,7 @@ public virtual Operation<IReadOnlyList<ExtractedLabeledForm>> StartExtractLabele
{
// TODO: automate content-type detection
// https://github.com/Azure/azure-sdk-for-net/issues/10329
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), includeTextDetails: includeRawPageExtractions, contentType, stream, cancellationToken);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), contentType, stream, includeTextDetails: includeRawPageExtractions, cancellationToken);
return new ExtractLabeledFormOperation(_operations, modelId, response.Headers.OperationLocation);
}

Expand All @@ -256,7 +256,7 @@ public virtual Operation<IReadOnlyList<ExtractedLabeledForm>> StartExtractLabele
public virtual Operation<IReadOnlyList<ExtractedLabeledForm>> StartExtractLabeledForms(string modelId, Uri uri, bool includeRawPageExtractions = false, CancellationToken cancellationToken = default)
{
SourcePath_internal sourcePath = new SourcePath_internal() { Source = uri.ToString() };
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = _operations.RestClient.AnalyzeWithCustomModel(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken);
return new ExtractLabeledFormOperation(_operations, modelId, response.Headers.OperationLocation);
}

Expand All @@ -274,7 +274,7 @@ public virtual async Task<Operation<IReadOnlyList<ExtractedLabeledForm>>> StartE
{
// TODO: automate content-type detection
// https://github.com/Azure/azure-sdk-for-net/issues/10329
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), includeTextDetails: includeRawPageExtractions, contentType, stream, cancellationToken).ConfigureAwait(false);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), contentType, stream, includeTextDetails: includeRawPageExtractions, cancellationToken).ConfigureAwait(false);
return new ExtractLabeledFormOperation(_operations, modelId, response.Headers.OperationLocation);
}

Expand All @@ -290,7 +290,7 @@ public virtual async Task<Operation<IReadOnlyList<ExtractedLabeledForm>>> StartE
public virtual async Task<Operation<IReadOnlyList<ExtractedLabeledForm>>> StartExtractLabeledFormsAsync(string modelId, Uri uri, bool includeRawPageExtractions = false, CancellationToken cancellationToken = default)
{
SourcePath_internal sourcePath = new SourcePath_internal() { Source = uri.ToString() };
ResponseWithHeaders<AnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken).ConfigureAwait(false);
ResponseWithHeaders<ServiceAnalyzeWithCustomModelHeaders> response = await _operations.RestClient.AnalyzeWithCustomModelAsync(new Guid(modelId), includeTextDetails: includeRawPageExtractions, sourcePath, cancellationToken).ConfigureAwait(false);
return new ExtractLabeledFormOperation(_operations, modelId, response.Headers.OperationLocation);
}
#endregion
Expand Down
8 changes: 4 additions & 4 deletions sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormLayoutClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public virtual Operation<IReadOnlyList<ExtractedLayoutPage>> StartExtractLayouts
{
// TODO: automate content-type detection
// https://github.com/Azure/azure-sdk-for-net/issues/10329
ResponseWithHeaders<AnalyzeLayoutAsyncHeaders> response = _operations.RestClient.AnalyzeLayoutAsync(contentType, stream, cancellationToken);
ResponseWithHeaders<ServiceAnalyzeLayoutAsyncHeaders> response = _operations.RestClient.AnalyzeLayoutAsync(contentType, stream, cancellationToken);
return new ExtractLayoutOperation(_operations, response.Headers.OperationLocation);
}

Expand All @@ -81,7 +81,7 @@ public virtual async Task<Operation<IReadOnlyList<ExtractedLayoutPage>>> StartEx
{
// TODO: automate content-type detection
// https://github.com/Azure/azure-sdk-for-net/issues/10329
ResponseWithHeaders<AnalyzeLayoutAsyncHeaders> response = await _operations.RestClient.AnalyzeLayoutAsyncAsync(contentType, stream, cancellationToken).ConfigureAwait(false);
ResponseWithHeaders<ServiceAnalyzeLayoutAsyncHeaders> response = await _operations.RestClient.AnalyzeLayoutAsyncAsync(contentType, stream, cancellationToken).ConfigureAwait(false);
return new ExtractLayoutOperation(_operations, response.Headers.OperationLocation);
}

Expand All @@ -96,7 +96,7 @@ public virtual async Task<Operation<IReadOnlyList<ExtractedLayoutPage>>> StartEx
public virtual Operation<IReadOnlyList<ExtractedLayoutPage>> StartExtractLayouts(Uri uri, CancellationToken cancellationToken = default)
{
SourcePath_internal sourcePath = new SourcePath_internal() { Source = uri.ToString() };
ResponseWithHeaders<AnalyzeLayoutAsyncHeaders> response = _operations.RestClient.AnalyzeLayoutAsync(sourcePath, cancellationToken);
ResponseWithHeaders<ServiceAnalyzeLayoutAsyncHeaders> response = _operations.RestClient.AnalyzeLayoutAsync(sourcePath, cancellationToken);
return new ExtractLayoutOperation(_operations, response.Headers.OperationLocation);
}

Expand All @@ -111,7 +111,7 @@ public virtual Operation<IReadOnlyList<ExtractedLayoutPage>> StartExtractLayouts
public virtual async Task<Operation<IReadOnlyList<ExtractedLayoutPage>>> StartExtractLayoutsAsync(Uri uri, CancellationToken cancellationToken = default)
{
SourcePath_internal sourcePath = new SourcePath_internal() { Source = uri.ToString() };
ResponseWithHeaders<AnalyzeLayoutAsyncHeaders> response = await _operations.RestClient.AnalyzeLayoutAsyncAsync(sourcePath, cancellationToken).ConfigureAwait(false);
ResponseWithHeaders<ServiceAnalyzeLayoutAsyncHeaders> response = await _operations.RestClient.AnalyzeLayoutAsyncAsync(sourcePath, cancellationToken).ConfigureAwait(false);
return new ExtractLayoutOperation(_operations, response.Headers.OperationLocation);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...d/Operations/AnalyzeLayoutAsyncHeaders.cs → ...tions/ServiceAnalyzeLayoutAsyncHeaders.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .../Operations/AnalyzeReceiptAsyncHeaders.cs → ...ions/ServiceAnalyzeReceiptAsyncHeaders.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...erations/AnalyzeWithCustomModelHeaders.cs → ...s/ServiceAnalyzeWithCustomModelHeaders.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading