Skip to content

Commit

Permalink
Merge branch 'master' into storage/stg74base
Browse files Browse the repository at this point in the history
  • Loading branch information
ljian3377 committed Oct 10, 2020
2 parents 14b4081 + 71e613e commit c4bbf5b
Show file tree
Hide file tree
Showing 46 changed files with 725 additions and 1,038 deletions.
2 changes: 1 addition & 1 deletion eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ $shell, $shellExportFormat = if (($parentProcessName = (Get-Process -Id $PID).Pa
} elseif (@('bash', 'csh', 'tcsh', 'zsh') -contains $parentProcessName) {
'shell', 'export {0}={1}'
} else {
'PowerShell', '$env:{0} = ''{1}'''
'PowerShell', '${{env:{0}}} = ''{1}'''
}

# Deploy the templates
Expand Down
32 changes: 16 additions & 16 deletions eng/common/TestResources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ Along with some log messages, this will output environment variables based on
your current shell like in the following example:

```powershell
$env:AZURE_TENANT_ID = '<<secret>>'
$env:AZURE_CLIENT_ID = '<<secret>>'
$env:AZURE_CLIENT_SECRET = '<<secret>>'
$env:AZURE_SUBSCRIPTION_ID = 'YOUR SUBSCRIPTION ID'
$env:AZURE_RESOURCE_GROUP = 'rg-myusername'
$env:AZURE_LOCATION = 'westus2'
$env:AZURE_SEARCH_STORAGE_NAME = 'myusernamestg'
$env:AZURE_SEARCH_STORAGE_KEY = '<<secret>>'
${env:AZURE_TENANT_ID} = '<<secret>>'
${env:AZURE_CLIENT_ID} = '<<secret>>'
${env:AZURE_CLIENT_SECRET} = '<<secret>>'
${env:AZURE_SUBSCRIPTION_ID} = 'YOUR SUBSCRIPTION ID'
${env:AZURE_RESOURCE_GROUP} = 'rg-myusername'
${env:AZURE_LOCATION} = 'westus2'
${env:AZURE_SEARCH_STORAGE_NAME} = 'myusernamestg'
${env:AZURE_SEARCH_STORAGE_KEY} = '<<secret>>'
```

For security reasons we do not set these environment variables automatically
Expand All @@ -62,14 +62,14 @@ applications started outside the terminal, you could copy and paste the
following commands:

```powershell
setx AZURE_TENANT_ID $env:AZURE_TENANT_ID
setx AZURE_CLIENT_ID $env:AZURE_CLIENT_ID
setx AZURE_CLIENT_SECRET $env:AZURE_CLIENT_SECRET
setx AZURE_SUBSCRIPTION_ID $env:AZURE_SUBSCRIPTION_ID
setx AZURE_RESOURCE_GROUP $env:AZURE_RESOURCE_GROUP
setx AZURE_LOCATION $env:AZURE_LOCATION
setx AZURE_SEARCH_STORAGE_NAME $env:AZURE_SEARCH_STORAGE_NAME
setx AZURE_SEARCH_STORAGE_KEY $env:AZURE_SEARCH_STORAGE_KEY
setx AZURE_TENANT_ID ${env:AZURE_TENANT_ID}
setx AZURE_CLIENT_ID ${env:AZURE_CLIENT_ID}
setx AZURE_CLIENT_SECRET ${env:AZURE_CLIENT_SECRET}
setx AZURE_SUBSCRIPTION_ID ${env:AZURE_SUBSCRIPTION_ID}
setx AZURE_RESOURCE_GROUP ${env:AZURE_RESOURCE_GROUP}
setx AZURE_LOCATION ${env:AZURE_LOCATION}
setx AZURE_SEARCH_STORAGE_NAME ${env:AZURE_SEARCH_STORAGE_NAME}
setx AZURE_SEARCH_STORAGE_KEY ${env:AZURE_SEARCH_STORAGE_KEY}
```

After running or recording live tests, if you do not plan on further testing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@azure/cognitiveservices-computervision",
"author": "Microsoft Corporation",
"description": "ComputerVisionClient Library with typescript type definitions for node.js and browser.",
"version": "7.0.1",
"version": "7.1.0",
"dependencies": {
"@azure/ms-rest-js": "^2.0.4",
"tslib": "^1.10.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import * as msRest from "@azure/ms-rest-js";

const packageName = "@azure/cognitiveservices-computervision";
const packageVersion = "7.0.1";
const packageVersion = "7.1.0";

export class ComputerVisionClientContext extends msRest.ServiceClient {
endpoint: string;
Expand Down Expand Up @@ -42,7 +42,7 @@ export class ComputerVisionClientContext extends msRest.ServiceClient {

super(credentials, options);

this.baseUri = "{Endpoint}/vision/v3.0";
this.baseUri = "{Endpoint}/vision/v3.1";
this.requestContentType = "application/json; charset=utf-8";
this.endpoint = endpoint;
this.credentials = credentials;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -864,12 +864,12 @@ export interface ComputerVisionClientGenerateThumbnailOptionalParams extends msR
*/
export interface ComputerVisionClientReadOptionalParams extends msRest.RequestOptionsBase {
/**
* The BCP-47 language code of the text to be detected in the image. In future versions, when
* language parameter is not passed, language detection will be used to determine the language.
* However, in the current version, missing language parameter will cause English to be used. To
* ensure that your document is always parsed in English without the use of language detection in
* the future, pass “en” in the language parameter. Possible values include: 'en', 'es', 'fr',
* 'de', 'it', 'nl', 'pt'. Default value: 'en'.
* The BCP-47 language code of the text in the document. Currently, only English ('en'), Dutch
* (‘nl’), French (‘fr’), German (‘de’), Italian (‘it’), Portuguese (‘pt), and Spanish ('es') are
* supported. Read supports auto language identification and multi-language documents, so only
* provide a language code if you would like to force the documented to be processed as that
* specific language. Possible values include: 'en', 'es', 'fr', 'de', 'it', 'nl', 'pt'. Default
* value: 'en'.
*/
language?: OcrDetectionLanguage;
}
Expand Down Expand Up @@ -988,12 +988,12 @@ export interface ComputerVisionClientTagImageInStreamOptionalParams extends msRe
*/
export interface ComputerVisionClientReadInStreamOptionalParams extends msRest.RequestOptionsBase {
/**
* The BCP-47 language code of the text to be detected in the image. In future versions, when
* language parameter is not passed, language detection will be used to determine the language.
* However, in the current version, missing language parameter will cause English to be used. To
* ensure that your document is always parsed in English without the use of language detection in
* the future, pass “en” in the language parameter. Possible values include: 'en', 'es', 'fr',
* 'de', 'it', 'nl', 'pt'. Default value: 'en'.
* The BCP-47 language code of the text in the document. Currently, only English ('en'), Dutch
* (‘nl’), French (‘fr’), German (‘de’), Italian (‘it’), Portuguese (‘pt), and Spanish ('es') are
* supported. Read supports auto language identification and multi-language documents, so only
* provide a language code if you would like to force the documented to be processed as that
* specific language. Possible values include: 'en', 'es', 'fr', 'de', 'it', 'nl', 'pt'. Default
* value: 'en'.
*/
language?: OcrDetectionLanguage;
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from "./Constants";
export * from "./Generated";
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface TelemetryItem {
/**
* Event date time when telemetry item was created. This is the wall clock time on the client when the event was generated. There is no guarantee that the client's time is accurate. This field must be formatted in UTC ISO 8601 format, with a trailing 'Z' character, as described publicly on https://en.wikipedia.org/wiki/ISO_8601#UTC. Note: the number of decimal seconds digits provided are variable (and unspecified). Consumers should handle this, i.e. managed code consumers should not use format 'O' for parsing as it specifies a fixed length. Example: 2009-06-15T13:45:30.0000000Z.
*/
time: string;
time: Date;
/**
* Sampling rate used in application. This telemetry item represents 1 / sampleRate actual telemetry items.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const TelemetryItem: coreHttp.CompositeMapper = {
serializedName: "time",
required: true,
type: {
name: "String"
name: "DateTime"
}
},
sampleRate: {
Expand Down
Loading

0 comments on commit c4bbf5b

Please sign in to comment.