Build 1.0.7 patch

This commit is contained in:
2023-04-14 23:28:56 +02:00
parent 400e54a501
commit 5ea698ef97
82 changed files with 154 additions and 150 deletions

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "0",
"Micro": "6"
"Micro": "7"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "0",
"Micro": "6"
"Micro": "7"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "0",
"Micro": "6"
"Micro": "7"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@@ -2,8 +2,6 @@ import os
import traceback
from cpl_cli.configuration import ProjectSettings
from cpl_core.utils import String
from cpl_cli.configuration.version_settings_name_enum import VersionSettingsNameEnum
from cpl_cli.configuration.workspace_settings import WorkspaceSettings
from cpl_core.application.application_abc import ApplicationABC
@@ -11,6 +9,8 @@ from cpl_core.configuration.configuration_abc import ConfigurationABC
from cpl_core.console.console import Console
from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl_core.pipes.version_pipe import VersionPipe
from cpl_core.utils import String
from set_version.git_service import GitService
from set_version.version_setter_service import VersionSetterService
@@ -65,6 +65,10 @@ class Application(ApplicationABC):
version[VersionSettingsNameEnum.minor.value] = ps.version.minor
version[VersionSettingsNameEnum.micro.value] = f'dev{branch.split("#")[1]}'
else:
if "." not in branch and "." in suffix:
branch = suffix
suffix = ""
version[VersionSettingsNameEnum.major.value] = branch.split(".")[0]
version[VersionSettingsNameEnum.minor.value] = branch.split(".")[1]
if len(branch.split(".")) == 2:

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "0",
"Micro": "6"
"Micro": "7"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",