From 5dedfe92954a5943d2dbfe451135077095e5aa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ton=C4=87i=20Vatavuk?= Date: Mon, 7 Feb 2022 14:09:14 +0100 Subject: [PATCH 1/2] fix oqtane#1987 Nuspec to include 'content' ('contentFiles') --- Oqtane.Server/Infrastructure/InstallationManager.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 41860c5e..648e5791 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -128,6 +128,12 @@ namespace Oqtane.Infrastructure case "refs": // refs/net*/... filename = ExtractFile(entry, Path.Combine(binPath, "refs"), 2); break; + case "content": // ... + filename = ExtractFile(entry, contentRootPath, 1); + break; + case "contentFiles": // ... + filename = ExtractFile(entry, contentRootPath, 3); + break; } if (filename != "") From 48e7a41af68c2c5c575f99e0726b09ddcbcfb04e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ton=C4=87i=20Vatavuk?= Date: Tue, 8 Feb 2022 19:38:23 +0100 Subject: [PATCH 2/2] fix #1987 Nuspec to include 'content' --- Oqtane.Server/Infrastructure/InstallationManager.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 648e5791..a68b8e31 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -128,11 +128,8 @@ namespace Oqtane.Infrastructure case "refs": // refs/net*/... filename = ExtractFile(entry, Path.Combine(binPath, "refs"), 2); break; - case "content": // ... - filename = ExtractFile(entry, contentRootPath, 1); - break; - case "contentFiles": // ... - filename = ExtractFile(entry, contentRootPath, 3); + case "content": // content/... + filename = ExtractFile(entry, contentRootPath, 0); break; }