Skip to content

Commit

Permalink
Merge branch other/next-release into main
Browse files Browse the repository at this point in the history
  • Loading branch information
anionDev committed Oct 3, 2024
2 parents 796655e + 8d719ee commit da215b8
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
5 changes: 5 additions & 0 deletions Other/Resources/Changelog/v3.5.18.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Release notes

## Changes

- Fix.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<coverage version="1.0" date="2024-10-03_14-49-34" tag="v3.5.18">
<assembly name="ScriptCollection">
<class name="Executables.py" coveredlines="0" coverablelines="271" totallines="371" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="GeneralUtilities.py" coveredlines="469" coverablelines="736" totallines="873" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProcessesRunner.py" coveredlines="0" coverablelines="31" totallines="41" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProgramRunnerBase.py" coveredlines="22" coverablelines="28" totallines="47" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProgramRunnerEpew.py" coveredlines="40" coverablelines="103" totallines="122" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ProgramRunnerPopen.py" coveredlines="23" coverablelines="38" totallines="51" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="RPStream.py" coveredlines="0" coverablelines="32" totallines="42" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="ScriptCollectionCore.py" coveredlines="551" coverablelines="1388" totallines="1865" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="TasksForCommonProjectStructure.py" coveredlines="448" coverablelines="2032" totallines="2632" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
<class name="UpdateCertificates.py" coveredlines="0" coverablelines="105" totallines="126" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
</assembly>
</coverage>
2 changes: 1 addition & 1 deletion ScriptCollection/ScriptCollection.codeunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="2.9.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/v2.9.1/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd" enabled="true">
<cps:name>ScriptCollection</cps:name>
<cps:version>3.5.17</cps:version>
<cps:version>3.5.18</cps:version>
<cps:codeunitownername>Marius Göcke</cps:codeunitownername>
<cps:codeunitowneremailaddress>[email protected]</cps:codeunitowneremailaddress>
<cps:properties codeunithastestablesourcecode="true" codeunithasupdatabledependencies="true" throwexceptionifcodeunitfilecannotbevalidated="true" developmentstate="Active development" description="ScriptCollection is the place for reusable scripts.">
Expand Down
4 changes: 2 additions & 2 deletions ScriptCollection/ScriptCollection/ScriptCollectionCore.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from .ProgramRunnerPopen import ProgramRunnerPopen
from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument

version = "3.5.17"
version = "3.5.18"
__version__ = version


Expand Down Expand Up @@ -1604,7 +1604,7 @@ def update_dependencies_of_dotnet_project(self, csproj_file: str, verbosity: int
# Relevant output-lines are something like " > NJsonSchema 10.7.0 10.7.0 10.9.0"
if ">" in line:
package_name = line.replace(">", "").strip().split(" ")[0]
if not (ignored_dependencies in package_name):
if not (package_name in ignored_dependencies):
GeneralUtilities.write_message_to_stderr(f"Update package {package_name}")
self.run_program("dotnet", f"add {csproj_filename} package {package_name}", folder)

Expand Down
2 changes: 1 addition & 1 deletion ScriptCollection/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = ScriptCollection
version = 3.5.17
version = 3.5.18
author = Marius Göcke
author_email = [email protected]
description = The ScriptCollection is the place for reusable scripts.
Expand Down

0 comments on commit da215b8

Please sign in to comment.