diff --git a/VECTO.sln b/VECTO.sln
index a994d5678b9d3b1c05e7cde00835aa1d590393db..ff4c235089f7cdfd2f250b0fe869c723c6205be5 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -112,7 +112,8 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Deploy|Any CPU = Deploy|Any CPU
- Mockup|Any CPU = Mockup|Any CPU
+ MockupDebug|Any CPU = MockupDebug|Any CPU
+ MockupRelease|Any CPU = MockupRelease|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -120,207 +121,250 @@ Global
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupRelease|Any CPU.ActiveCfg = MockupRelease|Any CPU
+ {AAC0F132-0A9F-45B3-B682-77AC9B24B352}.MockupRelease|Any CPU.Build.0 = MockupRelease|Any CPU
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AAC0F132-0A9F-45B3-B682-77AC9B24B352}.Release|Any CPU.Build.0 = Release|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupRelease|Any CPU.ActiveCfg = MockupRelease|Any CPU
+ {CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.MockupRelease|Any CPU.Build.0 = MockupRelease|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}.Release|Any CPU.Build.0 = Release|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.Build.0 = Release|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.Build.0 = Release|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {60AD4DF0-6648-4374-83CB-C7A162EFB391}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupRelease|Any CPU.ActiveCfg = Mockup|Any CPU
+ {60AD4DF0-6648-4374-83CB-C7A162EFB391}.MockupRelease|Any CPU.Build.0 = Mockup|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Release|Any CPU.Build.0 = Release|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.Build.0 = Release|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.Build.0 = Release|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {E8B0B447-1A54-4BEC-A160-AF0017000781}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {E8B0B447-1A54-4BEC-A160-AF0017000781}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {E8B0B447-1A54-4BEC-A160-AF0017000781}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.Build.0 = Release|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {79A066AD-69A9-4223-90F6-6ED5D2D084F4}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79A066AD-69A9-4223-90F6-6ED5D2D084F4}.Release|Any CPU.Build.0 = Release|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.Build.0 = Release|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {7C364099-9B85-473A-8A42-BBEBE4798FF5}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {7C364099-9B85-473A-8A42-BBEBE4798FF5}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C364099-9B85-473A-8A42-BBEBE4798FF5}.Release|Any CPU.Build.0 = Release|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {B673E12F-D323-4C4C-8805-9915B2C72D3D}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupRelease|Any CPU.ActiveCfg = MockupRelease|Any CPU
+ {B673E12F-D323-4C4C-8805-9915B2C72D3D}.MockupRelease|Any CPU.Build.0 = MockupRelease|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B673E12F-D323-4C4C-8805-9915B2C72D3D}.Release|Any CPU.Build.0 = Release|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|Any CPU.Build.0 = Debug|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {760C1C5B-A767-463E-BA85-F0BCFC23A550}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {760C1C5B-A767-463E-BA85-F0BCFC23A550}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.ActiveCfg = Release|Any CPU
{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.Build.0 = Release|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}.Release|Any CPU.Build.0 = Release|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {33F9848E-9257-4BE2-915F-68E748AEB204}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {33F9848E-9257-4BE2-915F-68E748AEB204}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {33F9848E-9257-4BE2-915F-68E748AEB204}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33F9848E-9257-4BE2-915F-68E748AEB204}.Release|Any CPU.Build.0 = Release|Any CPU
{7E9172D4-07E3-4077-814E-7117AB2B3E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E9172D4-07E3-4077-814E-7117AB2B3E22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E9172D4-07E3-4077-814E-7117AB2B3E22}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{7E9172D4-07E3-4077-814E-7117AB2B3E22}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {7E9172D4-07E3-4077-814E-7117AB2B3E22}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupRelease|Any CPU.ActiveCfg = Debug|Any CPU
+ {7E9172D4-07E3-4077-814E-7117AB2B3E22}.MockupRelease|Any CPU.Build.0 = Debug|Any CPU
{7E9172D4-07E3-4077-814E-7117AB2B3E22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7E9172D4-07E3-4077-814E-7117AB2B3E22}.Release|Any CPU.Build.0 = Release|Any CPU
{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
- {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Release|Any CPU.Build.0 = Release|Any CPU
{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}.Release|Any CPU.Build.0 = Release|Any CPU
{C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {C5A75A10-0726-4FCA-B350-2F1694E1EABE}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5A75A10-0726-4FCA-B350-2F1694E1EABE}.Release|Any CPU.Build.0 = Release|Any CPU
{165739A9-C28D-4B82-96A9-8D063BEC22B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{165739A9-C28D-4B82-96A9-8D063BEC22B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{165739A9-C28D-4B82-96A9-8D063BEC22B9}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{165739A9-C28D-4B82-96A9-8D063BEC22B9}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {165739A9-C28D-4B82-96A9-8D063BEC22B9}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {165739A9-C28D-4B82-96A9-8D063BEC22B9}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{165739A9-C28D-4B82-96A9-8D063BEC22B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{165739A9-C28D-4B82-96A9-8D063BEC22B9}.Release|Any CPU.Build.0 = Release|Any CPU
{D47DF5C7-CD92-4388-A18F-1620630DB437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D47DF5C7-CD92-4388-A18F-1620630DB437}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D47DF5C7-CD92-4388-A18F-1620630DB437}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
{D47DF5C7-CD92-4388-A18F-1620630DB437}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
- {D47DF5C7-CD92-4388-A18F-1620630DB437}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {D47DF5C7-CD92-4388-A18F-1620630DB437}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {D47DF5C7-CD92-4388-A18F-1620630DB437}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{D47DF5C7-CD92-4388-A18F-1620630DB437}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D47DF5C7-CD92-4388-A18F-1620630DB437}.Release|Any CPU.Build.0 = Release|Any CPU
{9FD67139-5120-4E64-9210-DD0A070903EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FD67139-5120-4E64-9210-DD0A070903EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FD67139-5120-4E64-9210-DD0A070903EA}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{9FD67139-5120-4E64-9210-DD0A070903EA}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {9FD67139-5120-4E64-9210-DD0A070903EA}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {9FD67139-5120-4E64-9210-DD0A070903EA}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {9FD67139-5120-4E64-9210-DD0A070903EA}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{9FD67139-5120-4E64-9210-DD0A070903EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FD67139-5120-4E64-9210-DD0A070903EA}.Release|Any CPU.Build.0 = Release|Any CPU
{083F6B3C-9529-448F-AF1D-D0889852B918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{083F6B3C-9529-448F-AF1D-D0889852B918}.Debug|Any CPU.Build.0 = Debug|Any CPU
{083F6B3C-9529-448F-AF1D-D0889852B918}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{083F6B3C-9529-448F-AF1D-D0889852B918}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {083F6B3C-9529-448F-AF1D-D0889852B918}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {083F6B3C-9529-448F-AF1D-D0889852B918}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {083F6B3C-9529-448F-AF1D-D0889852B918}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{083F6B3C-9529-448F-AF1D-D0889852B918}.Release|Any CPU.ActiveCfg = Release|Any CPU
{083F6B3C-9529-448F-AF1D-D0889852B918}.Release|Any CPU.Build.0 = Release|Any CPU
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Mockup|Any CPU.ActiveCfg = Debug|Any CPU
- {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Mockup|Any CPU.Build.0 = Debug|Any CPU
+ {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupDebug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupDebug|Any CPU.Build.0 = Debug|Any CPU
+ {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4977BE2A-CB80-4FC0-8D1A-30EC094011B4}.Release|Any CPU.Build.0 = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Deploy|Any CPU.Build.0 = Release|Any CPU
- {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D78AD145-DD1F-45E7-89DA-4BF58F8F2D3E}.Release|Any CPU.Build.0 = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Deploy|Any CPU.Build.0 = Debug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {8E8F5C65-501E-4AAC-97DE-10DD283883D2}.MockupRelease|Any CPU.Build.0 = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E8F5C65-501E-4AAC-97DE-10DD283883D2}.Release|Any CPU.Build.0 = Release|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Deploy|Any CPU.Build.0 = Debug|Any CPU
- {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Mockup|Any CPU.ActiveCfg = MockupDebug|Any CPU
- {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Mockup|Any CPU.Build.0 = MockupDebug|Any CPU
+ {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.ActiveCfg = MockupDebug|Any CPU
+ {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupDebug|Any CPU.Build.0 = MockupDebug|Any CPU
+ {EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.MockupRelease|Any CPU.ActiveCfg = Release|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC0D4019-BBE6-431C-90E1-BD4AAEC0BF88}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 5fa017fd3ee088df688cc960384dee9aba0846d4..2ee66158aa5271cdf1b14213fe18a958770f7fbe 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -1,115 +1,121 @@
<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <OutputType>WinExe</OutputType>
- <StartupObject>Sub Main</StartupObject>
- <RootNamespace>TUGraz.VECTO</RootNamespace>
- <AssemblyName>VECTO</AssemblyName>
- <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
- <OptionStrict>On</OptionStrict>
- <UseWindowsForms>true</UseWindowsForms>
- <MyType>WindowsForms</MyType>
- <TargetFrameworks>net6.0-windows</TargetFrameworks>
- <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
- <DefineTrace>false</DefineTrace>
- <DefineConstants />
- <Configurations>Debug;Release;MockupDebug</Configurations>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
- <PackageReference Include="NLog" Version="4.7.13" />
- <PackageReference Include="Ninject" Version="3.3.6">
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
- </ItemGroup>
+ <PropertyGroup>
+ <OutputType>WinExe</OutputType>
+ <StartupObject>Sub Main</StartupObject>
+ <RootNamespace>TUGraz.VECTO</RootNamespace>
+ <AssemblyName>VECTO</AssemblyName>
+ <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
+ <OptionStrict>On</OptionStrict>
+ <UseWindowsForms>true</UseWindowsForms>
+ <MyType>WindowsForms</MyType>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
+ <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
+ <DefineTrace>false</DefineTrace>
+ <DefineConstants />
+ <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
+ </PropertyGroup>
+ <!--Final Define Constants https://developercommunity.visualstudio.com/t/vbprojuser-defineconstants-dont-affect/865956-->
+ <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
+ <FinalDefineConstants>$(FinalDefineConstants),MOCKUP</FinalDefineConstants>
+ <DefineConstants>$(DefineConstants),MOCKUP</DefineConstants>
+ </PropertyGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
- </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+ <PackageReference Include="NLog" Version="4.7.13" />
+ <PackageReference Include="Ninject" Version="3.3.6">
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Windows.Forms.DataVisualization" />
- </ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Windows.Forms.DataVisualization" />
+ </ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
- <PackageReference Include="System.Data.SqlClient">
- <Version>4.8.3</Version>
- </PackageReference>
- <PackageReference Include="System.Windows.Forms.DataVisualization">
- <Version>1.0.0-prerelease.20110.1</Version>
- </PackageReference>
- </ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Windows.Forms.DataVisualization" />
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
+ <PackageReference Include="System.Data.SqlClient">
+ <Version>4.8.3</Version>
+ </PackageReference>
+ <PackageReference Include="System.Windows.Forms.DataVisualization">
+ <Version>1.0.0-prerelease.20110.1</Version>
+ </PackageReference>
+ </ItemGroup>
<Choose>
- <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'">
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
+ $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <PropertyGroup>
+ <!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>
+ </PropertyGroup>-->
</When>
</Choose>
- <ItemGroup>
- <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
- <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Import Include="Microsoft.VisualBasic" />
- <Import Include="System" />
- <Import Include="System.Collections" />
- <Import Include="System.Data" />
- <Import Include="System.Drawing" />
- <Import Include="System.Diagnostics" />
- <Import Include="System.Windows.Forms" />
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
+ <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Import Include="Microsoft.VisualBasic" />
+ <Import Include="System" />
+ <Import Include="System.Collections" />
+ <Import Include="System.Data" />
+ <Import Include="System.Drawing" />
+ <Import Include="System.Diagnostics" />
+ <Import Include="System.Windows.Forms" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Compile Update="My Project\Application.Designer.vb">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Application.myapp</DependentUpon>
+ </Compile>
+ <Compile Update="My Project\Resources.Designer.vb">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <EmbeddedResource Update="My Project\Resources.resx">
+ <CustomToolNamespace>My.Resources</CustomToolNamespace>
+ <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+ </EmbeddedResource>
+ <Compile Update="My Project\Settings.Designer.vb">
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
+ <None Update="My Project\Application.myapp">
+ <Generator>MyApplicationCodeGenerator</Generator>
+ <LastGenOutput>Application.Designer.vb</LastGenOutput>
+ </None>
+ <None Update="My Project\Settings.settings">
+ <CustomToolNamespace>My</CustomToolNamespace>
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+ </None>
+ </ItemGroup>
- <ItemGroup>
- <Compile Update="My Project\Application.Designer.vb">
- <DesignTime>True</DesignTime>
- <AutoGen>True</AutoGen>
- <DependentUpon>Application.myapp</DependentUpon>
- </Compile>
- <Compile Update="My Project\Resources.Designer.vb">
- <DesignTime>True</DesignTime>
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <EmbeddedResource Update="My Project\Resources.resx">
- <CustomToolNamespace>My.Resources</CustomToolNamespace>
- <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.vb</LastGenOutput>
- </EmbeddedResource>
- <Compile Update="My Project\Settings.Designer.vb">
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- </Compile>
- <None Update="My Project\Application.myapp">
- <Generator>MyApplicationCodeGenerator</Generator>
- <LastGenOutput>Application.Designer.vb</LastGenOutput>
- </None>
- <None Update="My Project\Settings.settings">
- <CustomToolNamespace>My</CustomToolNamespace>
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.vb</LastGenOutput>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Update="Resources\4x2r.png" />
+ <EmbeddedResource Update="Resources\4x2rt.png" />
+ <EmbeddedResource Update="Resources\4x2tt.png" />
+ <EmbeddedResource Update="Resources\6x2r.png" />
+ <EmbeddedResource Update="Resources\6x2rt.png" />
+ <EmbeddedResource Update="Resources\6x2tt.png" />
+ <EmbeddedResource Update="Resources\Undef.png" />
+ </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Update="Resources\4x2r.png" />
- <EmbeddedResource Update="Resources\4x2rt.png" />
- <EmbeddedResource Update="Resources\4x2tt.png" />
- <EmbeddedResource Update="Resources\6x2r.png" />
- <EmbeddedResource Update="Resources\6x2rt.png" />
- <EmbeddedResource Update="Resources\6x2tt.png" />
- <EmbeddedResource Update="Resources\Undef.png" />
- </ItemGroup>
-
</Project>
\ No newline at end of file
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index d7eecd2323682052325f0f0963d15eaf681afea3..b523e4d257e31df28f70238e64d410a4c01dfa74 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -12,7 +12,7 @@
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
<DefineConstants />
- <Configurations>Debug;Release;MockupDebug</Configurations>
+ <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net48|AnyCPU'">
<DebugType>full</DebugType>
@@ -20,6 +20,9 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0-windows|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
+ <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
+ <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants>
+ </PropertyGroup>
<ItemGroup>
<PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" NoWarn="NU1701" />
@@ -34,19 +37,19 @@
<ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
-
- <Choose>
- <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'">
- <ItemGroup>
- <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
-
- </ItemGroup>
- <PropertyGroup>
- <DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>
- </When>
- </Choose>
-
+
+ <Choose>
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
+ $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
+ <ItemGroup>
+ <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
+
+ </ItemGroup>
+ <!--<PropertyGroup>
+ <DefineConstants>MOCKUP</DefineConstants>
+ </PropertyGroup>-->
+ </When>
+ </Choose>
diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj
index f833fa86eb34d4986fa7a4a941b5fefba4267658..8a059112dc7a7617cfb2b73a7c9b67ef375db87b 100644
--- a/VectoCommon/VectoHashing/VectoHashing.csproj
+++ b/VectoCommon/VectoHashing/VectoHashing.csproj
@@ -8,6 +8,7 @@
<AssemblyName>VectoHashing</AssemblyName>
<TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
+ <Configurations>Debug;Release;MockupRelease</Configurations>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index 8f9ecdb6980d3b9cb58b2895d6a22ba8bb1b92c3..16247589a651b807eab1dbbf8ea6212cce6834af 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -6,7 +6,7 @@
<ApplicationIcon>VECTO.ico</ApplicationIcon>
<TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
- <Configurations>Debug;Release;MockupDebug</Configurations>
+ <Configurations>Debug;Release;MockupDebug;Mockup</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'">
<DebugType>full</DebugType>
@@ -17,7 +17,9 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
-
+ <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
+ <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants>
+ </PropertyGroup>
<ItemGroup>
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="NLog" Version="4.7.13" />
@@ -40,14 +42,15 @@
</ItemGroup>
<Choose>
- <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'">
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
+ $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <PropertyGroup>
+ <!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>
+ </PropertyGroup>-->
</When>
</Choose>
</Project>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index 310651e9bd62c8f53612d9b4eaa21e7a9babac27..a3a7018557261324d179d1e6099b7203da6c2e08 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -46,8 +46,8 @@ using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
-#if MOCKUPDEBUG
-[assembly:InternalsVisibleTo("VectoMockup")]
+#if (MOCKUP || DEBUG) //DEBUG to prevent errors in Visual studio
+ [assembly:InternalsVisibleTo("VectoMockup")]
#endif
namespace TUGraz.VectoCore.Models.SimulationComponent.Data
diff --git a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
index aa8275205b2a3c56c727038e6ecaa837b17bb7b9..ed368bc1c4a2c94b2ea74d4a2a6ba2c431664348 100644
--- a/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
+++ b/VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore
LoadModule<CIFNinjectModule>();
-#if (MOCKUPDEBUG) //TODO: add second constant for release
+#if (MOCKUP) //TODO: add second constant for release
var compiledModuleLoaderPlugin = new CompiledModuleLoaderPlugin(Kernel, new AssemblyNameRetriever());
var assembly = Assembly.LoadFile(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),"VectoMockup.dll"));
//var assembly = Assembly.LoadFile("VectoMockup.dll");
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 8a7b2bc27956aa91989c6fbeee83fd566365b85d..ae8fb0fd94e6deb9db185f704c06257ee6842e55 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -4,9 +4,9 @@
<AssemblyName>VectoCore</AssemblyName>
<TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
- <Configurations>Debug;Release;MockupDebug</Configurations>
+ <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'">
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net48|AnyCPU'">
@@ -15,7 +15,10 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
- <ItemGroup>
+ <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
+ <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants>
+ </PropertyGroup>
+ <ItemGroup>
<None Remove="Resources\Declaration\Buses\DefaultActuationsMap.apac" />
<None Remove="Resources\Declaration\VAUXBus\DEFAULT_1-Cylinder_1-Stage_393ccm.acmp" />
<None Remove="Resources\Declaration\VAUXBus\DEFAULT_2-Cylinder_1-Stage_650ccm.acmp" />
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 0035abd02611af0f697f33fc5149246c6bcb2dec..16bd88039e44754edb7a8ef165e2bbf0dd919968 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -9,7 +9,9 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
-
+ <PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
+ <DefineConstants>$(DefineConstants);MOCKUP</DefineConstants>
+ </PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
@@ -34,14 +36,27 @@
</None>
</ItemGroup>
<Choose>
- <When Condition="'$(Configuration)|$(Platform)'=='MockupDebug|AnyCPU'">
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
+ $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
+ <ItemGroup>
+ <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
+
+ </ItemGroup>
+ <!--<PropertyGroup>
+ <DefineConstants>MOCKUP</DefineConstants>
+ </PropertyGroup>-->
+ </When>
+ </Choose>
+ <Choose>
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
+ $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
- <ProjectReference Include="..\..\VectoMockup\VectoMockup\VectoMockup.csproj" />
+ <ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
- <PropertyGroup>
+ <!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
- </PropertyGroup>
+ </PropertyGroup>-->
</When>
</Choose>