Skip to content

Commit 0ed993a

Browse files
harshitha-cstkharshitha-cstk
authored
Merge pull request #165 from contentstack/development
DX | 27-04-2026 | Release
2 parents e7d24ff + d138123 commit 0ed993a

14 files changed

Lines changed: 1558 additions & 95 deletions

File tree

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Opens a PR from main → development after changes land on main (back-merge).
2+
3+
name: Back-merge main to development
4+
5+
on:
6+
push:
7+
branches: [main]
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
pull-requests: write
13+
14+
jobs:
15+
open-back-merge-pr:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Open back-merge PR if needed
24+
env:
25+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
run: |
27+
set -euo pipefail
28+
git fetch origin development main
29+
30+
MAIN_SHA=$(git rev-parse origin/main)
31+
DEV_SHA=$(git rev-parse origin/development)
32+
33+
if [ "$MAIN_SHA" = "$DEV_SHA" ]; then
34+
echo "main and development are at the same commit; nothing to back-merge."
35+
exit 0
36+
fi
37+
38+
EXISTING=$(gh pr list --repo "${{ github.repository }}" \
39+
--base development \
40+
--head main \
41+
--state open \
42+
--json number \
43+
--jq 'length')
44+
45+
if [ "$EXISTING" -gt 0 ]; then
46+
echo "An open PR from main to development already exists; skipping."
47+
exit 0
48+
fi
49+
50+
gh pr create --repo "${{ github.repository }}" \
51+
--base development \
52+
--head main \
53+
--title "chore: back-merge main into development" \
54+
--body "Automated back-merge after changes landed on \`main\`. Review and merge to keep \`development\` in sync."
55+
56+
echo "Created back-merge PR main → development."

‎.github/workflows/check-branch.yml‎

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

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

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
# Release-affecting changes under Contentstack.Management*/ or Directory.Build.props / core csproj
2+
# require Directory.Build.props Version + CHANGELOG.md updates vs latest tag.
3+
4+
name: Check Version Bump
5+
6+
on:
7+
pull_request:
8+
9+
jobs:
10+
version-bump:
11+
name: Version & changelog bump
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Detect changed files
20+
id: detect
21+
run: |
22+
FILES=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.event.pull_request.head.sha }}")
23+
echo "Changed files:"
24+
echo "$FILES"
25+
26+
CODE_CHANGED=false
27+
while IFS= read -r f; do
28+
[ -z "$f" ] && continue
29+
case "$f" in
30+
Contentstack.Management.Core.Unit.Tests/*|Contentstack.Management.Core.Tests/*)
31+
continue
32+
;;
33+
esac
34+
if [[ "$f" == "Directory.Build.props" ]] || \
35+
[[ "$f" == Contentstack.Management.Core/* ]] || \
36+
[[ "$f" == Contentstack.Management.ASPNETCore/* ]]; then
37+
CODE_CHANGED=true
38+
break
39+
fi
40+
done <<< "$FILES"
41+
42+
PROPS_CHANGED=false
43+
CHANGELOG_CHANGED=false
44+
echo "$FILES" | grep -qx 'Directory.Build.props' && PROPS_CHANGED=true
45+
echo "$FILES" | grep -qx 'CHANGELOG.md' && CHANGELOG_CHANGED=true
46+
47+
VERSION_FILES_OK=false
48+
if [ "$PROPS_CHANGED" = true ] && [ "$CHANGELOG_CHANGED" = true ]; then
49+
VERSION_FILES_OK=true
50+
fi
51+
52+
echo "code_changed=$CODE_CHANGED" >> "$GITHUB_OUTPUT"
53+
echo "version_files_ok=$VERSION_FILES_OK" >> "$GITHUB_OUTPUT"
54+
55+
- name: Skip when no release-affecting code changed
56+
if: steps.detect.outputs.code_changed != 'true'
57+
run: |
58+
echo "No management SDK / version props changes. Skipping version-bump check."
59+
exit 0
60+
61+
- name: Fail when version files were not both updated
62+
if: steps.detect.outputs.code_changed == 'true' && steps.detect.outputs.version_files_ok != 'true'
63+
run: |
64+
echo "::error::Bump <Version> in Directory.Build.props and add a ## [vX.Y.Z] section at the top of CHANGELOG.md."
65+
exit 1
66+
67+
- name: Validate version vs latest tag and changelog header
68+
if: steps.detect.outputs.code_changed == 'true' && steps.detect.outputs.version_files_ok == 'true'
69+
run: |
70+
set -euo pipefail
71+
PROJ_VERSION=$(python3 <<'PY'
72+
import re
73+
text = open("Directory.Build.props").read()
74+
m = re.search(r"<Version>\s*([^<]+)\s*</Version>", text)
75+
if not m:
76+
raise SystemExit("Could not read <Version> from Directory.Build.props")
77+
print(m.group(1).strip())
78+
PY
79+
)
80+
81+
git fetch --tags --force 2>/dev/null || true
82+
LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
83+
if [ -z "$LATEST_TAG" ]; then
84+
echo "No existing tags found. Skipping semver vs tag check."
85+
CHANGELOG_HEAD=$(sed -nE 's/^## \[v?([0-9]+\.[0-9]+\.[0-9]+)\].*/\1/p' CHANGELOG.md | head -1)
86+
if [ -z "$CHANGELOG_HEAD" ]; then
87+
echo "::error::Could not find a ## [vX.Y.Z] entry at the top of CHANGELOG.md."
88+
exit 1
89+
fi
90+
if [ "$CHANGELOG_HEAD" != "$PROJ_VERSION" ]; then
91+
echo "::error::CHANGELOG top version ($CHANGELOG_HEAD) does not match Directory.Build.props Version ($PROJ_VERSION)."
92+
exit 1
93+
fi
94+
exit 0
95+
fi
96+
97+
LATEST_VERSION="${LATEST_TAG#v}"
98+
LATEST_VERSION="${LATEST_VERSION%%-*}"
99+
if [ "$(printf '%s\n' "$LATEST_VERSION" "$PROJ_VERSION" | sort -V | tail -1)" != "$PROJ_VERSION" ]; then
100+
echo "::error::Version ($PROJ_VERSION) must be greater than latest tag ($LATEST_TAG)."
101+
exit 1
102+
fi
103+
if [ "$PROJ_VERSION" = "$LATEST_VERSION" ]; then
104+
echo "::error::Version ($PROJ_VERSION) must be strictly greater than latest tag version ($LATEST_VERSION)."
105+
exit 1
106+
fi
107+
108+
CHANGELOG_HEAD=$(sed -nE 's/^## \[v?([0-9]+\.[0-9]+\.[0-9]+)\].*/\1/p' CHANGELOG.md | head -1)
109+
if [ -z "$CHANGELOG_HEAD" ]; then
110+
echo "::error::Could not find a ## [vX.Y.Z] entry at the top of CHANGELOG.md."
111+
exit 1
112+
fi
113+
if [ "$CHANGELOG_HEAD" != "$PROJ_VERSION" ]; then
114+
echo "::error::CHANGELOG top version ($CHANGELOG_HEAD) does not match Directory.Build.props Version ($PROJ_VERSION)."
115+
exit 1
116+
fi
117+
echo "Version bump check passed: Directory.Build.props and CHANGELOG at $PROJ_VERSION (latest tag: $LATEST_TAG)."

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
| **Test (integration)** | `dotnet test Contentstack.Management.Core.Tests/Contentstack.Management.Core.Tests.csproj` — requires local `appsettings.json` with credentials (see [`skills/testing/SKILL.md`](skills/testing/SKILL.md)). |
3030
| **Pack (release)** | `dotnet pack -c Release -o out` (as in [`.github/workflows/nuget-publish.yml`](.github/workflows/nuget-publish.yml)). |
3131

