Finalizing the configuration of GitFlow and GitHubFlow workflow and align with the Mainline version strategy

[HHobeck]

Finalizing the configuration of GitFlow and GitHubFlow workflow and align with the Mainline version strategy

Description

Do minor changes and refactoring of code

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.

[HHobeck]

I have done a supplement to the previous PR because of some minor changes. Please review it and give me feedback @asbjornu

[arturcic]

@HHobeck before merging this one we need to fix the CI on main branch

[HHobeck]

@HHobeck before merging this one we need to fix the CI on main branch

Yes I agree. Can you help me to fix this? I see the following error:

Error: Assert.Contains() Failure: Sub-string not found
String:    "6.0.0-PullRequest4020.1488"
Not found: "6.0.0-PullRequest4020.3535"

[HHobeck]

@HHobeck before merging this one we need to fix the CI on main branch

Yes I agree. Can you help me to fix this? I see the following error:

Error: Assert.Contains() Failure: Sub-string not found
String:    "6.0.0-PullRequest4020.1488"
Not found: "6.0.0-PullRequest4020.3535"

Maybe it has something to do with the following fix:

• [Bug] GitVersionTask: VersionSource is set to wrong tag #2394

[HHobeck]

I think this PR can be merged. Do you have any suggestion for finalization?

[arturcic]

I think this PR can be merged. Do you have any suggestion for finalization?

Nope, we need first to fix the main build before merging this one

[arturcic]

@HHobeck I sent you the details I found while investigating the build error

[mergify]

Thank you @HHobeck for your contribution!