diff --git a/HashingCmd/HashingCmd.csproj b/HashingCmd/HashingCmd.csproj index 139413516a70d5aa4090210f9512e2fd6927115a..a2b0b8f2ace204feb6fe1d638960b25dea932b5c 100644 --- a/HashingCmd/HashingCmd.csproj +++ b/HashingCmd/HashingCmd.csproj @@ -7,6 +7,7 @@ <ProjectGuid>{33F9848E-9257-4BE2-915F-68E748AEB204}</ProjectGuid> <RootNamespace>HashingCmd</RootNamespace> <AssemblyName>hashingcmd</AssemblyName> + <DefineConstants /> <OutputType>Exe</OutputType> </PropertyGroup> diff --git a/HashingTool/HashingTool.csproj b/HashingTool/HashingTool.csproj index 49fc85a29de80f10ca78e8c202f89b1ec1da9a6e..15c07ae30237721fb199d33acc99cd8f2cfecf26 100644 --- a/HashingTool/HashingTool.csproj +++ b/HashingTool/HashingTool.csproj @@ -8,6 +8,7 @@ <OutputType>WinExe</OutputType> <RootNamespace>HashingTool</RootNamespace> <AssemblyName>HashingTool</AssemblyName> + <DefineConstants /> <UseWPF>true</UseWPF> </PropertyGroup> diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj index 0dda7874cdbf85a20f3a27ca7c4f4f69bcdbe58b..a81e97e951ea537e1528e599d1d0b2f4023c4c60 100644 --- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj +++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj @@ -4,6 +4,7 @@ <OutputType>Exe</OutputType> <RootNamespace>DeclarationCycleZip</RootNamespace> <AssemblyName>DeclarationCycleZip</AssemblyName> + <DefineConstants /> <TargetFramework>net48</TargetFramework> </PropertyGroup> diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj index c2cbfdc3cf737815c9165a406fde0c3e659eeda0..b5ba3f57978bdcc723af8841351c878435210ca1 100644 --- a/Tools/GraphDrawer/GraphDrawer.csproj +++ b/Tools/GraphDrawer/GraphDrawer.csproj @@ -4,6 +4,7 @@ <OutputType>Exe</OutputType> <RootNamespace>GraphDrawer</RootNamespace> <AssemblyName>GraphDrawer</AssemblyName> + <DefineConstants /> <TargetFramework>net48</TargetFramework> </PropertyGroup> diff --git a/Tools/LicenceHeader/LicenceHeader.csproj b/Tools/LicenceHeader/LicenceHeader.csproj index ca492ed5a4ce68c4c223ddab24e6fc3184e48d8c..90f14a008dbc6f5094c00f716e7621001cbecb50 100644 --- a/Tools/LicenceHeader/LicenceHeader.csproj +++ b/Tools/LicenceHeader/LicenceHeader.csproj @@ -4,6 +4,7 @@ <OutputType>Exe</OutputType> <RootNamespace>LicenceHeader</RootNamespace> <AssemblyName>LicenceHeader</AssemblyName> + <DefineConstants /> <TargetFramework>net48</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/VECTO/My Project/Application.myapp b/VECTO/My Project/Application.myapp index 83d5c6a93c884f822d241cdad83ef547e8c4dbe0..01c7691b05c117062b124c683c79166329a4a4d9 100644 --- a/VECTO/My Project/Application.myapp +++ b/VECTO/My Project/Application.myapp @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <MySubMain>true</MySubMain> - <MainForm>F_MAINForm</MainForm> + <MainForm>MainForm</MainForm> <SingleInstance>false</SingleInstance> <ShutdownMode>0</ShutdownMode> <EnableVisualStyles>true</EnableVisualStyles> diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb index ac8c679590fa4fdaea25570214d4e2389169657e..4874952d2cf1e0e9e5f707a9c26f379ffc7bb82a 100644 --- a/VECTO/My Project/Resources.Designer.vb +++ b/VECTO/My Project/Resources.Designer.vb @@ -11,6 +11,7 @@ Option Strict On Option Explicit On +Imports System Namespace My.Resources @@ -21,7 +22,7 @@ Namespace My.Resources '''<summary> ''' A strongly-typed resource class, for looking up localized strings, etc. '''</summary> - <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _ + <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _ diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index 9bde1b8cd4e5c132dccdb0669840cb38bece8644..155be4ab0f5569de65a3dfdd4c8965314950404c 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -2,15 +2,23 @@ <PropertyGroup> <ProjectGuid>{AAC0F132-0A9F-45B3-B682-77AC9B24B352}</ProjectGuid> <OutputType>WinExe</OutputType> - <StartupObject>TUGraz.VECTO.My.MyApplication</StartupObject> + <StartupObject>Sub Main</StartupObject> <TargetFramework>net45</TargetFramework> <RootNamespace>TUGraz.VECTO</RootNamespace> <AssemblyName>VECTO</AssemblyName> + <DefineConstants /> <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon> <OptionStrict>On</OptionStrict> <UseWindowsForms>true</UseWindowsForms> <MyType>WindowsForms</MyType> <Configurations>Debug;Release;Deploy</Configurations> + <DefineDebug>false</DefineDebug> + <DefineTrace>false</DefineTrace> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <DefineDebug>false</DefineDebug> + <DefineTrace>false</DefineTrace> </PropertyGroup> <ItemGroup> @@ -19,28 +27,25 @@ <PackageReference Include="Ninject" Version="3.3.4" /> </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> <Reference Include="Microsoft.Build.Framework" /> <Reference Include="System.ComponentModel.DataAnnotations" /> - <Reference Include="System.Windows.Forms.DataVisualization"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.DataVisualization.dll</HintPath> - </Reference> + <Reference Include="System.Windows.Forms.DataVisualization"/> + </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> @@ -49,334 +54,38 @@ <AutoGen>True</AutoGen> <DependentUpon>Application.myapp</DependentUpon> </Compile> - <None Update="My Project\Application.myapp"> - <Generator>MyApplicationCodeGenerator</Generator> - <LastGenOutput>Application.Designer.vb</LastGenOutput> - </None> - <Compile Update="ApplicationEvents.vb" /> - <Compile Update="BusAuxiliaries\UI\frmAuxiliaryConfig.Designer.vb"> - <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon> - </Compile> - <Compile Update="BusAuxiliaries\UI\frmAuxiliaryConfig.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="BusAuxiliaries\UI\frmCombinedAlternators.Designer.vb"> - <DependentUpon>frmCombinedAlternators.vb</DependentUpon> - </Compile> - <Compile Update="BusAuxiliaries\UI\frmCombinedAlternators.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="BusAuxiliaries\UI\frmHVACTool.Designer.vb"> - <DependentUpon>frmHVACTool.vb</DependentUpon> - </Compile> - <Compile Update="BusAuxiliaries\UI\frmHVACTool.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="BusAuxiliaries\Util\DeleteCell.vb" /> - <Compile Update="BusAuxiliaries\Util\DeleteColumn.vb" /> - <Compile Update="BusAuxiliaries\Util\SIConvert.vb" /> - <Compile Update="GUI\BusAuxiliariesEngParametersForm.Designer.vb"> - <DependentUpon>BusAuxiliariesEngParametersForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\BusAuxiliariesEngParametersForm.vb" /> - <Compile Update="GUI\REESSPackDialog.Designer.vb"> - <DependentUpon>REESSPackDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\REESSPackDialog.vb" /> - <Compile Update="GUI\HybridStrategyParamsForm.Designer.vb"> - <DependentUpon>HybridStrategyParamsForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\HybridStrategyParamsForm.vb" /> - <Compile Update="GUI\BatteryForm.Designer.vb"> - <DependentUpon>BatteryForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\BatteryForm.vb" /> - <Compile Update="GUI\ElectricMotorForm.Designer.vb"> - <DependentUpon>ElectricMotorForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\ElectricMotorForm.vb" /> - <Compile Update="GUI\VectoVTPJobForm.Designer.vb"> - <DependentUpon>VectoVTPJobForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\VectoVTPJobForm.vb" /> - <Compile Update="GUI\EMGearRatioDialog.Designer.vb"> - <DependentUpon>EMGearRatioDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\EMGearRatioDialog.vb" /> - <Compile Update="Input Files\Battery.vb" /> - <Compile Update="Input Files\BrowserUtils.vb" /> - <Compile Update="GUI\VehicleTorqueLimitsDialog.Designer.vb"> - <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\VehicleTorqueLimitsDialog.vb" /> - <Compile Update="GUI\XMLExportJobDialog.Designer.vb"> - <DependentUpon>XMLExportJobDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\XMLExportJobDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\XMLImportJobDialog.Designer.vb"> - <DependentUpon>XMLImportJobDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\XMLImportJobDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\GraphForm.Designer.vb"> - <DependentUpon>GraphForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\GraphForm.vb" /> - <Compile Update="GUI\GraphEditChannelDialog.Designer.vb"> - <DependentUpon>GraphEditChannelDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\GraphEditChannelDialog.vb" /> - <Compile Update="GUI\JiraDialog.Designer.vb"> - <DependentUpon>JiraDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\JiraDialog.vb" /> - <Compile Update="GUI\WelcomeDialog.Designer.vb"> - <DependentUpon>WelcomeDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\WelcomeDialog.vb" /> - <Compile Update="GUI\EngineForm.Designer.vb"> - <DependentUpon>EngineForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\EngineForm.vb" /> - <Compile Update="GUI\GearboxForm.Designer.vb"> - <DependentUpon>GearboxForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\GearboxForm.vb" /> - <Compile Update="GUI\VehicleAuxiliariesDialog.Designer.vb"> - <DependentUpon>VehicleAuxiliariesDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\VehicleAuxiliariesDialog.vb" /> - <Compile Update="GUI\VehicleAxleDialog.Designer.vb"> - <DependentUpon>VehicleAxleDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\VehicleAxleDialog.vb" /> - <Compile Update="Input Files\ElectricMachine.vb" /> - <Compile Update="Input Files\Engine.vb" /> - <Compile Update="Input Files\Gearbox.vb" /> - <Compile Update="Configuration.vb" /> - <Compile Update="File Browser\FileBrowser.vb" /> - <Compile Update="File Browser\FileBrowserDialog.designer.vb"> - <DependentUpon>FileBrowserDialog.vb</DependentUpon> - </Compile> - <Compile Update="File Browser\FileBrowserDialog.vb" /> - <Compile Update="File Browser\FileBrowserFavoritesDialog.designer.vb"> - <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon> - </Compile> - <Compile Update="File Browser\FileBrowserFavoritesDialog.vb" /> - <Compile Update="Input Files\BusParamsEngineering.vb" /> - <Compile Update="Input Files\HybridStrategyParams.vb" /> - <Compile Update="Input Files\MockComponents.vb" /> - <Compile Update="Input Files\MockVehicleInputData.vb" /> - <Compile Update="Input Files\SuperCap.vb" /> - <Compile Update="Input Files\VectoEPTPJob.vb" /> - <Compile Update="Input Files\VectoJob.vb" /> - <Compile Update="Input Files\Vehicle.vb" /> - <Compile Update="GUI\GearboxGearDialog.Designer.vb"> - <DependentUpon>GearboxGearDialog.vb</DependentUpon> - </Compile> - <Compile Update="GUI\GearboxGearDialog.vb" /> - <Compile Update="Input Files\SubPath.vb" /> - <Compile Update="GUI\VectoJobForm.Designer.vb"> - <DependentUpon>VectoJobForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\VectoJobForm.vb" /> - <Compile Update="VECTO_Global.vb" /> - <Compile Update="VECTO_Types.vb" /> - <Compile Update="GUI\GUI_Subs.vb" /> - <Compile Update="GUI\VehicleForm.Designer.vb"> - <DependentUpon>VehicleForm.vb</DependentUpon> - </Compile> - <Compile Update="GUI\VehicleForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\Settings.Designer.vb"> - <DependentUpon>Settings.vb</DependentUpon> - </Compile> - <Compile Update="GUI\Settings.vb" /> - <Compile Update="GUI\AboutBox.Designer.vb"> - <DependentUpon>AboutBox.vb</DependentUpon> + <Compile Update="My Project\Resources.Designer.vb"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>Resources.resx</DependentUpon> </Compile> - <Compile Update="GUI\AboutBox.vb" /> - <Compile Update="MainModule.vb" /> - <Compile Update="GUI\MainForm.vb" /> - <Compile Update="GUI\MainForm.Designer.vb"> - <DependentUpon>MainForm.vb</DependentUpon> - <SubType>Form</SubType> + <Compile Update="My Project\Settings.Designer.vb"> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + <AutoGen>True</AutoGen> + <DependentUpon>Settings.settings</DependentUpon> </Compile> - <Compile Update="File Browser\FileBrowserModule.vb" /> </ItemGroup> <ItemGroup> - <Compile Update="File Browser\FileBrowserDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="File Browser\FileBrowserFavoritesDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\AboutBox.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\BatteryForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\BusAuxiliariesEngParametersForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\ElectricMotorForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\EMGearRatioDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\EngineForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\GearboxForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\GearboxGearDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\GraphEditChannelDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\GraphForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\HybridStrategyParamsForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\JiraDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\MainForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\REESSPackDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\Settings.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\VectoJobForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\VectoVTPJobForm.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\VehicleAuxiliariesDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\VehicleAxleDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\VehicleTorqueLimitsDialog.vb"> - <SubType>Form</SubType> - </Compile> - <Compile Update="GUI\WelcomeDialog.vb"> - <SubType>Form</SubType> - </Compile> + <EmbeddedResource Update="My Project\Resources.resx"> + <CustomToolNamespace>My.Resources</CustomToolNamespace> + <Generator>VbMyResourcesResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.vb</LastGenOutput> + </EmbeddedResource> </ItemGroup> - <ItemGroup> - <EmbeddedResource Update="BusAuxiliaries\UI\frmAuxiliaryConfig.resx"> - <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="BusAuxiliaries\UI\frmCombinedAlternators.resx"> - <DependentUpon>frmCombinedAlternators.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="BusAuxiliaries\UI\frmHVACTool.resx"> - <DependentUpon>frmHVACTool.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="File Browser\FileBrowserDialog.resx"> - <DependentUpon>FileBrowserDialog.vb</DependentUpon> - <SubType>Designer</SubType> - </EmbeddedResource> - <EmbeddedResource Update="File Browser\FileBrowserFavoritesDialog.resx"> - <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\BusAuxiliariesEngParametersForm.resx"> - <DependentUpon>BusAuxiliariesEngParametersForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\REESSPackDialog.resx"> - <DependentUpon>REESSPackDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\HybridStrategyParamsForm.resx"> - <DependentUpon>HybridStrategyParamsForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\BatteryForm.resx"> - <DependentUpon>BatteryForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\ElectricMotorForm.resx"> - <DependentUpon>ElectricMotorForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\GraphForm.resx"> - <DependentUpon>GraphForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\GraphEditChannelDialog.resx"> - <DependentUpon>GraphEditChannelDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\JiraDialog.resx"> - <DependentUpon>JiraDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\VectoVTPJobForm.resx"> - <DependentUpon>VectoVTPJobForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\EMGearRatioDialog.resx"> - <DependentUpon>EMGearRatioDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\VehicleTorqueLimitsDialog.resx"> - <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\WelcomeDialog.resx"> - <DependentUpon>WelcomeDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\EngineForm.resx"> - <DependentUpon>EngineForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\GearboxForm.resx"> - <DependentUpon>GearboxForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\MainForm.resx"> - <SubType>Designer</SubType> - <DependentUpon>MainForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\VectoJobForm.resx"> - <SubType>Designer</SubType> - <DependentUpon>VectoJobForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\VehicleForm.resx"> - <SubType>Designer</SubType> - <DependentUpon>VehicleForm.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\Settings.resx"> - <SubType>Designer</SubType> - <DependentUpon>Settings.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\AboutBox.resx"> - <SubType>Designer</SubType> - <DependentUpon>AboutBox.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\VehicleAuxiliariesDialog.resx"> - <DependentUpon>VehicleAuxiliariesDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\VehicleAxleDialog.resx"> - <DependentUpon>VehicleAxleDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\GearboxGearDialog.resx"> - <DependentUpon>GearboxGearDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\XMLExportJobDialog.resx"> - <DependentUpon>XMLExportJobDialog.vb</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Update="GUI\XMLImportJobDialog.resx"> - <DependentUpon>XMLImportJobDialog.vb</DependentUpon> - </EmbeddedResource> + <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" /> diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj index c35a7b67078c7ee26b1d82d224b5f413c77f3000..8595568bdeb4ebc206579ea384871072aeabbb32 100644 --- a/VECTO3GUI2020/VECTO3GUI2020.csproj +++ b/VECTO3GUI2020/VECTO3GUI2020.csproj @@ -8,6 +8,7 @@ <OutputType>WinExe</OutputType> <RootNamespace>VECTO3GUI2020</RootNamespace> <AssemblyName>VECTOMultistage</AssemblyName> + <DefineConstants /> <ApplicationIcon>Resources\Icons\Icon2.ico</ApplicationIcon> <UseWPF>true</UseWPF> <TargetFramework>net48</TargetFramework> diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj index b6aad3da63013cb5b3e9a3f9dcaca08fd7a79897..8e4b9d0951420076ca03b012fb3ede552ec5f882 100644 --- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj +++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj @@ -3,6 +3,7 @@ <ProjectGuid>{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}</ProjectGuid> <RootNamespace>VectoAuxiliariesTests</RootNamespace> <AssemblyName>VectoAuxiliariesTests</AssemblyName> + <DefineConstants /> <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors> <OptionExplicit>On</OptionExplicit> <OptionCompare>Binary</OptionCompare> diff --git a/Vecto3GUITest/Vecto3GUITest.csproj b/Vecto3GUITest/Vecto3GUITest.csproj index 8a1a54e6e5f121a1a99274aab4b3224c8d2c4743..5570f5f9e02ac423bec3b3c46f56ada3f80a1790 100644 --- a/Vecto3GUITest/Vecto3GUITest.csproj +++ b/Vecto3GUITest/Vecto3GUITest.csproj @@ -10,6 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Vecto3GUITest</RootNamespace> <AssemblyName>Vecto3GUITest</AssemblyName> + <DefineConstants /> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj index 816e2c4b46231f21a765650c5dfc247f82186a4d..bdaf868a08c42302b29fbb5c3063680324c55f27 100644 --- a/VectoCommon/VectoCommon/VectoCommon.csproj +++ b/VectoCommon/VectoCommon/VectoCommon.csproj @@ -7,6 +7,7 @@ <ProjectGuid>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</ProjectGuid> <RootNamespace>TUGraz.VectoCommon</RootNamespace> <AssemblyName>VectoCommon</AssemblyName> + <DefineConstants /> </PropertyGroup> <ItemGroup> diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj index d3b00be6dae21bf0968b8c2f5dadc8fa89ea7466..9e3c0a8817a5fa6806553ccebac0c959fd12abe7 100644 --- a/VectoCommon/VectoHashing/VectoHashing.csproj +++ b/VectoCommon/VectoHashing/VectoHashing.csproj @@ -7,6 +7,7 @@ <ProjectGuid>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</ProjectGuid> <RootNamespace>TUGraz.VectoHashing</RootNamespace> <AssemblyName>VectoHashing</AssemblyName> + <DefineConstants /> </PropertyGroup> <ItemGroup> diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj index 2eebbc838f15e5093c42cf1028e086f4a9094cbc..85fe553443d2c58e92b6dcb4349602775a81eb00 100644 --- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj +++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj @@ -7,6 +7,7 @@ <ProjectGuid>{760C1C5B-A767-463E-BA85-F0BCFC23A550}</ProjectGuid> <RootNamespace>VectoHashingTest</RootNamespace> <AssemblyName>VectoHashingTest</AssemblyName> + <DefineConstants /> </PropertyGroup> <ItemGroup> diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj index 8def8f70f97b1d5d1dc395999a55d3ac27d30d26..10a31b3c3e9cb455f8fdc07caf480e1cf68d4b10 100644 --- a/VectoConsole/VectoConsole.csproj +++ b/VectoConsole/VectoConsole.csproj @@ -4,6 +4,7 @@ <OutputType>Exe</OutputType> <RootNamespace>VectoConsole</RootNamespace> <AssemblyName>vectocmd</AssemblyName> + <DefineConstants /> <ApplicationIcon>VECTO.ico</ApplicationIcon> </PropertyGroup> diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj index 6f74143667c3a96b0d8bdc15dbab95aa0b5597fb..7fe90e44dc866d69dbc7c079e87975e563ed5cbc 100644 --- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj +++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj @@ -3,6 +3,7 @@ <ProjectGuid>{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}</ProjectGuid> <RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace> <AssemblyName>ModelbasedTests</AssemblyName> + <DefineConstants /> <TargetFramework>net48</TargetFramework> </PropertyGroup> diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj index a9f464ad9cd6a5af6b08a38188356ffd35dc5a5f..dadf5d94894b543634141460c2a49c4577cf4235 100644 --- a/VectoCore/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore/VectoCore.csproj @@ -3,6 +3,7 @@ <ProjectGuid>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</ProjectGuid> <RootNamespace>TUGraz.VectoCore</RootNamespace> <AssemblyName>VectoCore</AssemblyName> + <DefineConstants /> </PropertyGroup> <ItemGroup> diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index bbc90df01c65113f8804182fc98778dcfdff7b61..cc867495c72baa2eb976d0515a6e9ce12b05d552 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -3,6 +3,7 @@ <ProjectGuid>{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}</ProjectGuid> <RootNamespace>TUGraz.VectoCore.Tests</RootNamespace> <AssemblyName>VectoCoreTest</AssemblyName> + <DefineConstants /> <TargetFramework>net48</TargetFramework> </PropertyGroup>