ScriptCollection 3.5.162__py3-none-any.whl → 3.5.164__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -36,7 +36,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.162"
+version = "3.5.164"
 __version__ = version
 
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -532,17 +532,19 @@ class TasksForCommonProjectStructure:
 
         csproj_project_name = codeunit_name
         csproj_file = os.path.join(codeunit_folder, csproj_project_name, csproj_project_name+".csproj")
-        result1: tuple[bool, str] = self.__standardized_task_verify_standard_format_for_project_csproj_file(csproj_file, codeunit_folder, codeunit_name, codeunit_version)
+        result1: tuple[bool, str, list[str]] = self.__standardized_task_verify_standard_format_for_project_csproj_file(csproj_file, codeunit_folder, codeunit_name, codeunit_version)
         if not result1[0]:
-            raise ValueError(f"'{csproj_file}' with content '{GeneralUtilities.read_text_from_file(csproj_file)}' does not match the standardized .csproj-file-format which is defined by the regex '{result1[1]}'.")
+            hints: str = "\n".join(result1[2])
+            raise ValueError(f"'{csproj_file}' with content '{GeneralUtilities.read_text_from_file(csproj_file)}' does not match the standardized .csproj-file-format which is defined by the regex '{result1[1]}'.\n{hints}")
 
         test_csproj_project_name = csproj_project_name+"Tests"
         test_csproj_file = os.path.join(codeunit_folder, test_csproj_project_name, test_csproj_project_name+".csproj")
-        result2: tuple[bool, str] = self.__standardized_task_verify_standard_format_for_test_csproj_file(test_csproj_file, codeunit_name, codeunit_version)
+        result2: tuple[bool, str, list[str]] = self.__standardized_task_verify_standard_format_for_test_csproj_file(test_csproj_file, codeunit_name, codeunit_version)
         if not result2[0]:
-            raise ValueError(f"'{test_csproj_file}' with content '{GeneralUtilities.read_text_from_file(test_csproj_file)}' does not match the standardized .csproj-file-format which is defined by the regex '{result2[1]}'.")
+            hints: str = "\n".join(result2[2])
+            raise ValueError(f"'{test_csproj_file}' with content '{GeneralUtilities.read_text_from_file(test_csproj_file)}' does not match the standardized .csproj-file-format which is defined by the regex '{result2[1]}'.\n{hints}")
 
-    def __standardized_task_verify_standard_format_for_project_csproj_file(self, csproj_file: str, codeunit_folder: str, codeunit_name: str, codeunit_version: str) -> tuple[bool, str]:
+    def __standardized_task_verify_standard_format_for_project_csproj_file(self, csproj_file: str, codeunit_folder: str, codeunit_name: str, codeunit_version: str) -> tuple[bool, str, str]:
         self.assert_is_codeunit_folder(codeunit_folder)
         codeunit_name_regex = re.escape(codeunit_name)
         codeunit_file = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
@@ -573,7 +575,7 @@ class TasksForCommonProjectStructure:
         <PackageRequireLicenseAcceptance>true<\\/PackageRequireLicenseAcceptance>
         <GenerateSerializationAssemblies>Off<\\/GenerateSerializationAssemblies>
         <AppendTargetFrameworkToOutputPath>false<\\/AppendTargetFrameworkToOutputPath>
-        <OutputPath>\\.\\.\\\\Other\\\\Artifacts\\\\BuildResult_DotNet_win-x64<\\/OutputPath>
+        <OutputPath>\\.\\.\\\\Other\\\\Artifacts\\\\BuildResult_DotNet_win\\-x64<\\/OutputPath>
         <PlatformTarget>([^<]+)<\\/PlatformTarget>
         <WarningLevel>\\d<\\/WarningLevel>
         <Prefer32Bit>false<\\/Prefer32Bit>
@@ -608,9 +610,10 @@ class TasksForCommonProjectStructure:
         <ErrorReport>none<\\/ErrorReport>
     <\\/PropertyGroup>(\\n|.)*
 <\\/Project>$"""
-        return (self.__standardized_task_verify_standard_format_for_csproj_files(regex, csproj_file), regex)
+        result = self.__standardized_task_verify_standard_format_for_csproj_files(regex, csproj_file)
+        return (result[0], regex, result[1])
 
-    def __standardized_task_verify_standard_format_for_test_csproj_file(self, csproj_file: str, codeunit_name: str, codeunit_version: str) -> tuple[bool, str]:
+    def __standardized_task_verify_standard_format_for_test_csproj_file(self, csproj_file: str, codeunit_name: str, codeunit_version: str) -> tuple[bool, str, str]:
         codeunit_name_regex = re.escape(codeunit_name)
         codeunit_version_regex = re.escape(codeunit_version)
         regex = f"""^<Project Sdk=\\"Microsoft\\.NET\\.Sdk\\">
@@ -637,13 +640,13 @@ class TasksForCommonProjectStructure:
         <PackageRequireLicenseAcceptance>true<\\/PackageRequireLicenseAcceptance>
         <GenerateSerializationAssemblies>Off<\\/GenerateSerializationAssemblies>
         <AppendTargetFrameworkToOutputPath>false<\\/AppendTargetFrameworkToOutputPath>
-        <OutputPath>\\.\\.\\\\Other\\\\Artifacts\\\\BuildResultTests_DotNet_win-x64<\\/OutputPath>
+        <OutputPath>\\.\\.\\\\Other\\\\Artifacts\\\\BuildResultTests_DotNet_win\\-x64<\\/OutputPath>
         <PlatformTarget>([^<]+)<\\/PlatformTarget>
         <WarningLevel>\\d<\\/WarningLevel>
         <Prefer32Bit>false<\\/Prefer32Bit>
