Merge pull request #3349 from 2sic/develop

17.06.03 minor bugfix
2sic · Apr 5, 2024 · c1a40d8 · c1a40d8
2 parents 5c50d23 + 690b282
commit c1a40d8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ReleaseNotes.txt b/Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ReleaseNotes.txt
@@ -1,5 +1,5 @@
 <dl>
-    <dt>v17.06.02</dt>
+    <dt>v17.06.03</dt>
     <dd>Part of module installation is the deletion of unneeded data. In an infrequent case, You could get a 
     timeout exception. This is not a show-stopper. Simply reload the page so DNN can continue deletion 
     until all unnecessary data is deleted and the module is installed.</dd>

diff --git a/Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ToSic.Sxc.Dnn.dnn b/Src/Dnn/ToSic.Sxc.Dnn/DnnPackageBuilder/ToSic.Sxc.Dnn.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="2SexyContent" type="Module" version="17.06.02">
+    <package name="2SexyContent" type="Module" version="17.06.03">
       <friendlyName> Content</friendlyName>
       <description>2sxc is a DNN Extension to create attractive and designed content. It solves the common problem, allowing the web designer to create designed templates for different content elements, so that the user must only fill in fields and receive a perfectly designed and animated output.</description>
       <iconFile>icon.png</iconFile>
@@ -69,7 +69,7 @@
             <script type="UnInstall">
               <path>SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>17.06.02</version>
+              <version>17.06.03</version>
             </script>
           </scripts>
         </component>
@@ -120,7 +120,7 @@
               <businessControllerClass>ToSic.SexyContent.DnnBusinessController</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
               <!-- This must contain all versions which have upgrade-code. By convention, we also add the main entry versions, even if no upgrade code exists for them -->
-              <upgradeVersionsList>01.00.00,08.11.00,08.12.00,09.00.00,10.00.00,11.00.00,12.00.00,13.00.00,13.01.00,13.04.00,14.00.00,15.00.00,15.02.00,16.00.00,16.07.01,17.00.00,17.06.02</upgradeVersionsList>
+              <upgradeVersionsList>01.00.00,08.11.00,08.12.00,09.00.00,10.00.00,11.00.00,12.00.00,13.00.00,13.01.00,13.04.00,14.00.00,15.00.00,15.02.00,16.00.00,16.07.01,17.00.00,17.06.03</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -627,7 +627,7 @@
       </components>
     </package>
 
-    <package name="2SexyContent-App" type="Module" version="17.06.02">
+    <package name="2SexyContent-App" type="Module" version="17.06.03">
       <friendlyName> App</friendlyName>
       <description>2sxc App is an extension that allows to install and use a 2sxc app.</description>
       <iconFile>icon-app.png</iconFile>

diff --git a/Src/Oqtane/ToSic.Sxc.Oqt.Package/ToSic.Sxc.Oqtane.Install.nuspec b/Src/Oqtane/ToSic.Sxc.Oqt.Package/ToSic.Sxc.Oqtane.Install.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>ToSic.Sxc.Oqtane.Install</id>
-    <version>17.06.02</version>
+    <version>17.06.03</version>
     <authors>2sic internet solutions GmbH, Switzerland</authors>
     <owners>2sic internet solutions GmbH, Switzerland</owners>
     <title>2sxc CMS and Meta-Module for Oqtane</title>

diff --git a/Src/Sxc/ToSic.Sxc/DataSources/Internal/AppDataSourcesLoader.cs b/Src/Sxc/ToSic.Sxc/DataSources/Internal/AppDataSourcesLoader.cs
@@ -154,7 +154,7 @@ private IEnumerable<TempDsInfo> LoadAppCodeDataSources(HotBuildSpec spec, out st
 
         var appCodeAssembly = result?.Assembly;
         if (appCodeAssembly == null)
-            return l.ReturnNull("no AppApi controller found");
+            return l.Return([], "no AppCode assembly found");
 
         l.A($"AppCode:{appCodeAssembly.GetName().Name}");
 
@@ -194,7 +194,7 @@ private IEnumerable<TempDsInfo> LoadAppDataSources(HotBuildSpec spec, string phy
             $"{spec}; {nameof(physicalPath)}: '{physicalPath}'; {nameof(relativePath)}: '{relativePath}'");
 
         if (!Directory.Exists(physicalPath))
-            return l.ReturnNull($"no {DataSourcesFolder} folder {physicalPath}");
+            return l.Return([], $"no {DataSourcesFolder} folder {physicalPath}");
 
         var compiler = _codeCompilerLazy.Value;
 
@@ -236,7 +236,11 @@ private IEnumerable<TempDsInfo> LoadAppDataSources(HotBuildSpec spec, string phy
 
     private List<DataSourceInfo> CreateDataSourceInfos(int appId, IEnumerable<TempDsInfo> types)
     {
-        var l = Log.Fn<List<DataSourceInfo>>($"{nameof(appId)}: {appId}");
+        var l = Log.Fn<List<DataSourceInfo>>($"{nameof(appId)}: {appId}; has {nameof(types)}: {types != null}");
+
+        // null check
+        if (types == null) return l.Return([], "types are null");
+
         // App state for automatic lookup of configuration content-types
         var appState = _appStates.GetReader(appId);
         var data = types