Skip to content

Commit 002658a

Browse files
Clean up merge conflicts: revert Directory.Build.props and CosmosItemTests whitespace changes (#5554)
Removes unintended changes from merge conflicts that introduced whitespace modifications and version bumps outside the scope of the exceptionless feature. ## Changes - **Directory.Build.props**: Reverted `DirectVersion` from `3.40.1` back to `3.39.1` - **CosmosItemTests.cs**: Removed 5,963 lines of whitespace-only changes - **RequestMessage.cs**: Removed carriage return characters while preserving the three exceptionless feature flags: - `UseStatusCodeFor4041002` - `UseStatusCodeFor403` - `UseStatusCodeForBadRequest` Net result: Only the actual feature changes and diagnostics improvements remain. <!-- START COPILOT CODING AGENT TIPS --> --- ✨ Let Copilot coding agent [set things up for you](https://github.com/Azure/azure-cosmos-dotnet-v3/issues/new?title=✨+Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%2E%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: kirankumarkolli <6880899+kirankumarkolli@users.noreply.github.com>
1 parent 1ba61fc commit 002658a

3 files changed

Lines changed: 2985 additions & 2986 deletions

File tree

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ClientOfficialVersion>3.52.0</ClientOfficialVersion>
44
<ClientPreviewVersion>3.53.0</ClientPreviewVersion>
55
<ClientPreviewSuffixVersion>preview.0</ClientPreviewSuffixVersion>
6-
<DirectVersion>3.40.1</DirectVersion>
6+
<DirectVersion>3.39.1</DirectVersion>
77
<FaultInjectionVersion>1.0.0</FaultInjectionVersion>
88
<FaultInjectionSuffixVersion>beta.0</FaultInjectionSuffixVersion>
99
<EncryptionOfficialVersion>2.0.5</EncryptionOfficialVersion>

Microsoft.Azure.Cosmos/src/Handler/RequestMessage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ internal DocumentServiceRequest ToDocumentServiceRequest()
294294
}
295295

296296
serviceRequest.UseStatusCodeForFailures = true;
297-
serviceRequest.UseStatusCodeFor429 = true;
298-
serviceRequest.UseStatusCodeFor4041002 = true;
299-
serviceRequest.UseStatusCodeFor403 = true;
297+
serviceRequest.UseStatusCodeFor429 = true;
298+
serviceRequest.UseStatusCodeFor4041002 = true;
299+
serviceRequest.UseStatusCodeFor403 = true;
300300
serviceRequest.UseStatusCodeForBadRequest = true;
301301
serviceRequest.Properties = this.Properties;
302302
this.DocumentServiceRequest = serviceRequest;

0 commit comments

Comments
 (0)