Skip to content

eng, add apply patches as post sdk-sync step #3178

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
weidongxu-microsoft merged 6 commits into from
Aug 13, 2025
Merged

eng, add apply patches as post sdk-sync step #3178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb6bf6a
update commit ID for ARM module
weidongxu-microsoft Aug 8, 2025
d6606cd
patches
weidongxu-microsoft Aug 8, 2025
0b33ca0
apply patches in script
weidongxu-microsoft Aug 8, 2025
be96d9a
rename to core.patch
weidongxu-microsoft Aug 8, 2025
4391f5c
comment out commit ID bump
weidongxu-microsoft Aug 8, 2025
1d48bfd
Merge branch 'main' into eng_sync-sdk-bump-commit
weidongxu-microsoft Aug 12, 2025
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 Build-AutoRest.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Write-Host "Apply diff to core"
Push-Location ./core
try {
git checkout .
git apply ../core.diff --ignore-whitespace
git apply ../core.patch --ignore-whitespace
} finally {
Pop-Location
}
Expand Down
2 changes: 1 addition & 1 deletion Build-TypeSpec.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Write-Host "Apply diff to core"
Push-Location ./core
try {
git checkout .
git apply ../core.diff --ignore-whitespace
git apply ../core.patch --ignore-whitespace
} finally {
Pop-Location
}
Expand Down
0 core.diff → core.patch
View file
Open in desktop
Copy link
Member Author

@weidongxu-microsoft weidongxu-microsoft Aug 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file name change is not due to the adding of patches in "sync_sdk" apply_patches

Just my feeling that we'd better to make this file .patch too (instead of .diff).

File renamed without changes.
2 changes: 1 addition & 1 deletion eng/pipelines/jobs/build-autorest-mgmt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- script: |
git checkout .
git apply ../core.diff --ignore-whitespace
git apply ../core.patch --ignore-whitespace
displayName: 'Patch core'
workingDirectory: ./core

Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/jobs/build-autorest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- script: |
git checkout .
git apply ../core.diff --ignore-whitespace
git apply ../core.patch --ignore-whitespace
displayName: 'Patch core'
workingDirectory: ./core

Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/publish-autorest-java.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extends:

- script: |
git checkout .
git apply ../core.diff --ignore-whitespace
git apply ../core.patch --ignore-whitespace
displayName: 'Patch core'
workingDirectory: ./core

Expand Down
2,009 changes: 2,009 additions & 0 deletions eng/sdk/patches/0001-revert-impl-in-batch.patch
View file
Open in desktop

Large diffs are not rendered by default.

268 changes: 268 additions & 0 deletions eng/sdk/patches/0001-revert-impl-in-communication.patch
View file
Open in desktop

Large diffs are not rendered by default.

99 changes: 99 additions & 0 deletions eng/sdk/patches/0001-revert-impl-in-contentsafety.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
From 1185f9ded7e644d6b64c955c2faa9422765eea24 Mon Sep 17 00:00:00 2001
From: Weidong Xu <[email protected]>
Date: Thu, 7 Aug 2025 14:28:55 +0800
Subject: [PATCH] revert impl in contentsafety

---
.../implementation/BlocklistClientImpl.java | 24 +++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java
index e7e96b52ccf..727d27c5547 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java
+++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java
@@ -216,7 +216,7 @@ public final class BlocklistClientImpl {
@UnexpectedResponseExceptionType(HttpResponseException.class)
Mono<Response<Void>> deleteTextBlocklist(@HostParam("endpoint") String endpoint,
@QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
- RequestOptions requestOptions, Context context);
+ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);

@Delete("/text/blocklists/{blocklistName}")
@ExpectedResponses({ 204 })
@@ -226,7 +226,7 @@ public final class BlocklistClientImpl {
@UnexpectedResponseExceptionType(HttpResponseException.class)
Response<Void> deleteTextBlocklistSync(@HostParam("endpoint") String endpoint,
@QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
- RequestOptions requestOptions, Context context);
+ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);

@Get("/text/blocklists/{blocklistName}")
@ExpectedResponses({ 200 })
@@ -318,8 +318,8 @@ public final class BlocklistClientImpl {
@UnexpectedResponseExceptionType(HttpResponseException.class)
Mono<Response<Void>> removeBlocklistItems(@HostParam("endpoint") String endpoint,
@QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData options,
- RequestOptions requestOptions, Context context);
+ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+ @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);

@Post("/text/blocklists/{blocklistName}:removeBlocklistItems")
@ExpectedResponses({ 204 })
@@ -329,8 +329,8 @@ public final class BlocklistClientImpl {
@UnexpectedResponseExceptionType(HttpResponseException.class)
Response<Void> removeBlocklistItemsSync(@HostParam("endpoint") String endpoint,
@QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData options,
- RequestOptions requestOptions, Context context);
+ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+ @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);

@Get("{nextLink}")
@ExpectedResponses({ 200 })
@@ -587,8 +587,9 @@ public final class BlocklistClientImpl {
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Response<Void>> deleteTextBlocklistWithResponseAsync(String name, RequestOptions requestOptions) {
+ final String accept = "application/json";
return FluxUtil.withContext(context -> service.deleteTextBlocklist(this.getEndpoint(),
- this.getServiceVersion().getVersion(), name, requestOptions, context));
+ this.getServiceVersion().getVersion(), name, accept, requestOptions, context));
}

/**
@@ -606,7 +607,8 @@ public final class BlocklistClientImpl {
*/
@ServiceMethod(returns = ReturnType.SINGLE)
public Response<Void> deleteTextBlocklistWithResponse(String name, RequestOptions requestOptions) {
- return service.deleteTextBlocklistSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name,
+ final String accept = "application/json";
+ return service.deleteTextBlocklistSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, accept,
requestOptions, Context.NONE);
}

@@ -1126,8 +1128,9 @@ public final class BlocklistClientImpl {
public Mono<Response<Void>> removeBlocklistItemsWithResponseAsync(String name, BinaryData options,
RequestOptions requestOptions) {
final String contentType = "application/json";
+ final String accept = "application/json";
return FluxUtil.withContext(context -> service.removeBlocklistItems(this.getEndpoint(),
- this.getServiceVersion().getVersion(), name, contentType, options, requestOptions, context));
+ this.getServiceVersion().getVersion(), name, contentType, accept, options, requestOptions, context));
}

/**
@@ -1159,8 +1162,9 @@ public final class BlocklistClientImpl {
public Response<Void> removeBlocklistItemsWithResponse(String name, BinaryData options,
RequestOptions requestOptions) {
final String contentType = "application/json";
+ final String accept = "application/json";
return service.removeBlocklistItemsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name,
- contentType, options, requestOptions, Context.NONE);
+ contentType, accept, options, requestOptions, Context.NONE);
}

/**
--
2.50.1.windows.1

Loading
Loading