Merge branch 'develop' into...

Merge branch 'develop' into feature/VECTO-1606-modal-data-results-only-provide-necessary-columns-in-output

Merge branch 'develop' into...
63f300e8 · Markus Quaritsch · 81b27a12 · bed134b6 · 63f300e8 · 63f300e8
Commit 63f300e8 authored 3 years ago by Markus Quaritsch
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vecto
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vecto
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vecto
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vecto
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vecto
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto
--- a/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockBrakes.cs
--- a/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs