Commit 002658a
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
- Microsoft.Azure.Cosmos
- src/Handler
- tests/Microsoft.Azure.Cosmos.EmulatorTests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
294 | 294 | | |
295 | 295 | | |
296 | 296 | | |
297 | | - | |
298 | | - | |
299 | | - | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
300 | 300 | | |
301 | 301 | | |
302 | 302 | | |
| |||
0 commit comments