-        <SignAssembly>True<\\/SignAssembly>
+        <SignAssembly>true<\\/SignAssembly>
         <AssemblyOriginatorKeyFile>\\.\\.\\\\\\.\\.\\\\Other\\\\Resources\\\\PublicKeys\\\\StronglyNamedKey\\\\([^<]+)PublicKey\\.snk<\\/AssemblyOriginatorKeyFile>
-        <DelaySign>True<\\/DelaySign>
+        <DelaySign>true<\\/DelaySign>
         <NoWarn>([^<]+)<\\/NoWarn>
         <WarningsAsErrors>([^<]+)<\\/WarningsAsErrors>
         <ErrorLog>\\.\\.\\\\Other\\\\Resources\\\\CodeAnalysisResult\\\\{codeunit_name_regex}Tests\\.sarif<\\/ErrorLog>
@@ -671,16 +674,41 @@ class TasksForCommonProjectStructure:
         <ErrorReport>none<\\/ErrorReport>
     <\\/PropertyGroup>(\\n|.)*
 <\\/Project>$"""
-        return (self.__standardized_task_verify_standard_format_for_csproj_files(regex, csproj_file), regex)
+        result = self.__standardized_task_verify_standard_format_for_csproj_files(regex, csproj_file)
+        return (result[0], regex, result[1])
 
-    def __standardized_task_verify_standard_format_for_csproj_files(self, regex: str, csproj_file: str) -> bool:
+    def __standardized_task_verify_standard_format_for_csproj_files(self, regex: str, csproj_file: str) -> tuple[bool, list[str]]:
         filename = os.path.basename(csproj_file)
         GeneralUtilities.write_message_to_stdout(f"Check {filename}...")
         file_content = GeneralUtilities.read_text_from_file(csproj_file)
         regex = regex.replace("\r", GeneralUtilities.empty_string).replace("\n", "\\n")
         file_content = file_content.replace("\r", GeneralUtilities.empty_string)
         match = re.match(regex, file_content)
-        return match is not None
+        result = match is not None
+        hints = None
+        if not result:
+            hints = self.get_hints_for_csproj()
+        return (result, hints)
+
+    @GeneralUtilities.check_arguments
+    def get_hints_for_csproj(self) -> list[str]:
+        result: list[str] = []
+        with open("string.txt", "r", encoding="utf-8") as f:
+            strings = [line.rstrip("\n") for line in f]
+
+        with open("regex.txt", "r", encoding="utf-8") as f:
+            regexes = [line.rstrip("\n") for line in f]
+
+        amount_of_lines = len(regexes)
+        if len(strings) < amount_of_lines:
+            result.append("csproj-file has less lines than the regex requires.")
+            return result
+        for i in range(amount_of_lines - 1):
+            s = strings[i]
+            r = regexes[i]
+            if not re.match(r, s):
+                result.append(f"Line {i+1} does not match: Regex='{r}' String='{s}'")
+        return result
 
     @GeneralUtilities.check_arguments
     def __standardized_tasks_build_for_dotnet_build(self, csproj_file: str, originaloutputfolder: str, files_to_sign: dict[str, str], commitid: str, verbosity: int, runtimes: list[str], target_environmenttype: str, target_environmenttype_mapping:  dict[str, str], copy_license_file_to_target_folder: bool, repository_folder: str, codeunit_name: str, commandline_arguments: list[str]) -> None:

{scriptcollection-3.5.162.dist-info → scriptcollection-3.5.164.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.162
+Version: 3.5.164
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -31,7 +31,7 @@ Requires-Dist: lcov-cobertura>=2.1.1
 Requires-Dist: lxml>=6.0.1
 Requires-Dist: ntplib>=0.4.0
 Requires-Dist: Pillow>=11.3.0
-Requires-Dist: psutil>=7.0.0
+Requires-Dist: psutil>=7.1.0
 Requires-Dist: pycdlib>=1.14.0
 Requires-Dist: Pygments>=2.19.2
 Requires-Dist: pylint>=3.3.8

{scriptcollection-3.5.162.dist-info → scriptcollection-3.5.164.dist-info}/RECORD

@@ -7,11 +7,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=rMdrEzBKQZBdObPJ9nZ5XCEXRoIFqPh8fAoiX6ZOVuw,4493
-ScriptCollection/ScriptCollectionCore.py,sha256=7axjJZ3kMYVeO4dvOINbIf-W9CRZs2SGIWn1_hRjyPI,141742
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=bVq2XIEz1Z8bXOW1WJIVN2YW9vMCcR2FCTuqEyzFG_I,250542
+ScriptCollection/ScriptCollectionCore.py,sha256=TwbQyNauisK5iRVRQt5JVDPM7xSPR1-XGv-0-BHY_3I,141742
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=l3ZBmN60S-rJySg7rA5ShQmtAb6DbWxeJsQsypfd8Z4,251694
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.162.dist-info/METADATA,sha256=lvHNFsWWWMeMxh4qeIH8mLPAGhiMlXBnuwPHaq_cv5o,7689
-scriptcollection-3.5.162.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.162.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
-scriptcollection-3.5.162.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.162.dist-info/RECORD,,
+scriptcollection-3.5.164.dist-info/METADATA,sha256=BOZUlLK1m1PR87cMyub9vd0e78vc3qePhkpQBuY3Uec,7689
+scriptcollection-3.5.164.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.164.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
+scriptcollection-3.5.164.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.164.dist-info/RECORD,,