Skip to content

Commit

Permalink
Merge branch 'main' into swjai/f2
Browse files Browse the repository at this point in the history
  • Loading branch information
swjai authored Jul 31, 2024
2 parents d4159b7 + 7ed015e commit 2ed7e8e
Show file tree
Hide file tree
Showing 544 changed files with 63,312 additions and 677 deletions.
24 changes: 12 additions & 12 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen @Azure/api-stewardship-board

# PRLabel: %Container Apps
/specification/app/ @jijohn14 @Juliehzl
/specification/app/ @Juliehzl

# PRLabel: %Code Signing
/specification/codesigning/data-plane @Azure/api-stewardship-board
Expand All @@ -62,7 +62,7 @@
/specification/billing/ @wilcobmsft @asarkar84

# PRLabel: %Network - CDN
/specification/cdn/ @jorinmejia @yunhemsft @jessicl-ms @rrahulms @t-bzhan @ChenglongLiu
/specification/cdn/ @jorinmejia @yunhemsft @jessicl-ms @rrahulms @ChenglongLiu @Ptnan7

# PRLabel: %Cognitive Services
/specification/cognitiveservices/ @felixwa @yangyuan
Expand Down Expand Up @@ -275,13 +275,13 @@
###########
# Eng Sys
###########
/.gitattributes @weshaggard @mikeharder @konrad-jamrozik
/.gitignore @weshaggard @mikeharder @konrad-jamrozik
/.prettierrc.json @weshaggard @mikeharder @konrad-jamrozik
/package-lock.json @weshaggard @mikeharder @konrad-jamrozik
/package.json @weshaggard @mikeharder @konrad-jamrozik
/tsconfig.json @weshaggard @mikeharder @konrad-jamrozik
/.azure-pipelines/ @weshaggard @mikeharder @konrad-jamrozik @benbp
/.github/ @weshaggard @mikeharder @konrad-jamrozik @benbp
/eng/ @weshaggard @mikeharder @konrad-jamrozik @benbp
/scripts/ @weshaggard @mikeharder @konrad-jamrozik
/.gitattributes @weshaggard @mikeharder
/.gitignore @weshaggard @mikeharder
/.prettierrc.json @weshaggard @mikeharder
/package-lock.json @weshaggard @mikeharder
/package.json @weshaggard @mikeharder
/tsconfig.json @weshaggard @mikeharder
/.azure-pipelines/ @weshaggard @mikeharder @benbp
/.github/ @weshaggard @mikeharder @benbp
/eng/ @weshaggard @mikeharder @benbp
/scripts/ @weshaggard @mikeharder
4 changes: 2 additions & 2 deletions documentation/onboard-dpg-in-sdkautomation/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See [Use SDK Automation from REST API specifications](https://github.com/Azure/a
package-dir: "azure-ai-openai"
flavor: azure
namespace: "com.azure.ai.openai"
examples-directory: "examples"
examples-directory: "{project-root}/examples"
```
## Example for Java management-plane SDK
Expand All @@ -33,7 +33,7 @@ See [Use SDK Automation from REST API specifications](https://github.com/Azure/a
flavor: "azure"
namespace: "com.azure.resourcemanager.standbypool"
service-name: "Standby Pool"
examples-directory: "examples"
examples-directory: "{project-root}/examples"
```

# Add AutoRest Configuration for Java SDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ options:
# package-dir: "azure-resourcemanager-appcomplianceautomation"
# namespace: "com.azure.resourcemanager.appcomplianceautomation"
# service-name: "App Compliance Automation"
# examples-directory: "examples"
# examples-directory: "{project-root}/examples"
linter:
extends:
- "@azure-tools/typespec-azure-rulesets/resource-manager"
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ options:
package-dir: "azure-resourcemanager-computefleet"
namespace: com.azure.resourcemanager.computefleet
service-name: Compute Fleet
examples-directory: "examples"
examples-directory: "{project-root}/examples"
flavor: azure
6 changes: 5 additions & 1 deletion specification/batch/Azure.Batch/common.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ alias BatchCommonListHeaders = {
@minValue(1)
@maxValue(1000)
@clientName("maxPageSize", "java")
@clientName("max_results", "python")
maxresults?: int32 = 1000;
};

Expand Down Expand Up @@ -380,7 +381,10 @@ alias BatchClientRequestHeaders = {
The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.".
""")
@query
@clientName("timeOutInSeconds")
@clientName("timeOutInSeconds", "java")
@clientName("timeOutInSeconds", "csharp")
@clientName("timeOutInSeconds", "javascript")
@clientName("timeout", "python")
timeOut?: int32 = 30;

@doc("""
Expand Down
2 changes: 1 addition & 1 deletion specification/cognitiveservices/ContentSafety/client.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "./main.tsp";
using Azure.ClientGenerator.Core;

@TypeSpec.Versioning.useDependency(Azure.Core.Versions.v1_0_Preview_2)
@TypeSpec.Versioning.useDependency(ContentSafety.Versions.v2023_10_01)
@TypeSpec.Versioning.useDependency(ContentSafety.Versions.v2024_02_15_Preview)
namespace Customizations;

@client({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ options:
"@azure-tools/typespec-java":
package-dir: "azure-ai-contentsafety"
namespace: com.azure.ai.contentsafety
examples-directory: examples
examples-directory: "{project-root}/examples"
partial-update: true
flavor: azure
api-version: "2023-10-01"
Loading

0 comments on commit 2ed7e8e

Please sign in to comment.