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

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

updated build configuration added MockupRelease Solution configuration

parent 0754e4c7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 259 additions and 184 deletions
VECTO.sln
+ 101
− 57
View file @ 6da0076a
This diff is collapsed.
VECTO/VECTO.vbproj
+ 103
− 97
View file @ 6da0076a
<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
VECTO3GUI2020/VECTO3GUI2020.csproj
+ 17
− 14
View file @ 6da0076a
......@@ -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>
......
VectoCommon/VectoHashing/VectoHashing.csproj
+ 1
− 0
View file @ 6da0076a
......@@ -8,6 +8,7 @@
<AssemblyName>VectoHashing</AssemblyName>
<TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
<DefineConstants />
<Configurations>Debug;Release;MockupRelease</Configurations>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
......
VectoConsole/VectoConsole.csproj
+ 8
− 5
View file @ 6da0076a
......@@ -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
VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+ 2
− 2
View file @ 6da0076a
......@@ -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 @ 6da0076a
......@@ -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");
......
VectoCore/VectoCore/VectoCore.csproj
+ 6
− 3
View file @ 6da0076a
......@@ -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" />
......
VectoCore/VectoCoreTest/VectoCoreTest.csproj
+ 20
− 5
View file @ 6da0076a
......@@ -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>
......
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