diff --git a/Directory.Build.targets b/Directory.Build.targets
index 1f58cf649bb6e276915c4b76fd9148e343ede1eb..e67e41c6672be3df23bcc37fb0d38c7d8f841808 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -17,7 +17,6 @@
<PropertyGroup>
<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
<DeployPath>$(SolutionDir)Deploy\$(CurrentDate)-VECTO-$(Version)\</DeployPath>
- <DeployPath Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)Deploy\$(CurrentDate)-VECTO_MOCKUP-$(Version)\</DeployPath>
</PropertyGroup>
<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
<MakeDir Directories="$(DeployPath)"/>
@@ -27,7 +26,7 @@
<!-- All files for net45 -->
<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.exe"/>
<Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\*.dll*"/>
- <Net45Vecto Include="$(SolutionDir)VECTO\bin\Release\net45\nlog.config"/>
+ <Net45VECTO Include="$(SolutionDir)VECTO\bin\Release\net45\nlog.config"/>
<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.exe"/>
<Net45HashingTool Include="$(SolutionDir)HashingTool\bin\Release\net45\*.dll*"/>
<Net45HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net45\*.exe"/>
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index 0cf07b3c0271a4622f27ebd0bbe2d4cfc21bb04a..3b35b41552810331d09908464256ec31159f8fa9 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 3b0892f705fc040e37fade9a92f8c4e686fcc14e..a687e85b02e701ec060d85fca62a66466be646fd 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -58,8 +58,7 @@
</ItemGroup>
<Choose>
- <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
- $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index 51e32ce29a4a09d7292cad78d83d2a6da85c7a84..f1ae6dfd3f793e5bbf778fe2050b9159866414ed 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -29,6 +29,7 @@
<PackageReference Include="InteractiveDataDisplay.WPF" Version="1.0.0" NoWarn="NU1701" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" NoWarn="NU1701" />
<PackageReference Include="Ninject" Version="3.3.6" />
+ <PackageReference Include="Ninject.Extensions.ContextPreservation" Version="3.3.1" />
<PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
<PackageReference Include="PresentationFramework.Aero2" Version="1.0.1" NoWarn="NU1701" />
</ItemGroup>
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 157a10ad21b5f0c50a7fbbe0aeff1af3af72eb44..c92bd0f3f832ba3f0ab9be5fbd7cf684358b6beb 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -8,6 +8,9 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+ <PackageReference Include="Ninject" Version="3.3.6" />
+ <PackageReference Include="Ninject.Extensions.ContextPreservation" Version="3.3.1" />
+ <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
<PackageReference Include="NLog" Version="4.7.13" />
</ItemGroup>
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index 03da0bf0f22d1762e6daecf27507a7cd424236d5..062a1321abce0362d99881001e9d2fb508a124e7 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -8,7 +8,6 @@
<ItemGroup>
<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" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
diff --git a/VectoConsole/App.config b/VectoConsole/App.config
index 159bad000818a6787e2f7daef2f54cb6f031d8ca..7034a5b9a970c00aa2cc7ff792df49d915cddba6 100644
--- a/VectoConsole/App.config
+++ b/VectoConsole/App.config
@@ -3,15 +3,15 @@
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
</configSections>
- <runtime>
+ <!--<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <!--<loadFromRemoteSources enabled="true"/>-->
+ --><!--<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>
+ </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" />
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 45e6e4ef4086b424d828616b6685c969de07fe51..0bd8c6a750a674483299eaf9707a7f7f3f360585 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -19,10 +19,27 @@
<PropertyGroup Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">
<DefineConstants>$(DefineConstants);MOCKUP</DefineConstants>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+ <DebugType>none</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net48|AnyCPU'">
+ <DebugType>none</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
+ <DebugType>none</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net45|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net48|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupRelease|net6.0|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
<Choose>
- <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
- $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
+ <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
 $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>VectoMockup</_Parameter1>
diff --git a/VectoMockup/VectoMockup/VectoMockup.csproj b/VectoMockup/VectoMockup/VectoMockup.csproj
index 088fd9e2a4f2b63425b431511507730c12214250..63872dc5dadd1cc244f23f091d55d07d58643997 100644
--- a/VectoMockup/VectoMockup/VectoMockup.csproj
+++ b/VectoMockup/VectoMockup/VectoMockup.csproj
@@ -15,6 +15,15 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net6.0|AnyCPU'">
<DebugType>full</DebugType>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net48|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
<ItemGroup>
<None Remove="MockupResults\CIF_MockupResults_Conv_Bus.xml" />
<None Remove="MockupResults\CIF_MockupResults_Conv_Lorry.xml" />
@@ -61,6 +70,11 @@
<EmbeddedResource Include="MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" />
<EmbeddedResource Include="MockupResults\VIF_MockupResults_PEV_Bus.xml" />
</ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Ninject" Version="3.3.6" />
+ <PackageReference Include="Ninject.Extensions.ContextPreservation" Version="3.3.1" />
+ <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
+ </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj" />
</ItemGroup>