From 1c3e6add3a2e2b752b55c1cc8902e533f82c8964 Mon Sep 17 00:00:00 2001 From: OMpawar-21 Date: Tue, 30 Jun 2026 16:15:47 +0530 Subject: [PATCH 1/2] feat: upgrade to .NET 10 and bump version to 1.0.0-beta.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump main project TFM from net7.0 to net10.0 - Bump test project TFM from net9.0 to net10.0 - Update Microsoft.AspNetCore.Mvc.Testing 9.0.9 → 10.0.0 - Upgrade CI: actions/checkout@v1 → @v4, setup-dotnet@v3 → @v4 with dotnet-version 10.x - Fix pre-existing GetHeader visibility private → internal (unblocks 175 tests) - Bump PackageVersion and ReleaseVersion to 1.0.0-beta.1 - Update CHANGELOG.md --- .github/workflows/nuget-publish.yml | 19 +++++++++++-------- CHANGELOG.md | 8 ++++++++ .../contentstack.model.generator.tests.csproj | 4 ++-- .../CMA/ContentstackClient.cs | 2 +- .../contentstack.model.generator.csproj | 6 +++--- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml index 7b9df7f..f060255 100644 --- a/.github/workflows/nuget-publish.yml +++ b/.github/workflows/nuget-publish.yml @@ -5,13 +5,15 @@ on: release: types: [created] jobs: - publish-nuget: + publish-nuget: runs-on: windows-latest steps: - name: Checkout repository - uses: actions/checkout@v1 - - name: Setup .NET Core @ Latest - uses: actions/setup-dotnet@v3 + uses: actions/checkout@v4 + - name: Setup .NET 10 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '10.x' env: NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} - name: Build solution and generate NuGet package @@ -24,14 +26,15 @@ jobs: cd out dotnet nuget push "contentstack.model.generator.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols true --source https://api.nuget.org/v3/index.json - publish-git: + publish-git: runs-on: windows-latest steps: - name: Checkout repository - uses: actions/checkout@v1 - - name: Setup .NET Core @ Latest - uses: actions/setup-dotnet@v3 + uses: actions/checkout@v4 + - name: Setup .NET 10 + uses: actions/setup-dotnet@v4 with: + dotnet-version: '10.x' source-url: https://nuget.pkg.github.com/Contentstack/index.json env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index c7d402e..c59cc34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### Version: 1.0.0-beta.1 +#### Date: Jun-30-2026 + +- Upgraded target framework from net7.0 to net10.0 +- Updated CI/CD pipeline to use .NET 10 SDK (actions/setup-dotnet@v4) +- Updated Microsoft.AspNetCore.Mvc.Testing from 9.0.9 to 10.0.0 +- Fixed GetHeader method visibility (private → internal) to allow test access + ### Version: 0.5.1 #### Date: Jan-12-2026 diff --git a/contentstack.model.generator.tests/contentstack.model.generator.tests.csproj b/contentstack.model.generator.tests/contentstack.model.generator.tests.csproj index 76635fa..fc5e8cf 100644 --- a/contentstack.model.generator.tests/contentstack.model.generator.tests.csproj +++ b/contentstack.model.generator.tests/contentstack.model.generator.tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable false @@ -9,7 +9,7 @@ - + diff --git a/contentstack.model.generator/CMA/ContentstackClient.cs b/contentstack.model.generator/CMA/ContentstackClient.cs index 96d3041..86bd4a7 100644 --- a/contentstack.model.generator/CMA/ContentstackClient.cs +++ b/contentstack.model.generator/CMA/ContentstackClient.cs @@ -303,7 +303,7 @@ public async Task GetGlobalFields(int skip = 0) } } - private Dictionary GetHeader(Dictionary localHeader) + internal Dictionary GetHeader(Dictionary localHeader) { Dictionary mainHeader = _StackHeaders; Dictionary classHeaders = new Dictionary(); diff --git a/contentstack.model.generator/contentstack.model.generator.csproj b/contentstack.model.generator/contentstack.model.generator.csproj index 7112a5c..fddbe7d 100644 --- a/contentstack.model.generator/contentstack.model.generator.csproj +++ b/contentstack.model.generator/contentstack.model.generator.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net10.0 contentstack.model.generator Copyright © 2012-2026 Contentstack. All Rights Reserved en-US @@ -13,9 +13,9 @@ true ./nupkg true - 0.5.1 + 1.0.0-beta.1 Contentstack - 0.5.1 + 1.0.0-beta.1 Contentstack.Model.Generator LICENSE.txt Improved Error messages From e092611ae07fc4146bbd235b1ecd8fee3709760f Mon Sep 17 00:00:00 2001 From: OM PAWAR Date: Tue, 30 Jun 2026 17:13:50 +0530 Subject: [PATCH 2/2] Update CHANGELOG with new version entries --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c59cc34..d23cbd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ### Version: 1.0.0-beta.1 -#### Date: Jun-30-2026 +#### Date: - Upgraded target framework from net7.0 to net10.0 - Updated CI/CD pipeline to use .NET 10 SDK (actions/setup-dotnet@v4)