Skip to content

Commit 3f49e4b

Browse files
committed
Revert "Merge branch 'development' into enhc/DX-7269"
This reverts commit adaaf89, reversing changes made to 9706449.
1 parent adaaf89 commit 3f49e4b

34 files changed

Lines changed: 109 additions & 8647 deletions

.cursor/rules/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/back-merge-pr.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/check-branch.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Check Branch'
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check_branch:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Comment PR
11+
if: github.base_ref == 'master' && github.head_ref != 'staging'
12+
uses: thollander/actions-comment-pull-request@v2
13+
with:
14+
message: |
15+
We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
16+
- name: Check branch
17+
if: github.base_ref == 'master' && github.head_ref != 'staging'
18+
run: |
19+
echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
20+
exit 1

.github/workflows/check-version-bump.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

AGENTS.md

Lines changed: 0 additions & 49 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### Version: 2.27.0
1+
### Version: 3.0.0-beta.2
22
#### Date: Jun-22-2026
33

44
##### Feat:
@@ -14,6 +14,30 @@
1414
- Added `build/contentstack.csharp.targets` to auto-deliver `refresh-region.py` to consumer projects on first build
1515
- Added `Assets/regions.json` to `.gitignore`
1616
- Added `EndpointTest.cs`
17+
18+
---
19+
20+
### Version: 3.0.0-beta.1
21+
#### Date: May-04-2026
22+
23+
##### Breaking Changes:
24+
- Removed `Newtonsoft.Json` dependency; all JSON serialisation now uses `System.Text.Json` (BCL)
25+
- `AssetJsonConverter` and `EntryJsonConverter` now implement `System.Text.Json.Serialization.JsonConverter<T>`
26+
- `ContentstackCollection<T>` no longer carries `[JsonObject]`; direct `JsonSerializer` usage on this type is not supported
27+
- Updated `contentstack.utils` from `1.0.6` to `2.0.0-beta.1` (major version bump)
28+
29+
##### Feat:
30+
- Migrated all internal JSON handling to `System.Text.Json`
31+
- Added `ApiErrorBodyParser` for consistent API error envelope parsing
32+
- Added `JsonNodeConversion` and `JsonObjectMerge` utilities to replace Newtonsoft equivalents
33+
- Added `ContentstackJsonDefaults` — shared `JsonSerializerOptions` used across all custom converters
34+
35+
##### Enh:
36+
- Replaced `Console.WriteLine` with `Debug.WriteLine` in `ContentstackConvert` to suppress parse warnings from application stdout
37+
38+
##### Chore:
39+
- Updated .NET version in SCA scan CI from `7.0.x` to `10.0.x`
40+
1741
---
1842

1943
### Version: 2.26.0

Contentstack.Core.Tests/Contentstack.Core.Tests.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.2.10" />
2828
<PackageReference Include="AutoFixture" Version="4.18.1" />
2929
<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
30-
31-
<PackageReference Include="Fare" Version="2.2.2" />
32-
33-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
34-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
3530
<PackageReference Include="Moq" Version="4.20.72" />
3631
</ItemGroup>
3732

@@ -64,4 +59,4 @@
6459
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6560
</None>
6661
</ItemGroup>
67-
</Project>
62+
</Project>

0 commit comments

Comments
 (0)