Merge pull request #36 from contentstack/next

Remove default locale for query; Fix packaging issues;
contentstack · Apr 18, 2024 · b3a616f · b3a616f
2 parents 571f9ab + 715e4c0
commit b3a616f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml
@@ -21,7 +21,6 @@ jobs:
       - name: Push generated package to GitHub registry
         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:  

diff --git a/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj b/Contentstack.AspNetCore/Contentstack.AspNetCore.csproj
@@ -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>
diff --git a/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj b/Contentstack.Core.Tests/Contentstack.Core.Tests.csproj
@@ -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>

diff --git a/Contentstack.Core.Tests/StackConfig.cs b/Contentstack.Core.Tests/StackConfig.cs
@@ -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));

diff --git a/Contentstack.Core/Contentstack.Core.csproj b/Contentstack.Core/Contentstack.Core.csproj
@@ -13,35 +13,37 @@
     <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\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
-    <Content Include="..\CHANGELOG.md">
+    <None Include="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
+    <None Include="..\CHANGELOG.md">
       <Link>CHANGELOG.md</Link>
-    </Content>
-    <Content Include="..\README.md">
+    </None>
+    <None Include="..\README.md" Pack="true" PackagePath="README.md">
       <Link>README.md</Link>
-    </Content>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Internals\" />

diff --git a/Contentstack.Core/Models/Query.cs b/Contentstack.Core/Models/Query.cs
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ jobs: @@
           - name: Push generated package to GitHub registry
             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:
@@ Expand Down @@