From da3bcf0b7e27cf39417db2d2dce5a67c5a1c220a Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 7 Feb 2022 15:47:39 +0100
Subject: [PATCH] [VectoCommon] Changed Project Configuration to new SDK format
---
.../VectoCommon/Properties/AssemblyInfo.cs | 66 ------
VectoCommon/VectoCommon/Properties/Version.cs | 34 ---
VectoCommon/VectoCommon/Properties/Version.tt | 36 ----
VectoCommon/VectoCommon/VectoCommon.csproj | 203 ++++--------------
4 files changed, 39 insertions(+), 300 deletions(-)
delete mode 100644 VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
delete mode 100644 VectoCommon/VectoCommon/Properties/Version.cs
delete mode 100644 VectoCommon/VectoCommon/Properties/Version.tt
diff --git a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
deleted file mode 100644
index ddf573dba5..0000000000
--- a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2019 European Union
-*
-* Developed by Graz University of Technology,
-* Institute of Internal Combustion Engines and Thermodynamics,
-* Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("VectoCommon")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Europan Union")]
-[assembly: AssemblyProduct("VectoCommon")]
-[assembly: AssemblyCopyright("Copyright © 2012-2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
-// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("e73de4db-786a-4d33-af7d-2ba217ff9aa6")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-// Hauptversion
-// Nebenversion
-// Buildnummer
-// Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyVersion("1.0.0.0")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/VectoCommon/VectoCommon/Properties/Version.cs b/VectoCommon/VectoCommon/Properties/Version.cs
deleted file mode 100644
index 2371bff40d..0000000000
--- a/VectoCommon/VectoCommon/Properties/Version.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2017 European Union
-*
-* Developed by Graz University of Technology,
-* Institute of Internal Combustion Engines and Thermodynamics,
-* Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-using System.Reflection;
-[assembly: AssemblyVersion("0.7.6.2527")]
-[assembly: AssemblyFileVersion("0.7.6.2527")]
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/Properties/Version.tt b/VectoCommon/VectoCommon/Properties/Version.tt
deleted file mode 100644
index f4f873f59b..0000000000
--- a/VectoCommon/VectoCommon/Properties/Version.tt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* This file is part of VECTO.
-*
-* Copyright © 2012-2017 European Union
-*
-* Developed by Graz University of Technology,
-* Institute of Internal Combustion Engines and Thermodynamics,
-* Institute of Technical Informatics
-*
-* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
-* by the European Commission - subsequent versions of the EUPL (the "Licence");
-* You may not use VECTO except in compliance with the Licence.
-* You may obtain a copy of the Licence at:
-*
-* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
-*
-* Unless required by applicable law or agreed to in writing, VECTO
-* distributed under the Licence is distributed on an "AS IS" basis,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the Licence for the specific language governing permissions and
-* limitations under the Licence.
-*
-* Authors:
-* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
-* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
-* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
-* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
-* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
-* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
-*/
-
-<#@ output extension=".cs"#>
-<#@ include file="../../../VectoCore/VectoCore/VersionNumber.t4" once="true" #>
-using System.Reflection;
-[assembly: AssemblyVersion("<#= GetVectoCoreVersionNumber() #>")]
-[assembly: AssemblyFileVersion("<#= GetVectoCoreVersionNumber() #>")]
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index c0bd522769..7cc939122b 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -1,181 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>TUGraz.VectoCommon</RootNamespace>
+ <VersionPrefix>0.7.7.$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix>
<AssemblyName>VectoCommon</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
+ <Product>VectoCommon</Product>
+ <RootNamespace>TUGraz.VectoCommon</RootNamespace>
+ <ProjectGuid>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</ProjectGuid>
+
+ <TargetFramework>net45</TargetFramework>
+ <VersionSuffix Condition="'$(Configuration)'=='DEPLOY'"></VersionSuffix>
+ <VersionSuffix Condition="'$(Configuration)'=='RELEASE'">RC</VersionSuffix>
+ <VersionSuffix Condition="'$(Configuration)'=='DEBUG'">DEV</VersionSuffix>
+ <Authors>Graz University of Technology</Authors>
+ <Company>European Union</Company>
+ <Copyright>Copyright © 2012-$([System.DateTime]::UtcNow.Year)</Copyright>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <PlatformTarget>AnyCPU</PlatformTarget>
<WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <DebugSymbols>true</DebugSymbols>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>
- </DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <DefineConstants />
+ <DebugType>none</DebugType>
+ <WarningLevel>5</WarningLevel>
+ <DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+ <PackageReference Include="NLog" Version="4.7.13" />
+ <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+ </ItemGroup>
+
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NLog.4.7.13\lib\net45\NLog.dll</HintPath>
- </Reference>
- <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Core" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.Transactions" />
- <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
- </Reference>
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
</ItemGroup>
+
<ItemGroup>
- <Compile Include="BusAuxiliaries\BusHVACSystemConfiguration.cs" />
- <Compile Include="BusAuxiliaries\CompressorMapValues.cs" />
- <Compile Include="BusAuxiliaries\FloorType.cs" />
- <Compile Include="BusAuxiliaries\IActuations.cs" />
- <Compile Include="BusAuxiliaries\IAlternatorMap.cs" />
- <Compile Include="BusAuxiliaries\IAuxiliaryConfig.cs" />
- <Compile Include="BusAuxiliaries\ICombinedAlternatorMapRow.cs" />
- <Compile Include="BusAuxiliaries\ICompressorMap.cs" />
- <Compile Include="BusAuxiliaries\IElectricsUserInputsConfig.cs" />
- <Compile Include="BusAuxiliaries\IEnvironmentalConditionsMapEntry.cs" />
- <Compile Include="BusAuxiliaries\IEnvironmentalConditionsMap.cs" />
- <Compile Include="BusAuxiliaries\IFuelConsumptionMap.cs" />
- <Compile Include="BusAuxiliaries\IFuelProperties.cs" />
- <Compile Include="BusAuxiliaries\IHVACConstants.cs" />
- <Compile Include="BusAuxiliaries\IHVACUserInputsConfig.cs" />
- <Compile Include="BusAuxiliaries\IActuationsMap.cs" />
- <Compile Include="BusAuxiliaries\IPneumaticsConsumersDemand.cs" />
- <Compile Include="BusAuxiliaries\IPneumaticUserInputsConfig.cs" />
- <Compile Include="BusAuxiliaries\IResultCard.cs" />
- <Compile Include="BusAuxiliaries\ISignals.cs" />
- <Compile Include="BusAuxiliaries\ISSMDeclarationInputs.cs" />
- <Compile Include="BusAuxiliaries\ISSMTechnologyBenefits.cs" />
- <Compile Include="BusAuxiliaries\IVehicleData.cs" />
- <Compile Include="BusAuxiliaries\SmartResult.cs" />
- <Compile Include="Hashing\IVectoHash.cs" />
- <Compile Include="Hashing\VectoComponents.cs" />
- <Compile Include="InputData\DataSourceType.cs" />
- <Compile Include="InputData\DigestData.cs" />
- <Compile Include="Models\AlternatorType.cs" />
- <Compile Include="Models\GearshiftPosition.cs" />
- <Compile Include="Models\HybridStrategyResponse.cs" />
- <Compile Include="Models\PowertrainPosition.cs" />
- <Compile Include="InputData\TableData.cs">
- <SubType>Component</SubType>
- </Compile>
- <Compile Include="InputData\VTPDeclarationInputData.cs" />
- <Compile Include="InputData\VTPEngineeringInputData.cs" />
- <Compile Include="Models\AuxiliaryType.cs" />
- <Compile Include="Exceptions\VectoExceptions.cs" />
- <Compile Include="Exceptions\VectoSimulationException.cs" />
- <Compile Include="InputData\DeclarationInputData.cs" />
- <Compile Include="InputData\EngineeringInputData.cs" />
- <Compile Include="InputData\IInputDataProvider.cs" />
- <Compile Include="InputData\IntegrityStatus.cs" />
- <Compile Include="Models\AuxiliaryDemandType.cs" />
- <Compile Include="Models\AngledriveType.cs" />
- <Compile Include="Models\AxleConfiguration.cs" />
- <Compile Include="Models\AxleLineType.cs" />
- <Compile Include="Models\CertificationMethod.cs" />
- <Compile Include="Models\CrossWindCorrectionMode.cs" />
- <Compile Include="Models\ExecutionMode.cs" />
- <Compile Include="Models\FuelType.cs" />
- <Compile Include="Models\GearboxType.cs" />
- <Compile Include="Models\IResponse.cs" />
- <Compile Include="Models\LegislativeClass.cs" />
- <Compile Include="Models\LoggingObject.cs" />
- <Compile Include="Models\MissionType.cs" />
- <Compile Include="Models\OperatingPoint.cs" />
- <Compile Include="Models\RegistrationClass.cs" />
- <Compile Include="Models\RetarderType.cs" />
- <Compile Include="Models\SimulationType.cs" />
- <Compile Include="Models\TorqueConverterOperatingPoint.cs" />
- <Compile Include="Models\VehicleCategory.cs" />
- <Compile Include="Models\VehicleClass.cs" />
- <Compile Include="Models\VehicleCode.cs" />
- <Compile Include="Models\WHRType.cs" />
- <Compile Include="OutputData\IOutputFileWriter.cs" />
- <Compile Include="OutputData\IOutputPlugin.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Version.cs">
- <DependentUpon>Version.tt</DependentUpon>
- <AutoGen>True</AutoGen>
+ <Compile Update="Resources\XMLNames.Designer.cs">
<DesignTime>True</DesignTime>
- </Compile>
- <Compile Include="Resources\XMLNames.Designer.cs">
<AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
<DependentUpon>XMLNames.resx</DependentUpon>
</Compile>
- <Compile Include="Utils\DoubleExtensionMethods.cs" />
- <Compile Include="Utils\EnumerableExtensionMethods.cs" />
- <Compile Include="Utils\EnumHelper.cs" />
- <Compile Include="Utils\GuiLabelAttribute.cs" />
- <Compile Include="Utils\IntExtensionMethods.cs" />
- <Compile Include="Utils\SI.cs" />
- <Compile Include="Utils\SIConvertExtensionMethods.cs" />
- <Compile Include="Utils\SIExtensionMetods.cs" />
- <Compile Include="Utils\SIUtils.cs" />
- <Compile Include="Utils\StringExtensionMethods.cs" />
- <Compile Include="Utils\Validation.cs" />
- <Compile Include="Utils\VectoMath.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="InputData\BusInputData.cd" />
- <None Include="packages.config" />
- <None Include="Properties\Version.tt">
- <Generator>TextTemplatingFileGenerator</Generator>
- <LastGenOutput>Version.cs</LastGenOutput>
- </None>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\XMLNames.resx">
- <Generator>PublicResXFileCodeGenerator</Generator>
- <SubType>Designer</SubType>
+ <EmbeddedResource Update="Resources\XMLNames.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>XMLNames.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
- <ItemGroup>
- <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
- <PropertyGroup Condition="'$(SolutionDir)' == '' or '$(SolutionDir)' == '*undefined*'">
- <SolutionDir>..\..\</SolutionDir>
- </PropertyGroup>
- <Import Project="$(SolutionDir)Build\CommonSettings.targets" />
-</Project>
\ No newline at end of file
+
+</Project>
--
GitLab