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

Skip to content
Snippets Groups Projects
Commit e7b072c0 authored by Harald MARTINI's avatar Harald MARTINI
Browse files

Merged incoming changes

parents 4bba7dfe 0767182f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 10 deletions
Directory.Build.targets
+ 1
− 2
View file @ e7b072c0
......@@ -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"/>
......
Documentation/User Manual Source/Release Notes Vecto3.x.pdf
+ 0
− 0
View file @ e7b072c0
No preview for this file type
VECTO/VECTO.vbproj
+ 1
− 2
View file @ e7b072c0
......@@ -58,8 +58,7 @@
</ItemGroup>
<Choose>
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(
$(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
<When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(&#xD;&#xA; $(FinalDefineConstants), '^(.*,)*MOCKUP(,.*)*$'))">
<ItemGroup>
<ProjectReference Include="..\VectoMockup\VectoMockup\VectoMockup.csproj" />
......
VECTO3GUI2020/VECTO3GUI2020.csproj
+ 1
− 0
View file @ e7b072c0
......@@ -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>
......
VectoCommon/VectoCommon/VectoCommon.csproj
+ 3
− 0
View file @ e7b072c0
......@@ -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>
......
VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+ 0
− 1
View file @ e7b072c0
......@@ -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" />
......
VectoConsole/App.config
+ 3
− 3
View file @ e7b072c0
......@@ -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" />
......
VectoCore/VectoCore/VectoCore.csproj
+ 19
− 2
View file @ e7b072c0
......@@ -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(&#xD;&#xA; $(DefineConstants), '^(.*;)*MOCKUP(;.*)*$'))">
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>VectoMockup</_Parameter1>
......
VectoMockup/VectoMockup/VectoMockup.csproj
+ 14
− 0
View file @ e7b072c0
......@@ -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>
......
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