Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

# Conflicts:
#	BeWoAllReports.sln
#	Service/Plugins/PluginLoader.cs
This commit is contained in:
Christian
2025-01-29 01:16:13 +01:00
185 changed files with 25333 additions and 11480 deletions

View File

@@ -900,6 +900,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PeterVomBrocke", "ReportImp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChristopherusHausMID", "ReportImp\ChristopherusHausMID\ChristopherusHausMID.csproj", "{12876363-2375-49AE-84E5-52CAB4359F4E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SelbstWerk", "ReportImp\SelbstWerk\SelbstWerk.csproj", "{D8898ACE-241C-4F3E-9378-C37BAC8370FE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -11087,6 +11089,30 @@ Global
{12876363-2375-49AE-84E5-52CAB4359F4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{12876363-2375-49AE-84E5-52CAB4359F4E}.Release|x86.ActiveCfg = Release|Any CPU
{12876363-2375-49AE-84E5-52CAB4359F4E}.Release|x86.Build.0 = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|.NET.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|.NET.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|x86.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Debug|x86.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.DebugRemote|x86.Build.0 = Debug|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|.NET.ActiveCfg = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|.NET.Build.0 = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|Any CPU.Build.0 = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|x86.ActiveCfg = Release|Any CPU
{D8898ACE-241C-4F3E-9378-C37BAC8370FE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -11535,6 +11561,7 @@ Global
{D08B6F46-EB00-4A05-B1AB-A00E189C2C66} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{886B622D-2C89-494B-BD3A-48F1E3A95197} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{12876363-2375-49AE-84E5-52CAB4359F4E} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{D8898ACE-241C-4F3E-9378-C37BAC8370FE} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}