Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 1eba84e1 authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'feature/VECTO-1572-mockup-vecto' of... 

Merge branch 'feature/VECTO-1572-mockup-vecto' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1572-mockup-vecto
parents 9549efab b61e4117
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 411 additions and 196 deletions
.gitignore
+ 1
− 0
View file @ 1eba84e1
......@@ -221,3 +221,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/output
/Vecto3GUI2020Test/TestData/output
/VectoCommon/VectoCommon/InputData/BusInputData.cd
/.idea/.idea.VECTO/.idea
Directory.Build.targets
+ 57
− 5
View file @ 1eba84e1
......@@ -7,9 +7,12 @@
<Exec Command="&quot;$(solutiondir)documentation\VectoHashingTool\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\VectoHashingTool"/>
</Target>
-->
<!--<Target Name="BeforeBuild">
<Message Text="Compiling the program in $(Configuration) Configuration" Importance="high" />
</Target>-->
<Target Name="AfterBuild" Condition="'$(Configuration)'=='Deploy'">
<Target Name="AfterBuild" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
<Message Text="Packaging in $(Configuration) Configuration" Importance="high" />
<Exec Command="cscript &quot;$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
<PropertyGroup>
<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
......@@ -18,7 +21,8 @@
<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
<MakeDir Directories="$(DeployPath)"/>
<ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<!-- All files for net45 -->
<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe*"/>
<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.dll*"/>
......@@ -29,11 +33,27 @@
<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.exe*"/>
<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net45\*.dll*"/>
</ItemGroup>
<!--MockupDeploy-->
<ItemGroup Condition="'$(Configuration)'=='MockupDeploy'">
<!-- All files for net45 -->
<Net45VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net45\*.exe*"/>
<Net45VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net45\*.dll*"/>
<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe*"/>
<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.dll*"/>
<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe*"/>
<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.dll*"/>
<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net45\*.exe*"/>
<Net45VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net45\*.dll*"/>
</ItemGroup>
<Copy SourceFiles="@(Net45VectoCommandLine)" DestinationFolder="$(DeployPath)net45"/>
<Copy SourceFiles="@(Net45HashingTool)" DestinationFolder="$(DeployPath)net45"/>
<Copy SourceFiles="@(Net45VECTO)" DestinationFolder="$(DeployPath)net45"/>
<ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<!-- All files for net48 -->
<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.exe*"/>
<Net48VECTO Include="$(SolutionDir)VECTO\bin\Release\net48\*.dll*"/>
......@@ -44,12 +64,26 @@
<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.exe*"/>
<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net48\*.dll*"/>
</ItemGroup>
<!--MockupDeploy-->
<ItemGroup Condition="'$(Configuration)'=='MockupDeploy'">
<!-- All files for net48 -->
<Net48VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net48\*.exe*" />
<Net48VECTO Include="$(SolutionDir)VECTO\bin\MockupRelease\net48\*.dll*" />
<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.exe*" />
<Net48HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net48\*.dll*" />
<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net48\*.exe*" />
<Net48VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net48\*.dll*" />
<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net48\*.exe*" />
<Net48VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net48\*.dll*" />
</ItemGroup>
<Copy SourceFiles="@(Net48VectoCommandLine)" DestinationFolder="$(DeployPath)net48"/>
<Copy SourceFiles="@(Net48HashingTool)" DestinationFolder="$(DeployPath)net48"/>
<Copy SourceFiles="@(Net48VectoMultistage)" DestinationFolder="$(DeployPath)net48"/>
<Copy SourceFiles="@(Net48VECTO)" DestinationFolder="$(DeployPath)net48"/>
<ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<!-- All files for net6.0 -->
<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\VECTO.*" Exclude="*.dev.json"/>
<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\*.dll"/>
......@@ -64,6 +98,24 @@
<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\*.dll"/>
<VectoMultistageRuntimes Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\runtimes\**\*.*"/>
</ItemGroup>
<!--MockupDeploy-->
<ItemGroup Condition="'$(Configuration)'=='MockupDeploy'">
<!-- All files for net6.0 -->
<Vecto Include="$(SolutionDir)VECTO\bin\MockupRelease\net6.0-windows\VECTO.*" Exclude="*.dev.json"/>
<Vecto Include="$(SolutionDir)VECTO\bin\MockupRelease\net6.0-windows\*.dll"/>
<VectoRuntimes Include="$(SolutionDir)VECTO\bin\MockupRelease\net6.0-windows\runtimes\**\*.*"/>
<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net6.0\vectocmd.*" Exclude="*.dev.json"/>
<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net6.0\*.dll"/>
<VectoCommandLineRuntimes Include="$(SolutionDir)VectoConsole\bin\MockupRelease\net6.0\runtimes\**\*.*"/>
<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\hashingcmd.*" Exclude="*.dev.json"/>
<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\*.dll"/>
<HashingToolRuntimes Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\runtimes\**\*.*"/>
<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\*.dll"/>
<VectoMultistageRuntimes Include="$(SolutionDir)VECTO3GUI2020\bin\MockupRelease\net6.0-windows\runtimes\**\*.*"/>
</ItemGroup>
<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(DeployPath)net60"/>
<Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(DeployPath)net60"/>
<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(DeployPath)net60"/>
......
Tools/VECTOConsoleStart/Program.cs
+ 16
− 3
View file @ 1eba84e1
......@@ -3,17 +3,30 @@ using Microsoft.Win32;
using System.Diagnostics;
using System.Reflection;
using System.IO;
using System.Linq;
using System.Text;
namespace TUGraz.VECTO
{
class Program
{
static void Main()
private static int Main(string[] args)
{
var version = GetHighestNETVersion();
Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe") {
WorkingDirectory = Directory.GetCurrentDirectory()
var argsString = "";
foreach (var arg in args) {
argsString += $"\"{arg}\" ";
}
var process = Process.Start(new ProcessStartInfo($"{version}\\{Assembly.GetExecutingAssembly().GetName().Name}.exe")
{
WorkingDirectory = Directory.GetCurrentDirectory(),
UseShellExecute = false,
Arguments = argsString,
});
process?.WaitForExit();
return process?.ExitCode ?? -1;
}
private static string GetHighestNETVersion()
......
Tools/VECTOConsoleStart/VECTOConsoleStart.csproj
+ 4
− 2
View file @ 1eba84e1
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<OutputType>exe</OutputType>
<AssemblyName>vectocmd</AssemblyName>
<ApplicationIcon>Icon2.ico</ApplicationIcon>
<RootNamespace>TUGraz.VECTO</RootNamespace>
<TargetFrameworks>net45</TargetFrameworks>
<DefineConstants />
<DefineConstants />
<StartupObject></StartupObject>
</PropertyGroup>
</Project>
Tools/VECTOStart/VECTOStart.csproj
+ 1
− 1
View file @ 1eba84e1
......@@ -5,7 +5,7 @@
<AssemblyName>VECTO</AssemblyName>
<ApplicationIcon>Icon2.ico</ApplicationIcon>
<RootNamespace>TUGraz.VECTO</RootNamespace>
<Configurations>Debug;Release;Deploy</Configurations>
<Configurations>Debug;Release;Deploy;MockupDeploy</Configurations>
<TargetFrameworks>net45</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
......
VECTO.sln
+ 144
− 59
View file @ 1eba84e1
This diff is collapsed.
VECTO/VECTO.vbproj
+ 105
− 97
View file @ 1eba84e1
<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.5">
<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>
<TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'MockupDeploy'">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
VECTO3GUI2020/VECTO3GUI2020.csproj
+ 18
− 15
View file @ 1eba84e1
......@@ -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,12 +20,15 @@
<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" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" NoWarn="NU1701" />
<PackageReference Include="Ninject" Version="3.3.5" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
<PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" NoWarn="NU1701" />
</ItemGroup>
......@@ -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>
......
VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+ 1
− 1
View file @ 1eba84e1
......@@ -15,7 +15,7 @@
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Ninject" Version="3.3.5" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="NLog" Version="4.7.13" />
<PackageReference Include="Moq" Version="4.16.1" />
</ItemGroup>
......
Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
+ 1
− 1
View file @ 1eba84e1
......@@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Ninject" Version="3.3.5" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
</ItemGroup>
......
VectoCommon/VectoHashing/VectoHashing.csproj
+ 1
− 0
View file @ 1eba84e1
......@@ -8,6 +8,7 @@
<AssemblyName>VectoHashing</AssemblyName>
<TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
<Configurations>Debug;Release;MockupRelease</Configurations>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
......
VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+ 1
− 1
View file @ 1eba84e1
......@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Ninject" Version="3.3.5" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
......
VectoConsole/App.config
+ 9
− 0
View file @ 1eba84e1
......@@ -3,6 +3,15 @@
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
</configSections>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!--<loadFromRemoteSources enabled="true"/>-->
<dependentAssembly>
<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.5.0" newVersion="3.3.6.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="false" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
<targets async="true">
<target xsi:type="Console" name="ConsoleLogger" error="true" />
......
VectoConsole/Program.cs
+ 1
− 1
View file @ 1eba84e1
......@@ -236,7 +236,7 @@ Examples:
}
fileWriter = new FileOutputWriter(file);
var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter);
var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(mode, dataProvider, fileWriter, null, null, true);
//var runsFactory = SimulatorFactory.CreateSimulatorFactory(mode, dataProvider, fileWriter);
runsFactory.ModalResults1Hz = args.Contains("-1Hz");
runsFactory.WriteModalResults = args.Contains("-mod");
......
VectoConsole/VectoConsole.csproj
+ 26
− 2
View file @ 1eba84e1
......@@ -6,10 +6,22 @@
<ApplicationIcon>VECTO.ico</ApplicationIcon>
<TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
<Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net48|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
<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.5" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="NLog" Version="4.7.13" />
</ItemGroup>
......@@ -28,4 +40,16 @@
<ItemGroup>
<ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>
<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
</ItemGroup>
<!--<PropertyGroup>
<DefineConstants>MOCKUP</DefineConstants>
</PropertyGroup>-->
</When>
</Choose>
</Project>
\ No newline at end of file
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+ 7
− 3
View file @ 1eba84e1
......@@ -179,9 +179,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual bool ZeroEmissionVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_ZeroEmissionVehicle));
public virtual bool HybridElectricHDV => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV));
public virtual bool HybridElectricHDV => ElementExists(XMLNames.Vehicle_HybridElectricHDV)
? XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_HybridElectricHDV))
: false;
public virtual bool DualFuelVehicle => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle));
public virtual bool DualFuelVehicle => ElementExists(XMLNames.Vehicle_DualFuelVehicle)
? XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_DualFuelVehicle))
: false;
public virtual Watt MaxNetPower1 =>
ElementExists(XMLNames.Vehicle_MaxNetPower1)
......@@ -237,7 +241,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual Watt MaxChargingPower => ElementExists(XMLNames.Vehicle_MaxChargingPower) ?
XmlConvert.ToInt32(GetString(XMLNames.Vehicle_MaxChargingPower)).SI<Watt>() : null;
public virtual VectoSimulationJobType VehicleType { get => throw new NotImplementedException("must be overriden in derived classes"); }
public virtual VectoSimulationJobType VehicleType { get => VectoSimulationJobType.ConventionalVehicle; }
#region Implementation of IAdvancedDriverAssistantSystemDeclarationInputData
......
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs
+ 13
− 0
View file @ 1eba84e1
......@@ -114,6 +114,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public XMLDeclarationHevPxPrimaryBusDataProviderV24(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile)
: base(jobData, xmlNode, sourceFile) { }
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.ParallelHybridVehicle;
}
// ---------------------------------------------------------------------------------------
......@@ -134,6 +136,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
: base(jobData, xmlNode, sourceFile) { }
public override IList<ITorqueLimitInputData> TorqueLimits => null;
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle;
}
// ---------------------------------------------------------------------------------------
......@@ -158,6 +162,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override IList<ITorqueLimitInputData> TorqueLimits => null;
#endregion
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.BatteryElectricVehicle;
}
......@@ -179,6 +185,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override bool Articulated => GetBool(XMLNames.Vehicle_Articulated);
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.BatteryElectricVehicle;
#endregion
}
......@@ -203,6 +211,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override IList<ITorqueLimitInputData> TorqueLimits => null;
#region Overrides of AbstractXMLVehicleDataProviderV24
public override VectoSimulationJobType VehicleType => VectoSimulationJobType.SerialHybridVehicle;
#endregion
#endregion
}
......
VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+ 2
− 2
View file @ 1eba84e1
......@@ -18,8 +18,8 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
{
protected DeclarationDataAdapterPrimaryBus _dao = new DeclarationDataAdapterPrimaryBus();
public DeclarationModePrimaryBusVectoRunDataFactory(IDeclarationInputDataProvider dataProvider, IDeclarationReport report) :
base(dataProvider, report)
public DeclarationModePrimaryBusVectoRunDataFactory(IDeclarationInputDataProvider dataProvider, IDeclarationReport report, bool checkJobType = true) :
base(dataProvider, report, checkJobType)
{ }
#region Overrides of AbstractDeclarationVectoRunDataFactory
......
VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+ 2
− 2
View file @ 1eba84e1
......@@ -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
......
VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
+ 1
− 1
View file @ 1eba84e1
......@@ -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");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about