More bugfixes & added generated test projects

src/tests/generated/simple-app/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-app/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-app",
+    "Projects": {
+      "simple-app": "src/simple_app/simple-app.json"
+    }
+  }
+}

src/tests/generated/simple-app/src/simple_app/main.py

@@ -1,6 +1,6 @@
 from cpl.application import ApplicationBuilder
 
-from application import Application
+from simple_app.application import Application
 
 
 def main():

src/tests/generated/simple-app/src/simple_app/simple-app.json

@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,9 +26,9 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_app.main",
     "EntryPoint": "simple-app",
     "IncludePackageData": false,
     "Included": [],
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-console/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-console/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-console",
+    "Projects": {
+      "simple-console": "src/simple_console/simple-console.json"
+    }
+  }
+}

src/tests/generated/simple-console/src/simple_console/__init__.py

@@ -0,0 +1 @@
+# imports: 

src/tests/generated/simple-console/src/simple_console/simple-console.json

@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,9 +26,9 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_console.main",
     "EntryPoint": "simple-console",
     "IncludePackageData": false,
     "Included": [],
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-di/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-di/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-di",
+    "Projects": {
+      "simple-di": "src/simple_di/simple-di.json"
+    }
+  }
+}

src/tests/generated/simple-di/src/simple_di/__init__.py

@@ -0,0 +1 @@
+# imports: 

src/tests/generated/simple-di/src/simple_di/simple-di.json

@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2.dev1"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,9 +26,9 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_di.main",
     "EntryPoint": "simple-di",
     "IncludePackageData": false,
     "Included": [],
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-startup-app/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "LoggingSettings": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  }
+}

src/tests/generated/simple-startup-app/cpl-workspace.json

@@ -0,0 +1,8 @@
+{
+  "WorkspaceSettings": {
+    "DefaultProject": "simple-startup-app",
+    "Projects": {
+      "simple-startup-app": "src/simple_startup_app/simple-startup-app.json"
+    }
+  }
+}

src/tests/generated/simple-startup-app/src/simple_startup_app/__init__.py

@@ -0,0 +1 @@
+# imports: 

src/tests/generated/simple-startup-app/src/simple_startup_app/main.py

@@ -1,7 +1,7 @@
 from cpl.application import ApplicationBuilder
 
-from application import Application
-from startup import Startup
+from simple_startup_app.application import Application
+from simple_startup_app.startup import Startup
 
 
 def main():

src/tests/generated/simple-startup-app/src/simple_startup_app/simple-startup-app.json

@@ -1,6 +1,6 @@
 {
   "ProjectSettings": {
-    "Name": "startup-app",
+    "Name": "simple-startup-app",
     "Version": {
       "Major": "0",
       "Minor": "0",
@@ -16,7 +16,7 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "sh_cpl==2021.4.2"
+      "sh_cpl==2021.4.1rc2"
     ],
     "PythonVersion": ">=3.9.2",
     "PythonPath": {
@@ -26,10 +26,10 @@
   },
   "BuildSettings": {
     "ProjectType": "console",
-    "SourcePath": "src",
-    "OutputPath": "dist",
-    "Main": "main",
-    "EntryPoint": "startup-app",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "simple_startup_app.main",
+    "EntryPoint": "simple-startup-app",
     "IncludePackageData": false,
     "Included": [],
     "Excluded": [
@@ -37,6 +37,7 @@
       "*/logs",
       "*/tests"
     ],
-    "PackageData": {}
+    "PackageData": {},
+    "ProjectReferences": []
   }
 }

src/tests/generated/simple-startup-app/src/simple_startup_app/startup.py

@@ -17,4 +17,3 @@ class Startup(StartupABC):
 
     def configure_services(self) -> ServiceProviderABC:
         return self._services.build_service_provider()
-

src/tests/generated/simple-startup-app/src/tests/__init__.py

@@ -0,0 +1 @@
+# imports: