Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Forked from VECTO / VECTO Sim
4081 commits behind the upstream repository.
  • Markus Quaritsch's avatar
    637c9e12
    Merge branch 'VECTO_CERT/master' into merge/Vecto_3.3.10 · 637c9e12
    Markus Quaritsch authored
    # Conflicts:
    #	.gitignore
    #	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
    #	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
    #	HashingTool/Properties/Version.cs
    #	VECTO/Input Files/Engine.vb
    #	VECTO/Input Files/Gearbox.vb
    #	VECTO/Input Files/Vehicle.vb
    #	VectoCommon/VectoCommon/Properties/Version.cs
    #	VectoCommon/VectoCommon/Resources/XMLNames.resx
    #	VectoCommon/VectoHashing/Properties/Version.cs
    #	VectoConsole/Properties/Version.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
    #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
    #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
    #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
    #	VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
    #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
    #	VectoCore/VectoCore/Properties/Version.cs
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
    #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
    #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
    #	VectoCore/VectoCore/VectoCore.csproj
    #	VectoCore/VectoCore/VersionNumber.t4
    #	VectoCore/VectoXML.spp
    637c9e12
    History
    Merge branch 'VECTO_CERT/master' into merge/Vecto_3.3.10
    Markus Quaritsch authored
    # Conflicts:
    #	.gitignore
    #	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
    #	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
    #	HashingTool/Properties/Version.cs
    #	VECTO/Input Files/Engine.vb
    #	VECTO/Input Files/Gearbox.vb
    #	VECTO/Input Files/Vehicle.vb
    #	VectoCommon/VectoCommon/Properties/Version.cs
    #	VectoCommon/VectoCommon/Resources/XMLNames.resx
    #	VectoCommon/VectoHashing/Properties/Version.cs
    #	VectoConsole/Properties/Version.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
    #	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
    #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
    #	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
    #	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
    #	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
    #	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
    #	VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
    #	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
    #	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
    #	VectoCore/VectoCore/Properties/Version.cs
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
    #	VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
    #	VectoCore/VectoCore/Utils/VectoVersionCore.cs
    #	VectoCore/VectoCore/Utils/XMLDefinitions.cs
    #	VectoCore/VectoCore/VectoCore.csproj
    #	VectoCore/VectoCore/VersionNumber.t4
    #	VectoCore/VectoXML.spp
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
.gitignore 4.19 KiB
VECTO/bin/
VECTO/obj/

## From github on 15/5/2014: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
build/
bld/
[Bb]in/
[Oo]bj/

# Roslyn cache directories
*.ide/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

#NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
## TODO: Comment the next line if you want to checkin your
## web deploy settings but do note that will include unencrypted
## passwords
*.pubxml

# NuGet Packages Directory
packages/*
## TODO: If the tool you use requires repositories.config
## uncomment the next line
#!packages/repositories.config

# Enable "build/" folder in the NuGet Packages folder since
# NuGet packages use it for MSBuild targets.
# This line needs to be after the ignore of the build folder
# (and the packages folder if the line above has been uncommented)
!packages/build/

# Windows Azure Build Output
csx/
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/
*.orig
Generic Vehicles/**/*.vmod
Generic Vehicles/**/*.vsum
Generic Vehicles/**/*.pdf
VectoCore/VectoCoreTest/TestData/XML/XSD/
VectoCommon/VectoHashingTest/Testdata/XML/XSD/
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/**.vmod
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/**.vsum
Coverage/
**/*.RSLT_*.xml
Documentation/VehiclesReleaseComparisonDeclarationMode/*.vmod
Documentation/VehiclesReleaseComparisonDeclarationMode/*.vsum

HashingTool/TestData/
DISTR/
[0-9][0-9][0-9][0-9]_[0-9][0-9]_[0-9][0-9]-VECTO-*.zip
Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
EPTP/
201*-VECTO-*.zip
Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vmod
Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
.vs/
**/dev/*.vmod
**/dev/*.vsum
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/testVif.VIF_Report_5.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/final.VIF_Report_5.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test+.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/test.VIF_Report_5.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/tests.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/finalGroup41.VIF_Report_4.xml
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/output
/Vecto3GUI2020Test/TestData/output