Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/32793 default locale empty #35

Merged
merged 6 commits into from
Apr 15, 2024
Merged

Fix/32793 default locale empty #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6e3bc7
Merge pull request #32 from contentstack/next
nadeem-cs Feb 2, 2024
7b76b9f
Merge pull request #34 from contentstack/next
nadeem-cs Apr 5, 2024
b4cf1a3
Update nuget-publish.yml
nadeem-cs Apr 8, 2024
571f9ab
Update Contentstack.Core.csproj
nadeem-cs Apr 8, 2024
0ad36b2
fix: :bug: remove default locale for query
nadeem-cs Apr 14, 2024
b217fdc
build: update csproj files to fix packing and Readme inclusion
nadeem-cs Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/nuget-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v1
- name: Setup .NET Core @ Latest
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
uses: actions/setup-dotnet@v3
env:
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_AUTH_TOKEN }}
- name: Build solution and generate NuGet package
run: |
cd contentstack-dotnet
dotnet pack -c Release -o out

- name: Push generated package to GitHub registry
run: dotnet nuget push ./contentstack-dotnet/out/*.nupkg --api-key $NUGET_AUTH_TOKEN --skip-duplicate --no-symbols true
run: |
cd out
ls
dotnet nuget push "contentstack.csharp.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols true --source https://api.nuget.org/v3/index.json

publish-git:
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v1
- name: Setup .NET Core @ Latest
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '3.1.x'
source-url: https://nuget.pkg.github.com/Contentstack/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build solution and generate NuGet package
run: |
cd contentstack-dotnet
dotnet pack -c Release -o out

- name: Push generated package to GitHub registry
run: dotnet nuget push ./contentstack-dotnet/out/*.nupkg --api-key $NUGET_AUTH_TOKEN --skip-duplicate --no-symbols true
run: |
cd out
dotnet nuget push "contentstack.csharp.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols true --source https://api.nuget.org/v3/index.json
15 changes: 8 additions & 7 deletions Contentstack.AspNetCore/Contentstack.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,30 @@
<PackageId>contentstack.aspnetcore</PackageId>
<Authors>Contentstack</Authors>
<Owners>Contentstack</Owners>
<PackageVersion>2.12.0</PackageVersion>
<PackageVersion>$(Version)</PackageVersion>
<Description>Main release</Description>
<Copyright>Copyright (c) 2012-2024 Contentstack (http://app.contentstack.com). All Rights Reserved</Copyright>
<PackageProjectUrl>https://github.com/contentstack/contentstack-dotnet</PackageProjectUrl>
<PackageTags>v2.12.0</PackageTags>
<ReleaseVersion>2.12.0</ReleaseVersion>
<PackageTags>v$(Version)</PackageTags>
<ReleaseVersion>$(Version)</ReleaseVersion>
<Configurations>Release;Debug</Configurations>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType></DebugType>
<DebugType>None</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="Contentstack.Core">
<HintPath>..\Contentstack.Core\bin\Debug\Contentstack.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="NuGet.Build.Packaging" Version="0.2.2"><PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="contentstack.csharp" Version="2.10.0" />
<PackageReference Include="contentstack.csharp" Version="2.12.0" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions Contentstack.Core.Tests/Contentstack.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Contentstack.Core.Tests/StackConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static ContentstackClient GetStack()
Environment = environment,
Host = host,
Timeout = 4500,
Proxy = new System.Net.WebProxy("http://example.com:8080")
//Proxy = new System.Net.WebProxy("http://example.com:8080")
};

ContentstackClient contentstackClient = new ContentstackClient(new OptionsWrapper<Configuration.ContentstackOptions>(contentstackOptions));
Expand Down
12 changes: 7 additions & 5 deletions Contentstack.Core/Contentstack.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,25 @@
<PackageTags>v$(Version)</PackageTags>
<PackageProjectUrl>https://github.com/contentstack/contentstack-dotnet</PackageProjectUrl>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ReleaseVersion>$(Version)</ReleaseVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType></DebugType>
<DebugType>None</DebugType>
<DebugSymbols>false</DebugSymbols>
<WarningLevel></WarningLevel>
<WarningLevel></WarningLevel>
<NoWarn></NoWarn>
<AllowUnsafeBlocks></AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Markdig" Version="0.33.0" />
<PackageReference Include="contentstack.utils" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageReference Include="Markdig" Version="0.36.2" />
<PackageReference Include="contentstack.utils" Version="1.0.2" />
</ItemGroup>
<ItemGroup>
<None Remove="Interfaces\" />
Expand All @@ -39,7 +41,7 @@
<None Include="..\CHANGELOG.md">
<Link>CHANGELOG.md</Link>
</None>
<None Include="..\README.md">
<None Include="..\README.md" Pack="true" PackagePath="README.md">
<Link>README.md</Link>
</None>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Contentstack.Core/Models/Query.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ internal static ContentstackException GetContentstackError(Exception ex)
internal void SetContentTypeInstance(ContentType contentTypeInstance)
{
this.ContentTypeInstance = contentTypeInstance;
SetLocale("en-us");
//SetLocale("en-us");
}

#endregion
Expand Down
Loading