Merge branch 'feature/VECTO-1190-declaration-mode-for-heavy-buses_franz' into...
Merge branch 'feature/VECTO-1190-declaration-mode-for-heavy-buses_franz' into feature/VECTO-1190-declaration-mode-for-heavy-buses # Conflicts: # VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs # VectoCommon/VectoCommon/InputData/DeclarationInputData.cs # VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs # VectoCommon/VectoCommon/Resources/XMLNames.resx # VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV26InjectModule.cs # VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd # VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/example_heavyBus_PIF.xml # VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-completed_heavyBus.xml # VectoCore/VectoCoreTest/VectoCoreTest.csproj
No related branches found
No related tags found
Showing
- VectoCommon/VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs 22 additions, 0 deletions.../VectoCommon/BusAuxiliaries/IPneumaticUserInputsConfig.cs
- VectoCommon/VectoCommon/InputData/DeclarationInputData.cs 41 additions, 1 deletionVectoCommon/VectoCommon/InputData/DeclarationInputData.cs
- VectoCommon/VectoCommon/InputData/IInputDataProvider.cs 12 additions, 0 deletionsVectoCommon/VectoCommon/InputData/IInputDataProvider.cs
- VectoCommon/VectoCommon/Models/VehicleCategory.cs 14 additions, 0 deletionsVectoCommon/VectoCommon/Models/VehicleCategory.cs
- VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs 301 additions, 48 deletionsVectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
- VectoCommon/VectoCommon/Resources/XMLNames.resx 138 additions, 0 deletionsVectoCommon/VectoCommon/Resources/XMLNames.resx
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs 1 addition, 0 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAngledriveDataProvider.cs 22 additions, 0 deletions...tion/DataProvider/XMLDeclarationAngledriveDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAxlegearDataProvider.cs 21 additions, 0 deletions...ration/DataProvider/XMLDeclarationAxlegearDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs 41 additions, 2 deletions.../DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs 86 additions, 1 deletion...tion/DataProvider/XMLDeclarationComponentsDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationEngineDataProvider.cs 31 additions, 1 deletion...laration/DataProvider/XMLDeclarationEngineDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationGearboxDataProvider.cs 19 additions, 0 deletions...aration/DataProvider/XMLDeclarationGearboxDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationInputDataProvider.cs 105 additions, 0 deletions...claration/DataProvider/XMLDeclarationInputDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs 57 additions, 0 deletions...ration/DataProvider/XMLDeclarationJobInputDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusApplicationInformationDataProviderV01.cs 38 additions, 0 deletions...PrimaryVehicleBusApplicationInformationDataProviderV01.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationPrimaryVehicleBusResultsInputDataProviderV01.cs 87 additions, 0 deletions...eclarationPrimaryVehicleBusResultsInputDataProviderV01.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs 299 additions, 0 deletions...aration/DataProvider/XMLDeclarationVehicleDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs 19 additions, 0 deletions...utData/FileIO/XML/Declaration/DataProvider/XMLGearData.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Factory/IDeclarationInjectFactory.cs 27 additions, 0 deletions...leIO/XML/Declaration/Factory/IDeclarationInjectFactory.cs
Loading
Please register or sign in to comment