Merge branch 'master' into feature_rene_18_ai - kein kommentar...
# Conflicts: # BeWo/BeWo.csproj # BeWo/BeWoApp.xaml.cs # BeWo/ServiceProxy/GeneratedAiEnhancedService.cs # BeWo/Services/BeWoControlFactory.cs # BeWo/Services/BeWoWindowFactory.cs # BeWo/Services/BeWoWindowService.cs # BeWo/Services/IControlFactory.cs # BeWo/Services/IWindowFactory.cs # BeWo/Services/IWindowService.cs # BeWo/View/BeWoFileView.xaml # BeWo/View/Detail/Report/AbwesenheitsView.xaml # BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs # BeWo/app.config # BeWoAllReports.sln # BeWoPlanerMobil.sln # BeWoPlanerMobil/.vs/BeWoPlanerMobil.csproj.dtbcache.json # BeWoTests.sln # Dakota/DakotaUtils.cs # Dakota/Logic/DakotaInfoCreator.cs # Dakota/Models/DakotaFile.cs # Data/Access/GenericDAO.cs # Data/Access/SearchDAO.cs # Data/Data.csproj # Host/Web.config # Server/Components/ServerUtils/ApiFacade/WebClientFacade.cs # Service/BeWoServiceEnums.cs # Service/Core/ServiceHelper.cs # Service/Core/ServiceValidator.cs # Service/Extensions/ServiceEnumExtension.cs # Service/Service.csproj # Service/ServiceContracts/Enhanced/IAiEnhancedService.cs # Service/ServiceContracts/Enhanced/IOperationsEnhancedService.cs # Service/ServiceImplementations/EmployeeServiceImp.cs # Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs # Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs # Service/ServiceProxy/OpenWebUIFacade.cs # Service/ServiceProxy/ServiceFacade.cs # Service/ServiceUtils/DistanceCalculator/GoogleDistanceMatrixAPI.cs # Shared/BeWoEntityEnums.cs # Shared/Core/AppError.cs # Shared/Core/Facade/WebClientFacade.cs # Shared/Core/WebClientFacade.cs # Shared/Shared.csproj
This commit is contained in:
@@ -56,6 +56,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICore", "Server\Components
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerUtils", "Server\Components\ServerUtils\ServerUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Invoicing", "Invoicing", "{67C70649-9837-49F3-982A-993DBD5A7AD3}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XRechnungUnitTest", "XRechnungUnitTest\XRechnungUnitTest.csproj", "{6CED1002-FFB1-46AD-97C7-583BA11208F3}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|.NET = Debug|.NET
|
||||
@@ -238,6 +242,18 @@ Global
|
||||
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Debug|.NET.ActiveCfg = Debug|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Debug|.NET.Build.0 = Debug|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Release|.NET.ActiveCfg = Release|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Release|.NET.Build.0 = Release|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -261,6 +277,8 @@ Global
|
||||
{ABBC52FB-FE14-4C80-BDBA-13CE7232ADE3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
|
||||
{69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {ABBC52FB-FE14-4C80-BDBA-13CE7232ADE3}
|
||||
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {ABBC52FB-FE14-4C80-BDBA-13CE7232ADE3}
|
||||
{67C70649-9837-49F3-982A-993DBD5A7AD3} = {CCD6B644-49E7-4A11-BD8F-607088A4AC83}
|
||||
{6CED1002-FFB1-46AD-97C7-583BA11208F3} = {67C70649-9837-49F3-982A-993DBD5A7AD3}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}
|
||||
|
||||
Reference in New Issue
Block a user