32-
**CI:** [`.github/workflows/unit-test.yml`](.github/workflows/unit-test.yml) (unit tests on PR/push). **Branches:** PRs normally target **`development`**; **`main`** is for **hotfixes**. PRs **into `main`** must come from **`staging`** per [`.github/workflows/check-branch.yml`](.github/workflows/check-branch.yml).
32+
**CI:** [`.github/workflows/unit-test.yml`](.github/workflows/unit-test.yml) (unit tests on PR/push). **Branches:** feature work merges to **`development`**; **release PRs** are **`development` → `main`** (no `staging`). After `main` advances, [`.github/workflows/back-merge-pr.yml`](.github/workflows/back-merge-pr.yml) can open **`main` → `development`**. **Releases:** create a **GitHub Release** to run [`.github/workflows/nuget-publish.yml`](.github/workflows/nuget-publish.yml) (`release: created`). [`.github/workflows/check-version-bump.yml`](.github/workflows/check-version-bump.yml) enforces version + `CHANGELOG.md` on relevant PRs.
3333

3434
## Where the documentation lives: skills
3535

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [v0.9.0](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.9.0)
4+
- Fix
5+
- **Variant Group HTTP method correction**: Updated variant group link/unlink operations to use PUT method instead of POST for API compliance
6+
- Enhanced integration test coverage for variant group operations
7+
38
## [v0.8.0](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.8.0)
49
- Feat
510
- **Entry Variant support**

‎Contentstack.Management.Core.Tests/Contentstack.Management.Core.Tests.csproj‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
6-
<IsPackable>false</IsPackable>
7-
<ReleaseVersion>$(Version)</ReleaseVersion>
8-
9-
<SignAssembly>true</SignAssembly>
10-
<AssemblyOriginatorKeyFile>../CSManagementSDK.snk</AssemblyOriginatorKeyFile>
11-
</PropertyGroup>
12-
13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15-
<PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
16-
<PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
17-
<PackageReference Include="coverlet.collector" Version="6.0.4"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
<PrivateAssets>all</PrivateAssets>
19-
</PackageReference>
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.2" />
23-
<PackageReference Include="AutoFixture" Version="4.18.1" />
24-
<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
25-
<PackageReference Include="Moq" Version="4.20.72" />
26-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
27-
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
28-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<Folder Include="Helpers\" />
33-
<Folder Include="IntegrationTest\" />
34-
<Folder Include="Model\" />
35-
<Folder Include="Mock\" />
36-
</ItemGroup>
37-
38-
<ItemGroup>
39-
<EmbeddedResource Include="Mock\*.json" />
40-
</ItemGroup>
41-
42-
<ItemGroup>
43-
<Content Include="appSettings.json">
44-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45-
</Content>
46-
</ItemGroup>
47-
48-
<ItemGroup>
49-
<None Remove="Microsoft.AspNetCore.Http" />
50-
</ItemGroup>
51-
52-
<ItemGroup>
53-
<ProjectReference Include="..\Contentstack.Management.Core\contentstack.management.core.csproj" />
54-
</ItemGroup>
55-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net7.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
7+
<ReleaseVersion>$(Version)</ReleaseVersion>
8+
9+
<SignAssembly>true</SignAssembly>
10+
<AssemblyOriginatorKeyFile>../CSManagementSDK.snk</AssemblyOriginatorKeyFile>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15+
<PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
16+
<PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
17+
<PackageReference Include="coverlet.collector" Version="6.0.4"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
<PrivateAssets>all</PrivateAssets>
19+
</PackageReference>
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.2" />
23+
<PackageReference Include="AutoFixture" Version="4.18.1" />
24+
<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
25+
<PackageReference Include="Moq" Version="4.20.72" />
26+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
27+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
28+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<Folder Include="Helpers\" />
33+
<Folder Include="IntegrationTest\" />
34+
<Folder Include="Model\" />
35+
<Folder Include="Mock\" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<EmbeddedResource Include="Mock\*.json" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<Content Include="appSettings.json">
44+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45+
</Content>
46+
</ItemGroup>
47+
48+
<ItemGroup>
49+
<None Remove="Microsoft.AspNetCore.Http" />
50+
</ItemGroup>
51+
52+
<ItemGroup>
53+
<ProjectReference Include="..\Contentstack.Management.Core\contentstack.management.core.csproj" />
54+
</ItemGroup>
55+
</Project>

0 commit comments

Comments
 (0)