Merging master to DX-1473

.github/workflows/jira.yml

@@ -21,7 +21,7 @@ jobs:
           project: ${{ secrets.JIRA_PROJECT }}
           issuetype: ${{ secrets.JIRA_ISSUE_TYPE }}
           summary: |
-            ${{ github.event.pull_request.title }}
+            Snyk | Vulnerability | ${{ github.event.repository.name }} | ${{ github.event.pull_request.title }}
           description: |
             PR: ${{ github.event.pull_request.html_url }}
 

.github/workflows/sca-scan.yml

@@ -6,18 +6,10 @@ jobs:
   security-sca:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@master
-      - name: Setup .NET Core @ Latest
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: "7.0.x"
-      - name: Run Dotnet Restore
-        run: |
-          dotnet restore
+      - uses: actions/checkout@master
       - name: Run Snyk to check for vulnerabilities
         uses: snyk/actions/dotnet@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
-          args: --file=Contentstack.Core/obj/project.assets.json --fail-on=all
+          args: --fail-on=all

CHANGELOG.md

@@ -1,3 +1,9 @@
+### Version: 2.20.0
+#### Date: Dec-19-2024
+
+##### Fix: 
+- Reset `LivePreviewConfig` to prevent overwriting fetched data with live preview data during regular fetch calls.
+
 ### Version: 2.19.0
 #### Date: Nov-30-2024
 

CODEOWNERS

@@ -1 +1 @@
-* @contentstack/security-admin
+* @contentstack/security-admin

Contentstack.Core/ContentstackClient.cs

@@ -555,6 +555,10 @@ public void SetHeader(string key, string value)
         /// </example>
         public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
         {
+            this.LivePreviewConfig.LivePreview = null;
+            this.LivePreviewConfig.ContentTypeUID = null;
+            this.LivePreviewConfig.EntryUID = null;
+
             if (query.Keys.Contains("content_type_uid"))
             {
                 string contentTypeUID = null;
@@ -572,8 +576,6 @@ public async Task LivePreviewQueryAsync(Dictionary<string, string> query)
                 string hash = null;
                 query.TryGetValue("live_preview", out hash);
                 this.LivePreviewConfig.LivePreview = hash;
-            } else {
-                this.LivePreviewConfig.LivePreview = "init";
             }
             this.LivePreviewConfig.PreviewResponse = await GetLivePreviewData();
         }

Contentstack.Core/Internals/HttpRequestHandler.cs

@@ -48,7 +48,7 @@ public async Task<string> ProcessRequest(string Url, Dictionary<string, object>
             var request = (HttpWebRequest)WebRequest.Create(uri);
             request.Method = "GET";
             request.ContentType = "application/json";
-            request.Headers["x-user-agent"]="contentstack-delivery-dotnet/2.19.0";
+            request.Headers["x-user-agent"]="contentstack-delivery-dotnet/2.20.0";
             request.Timeout = timeout;
 
             if (proxy != null)

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>2.19.0</Version>
+    <Version>2.20.0</Version>
   </PropertyGroup>
 </Project>