diff --git a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs index 58941cfa6883f877aafd3c2f50b91119e931cfab..9d0dc7b2be74f2dde46cba93fc9225c2aab1dd10 100644 --- a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs +++ b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs @@ -62,5 +62,5 @@ using System.Runtime.InteropServices; // 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")] +//[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 new file mode 100644 index 0000000000000000000000000000000000000000..3d41901e5e4ad1d5df2a1e32967c4a9cd5e4970a --- /dev/null +++ b/VectoCommon/VectoCommon/Properties/Version.cs @@ -0,0 +1,34 @@ +/* +* This file is part of VECTO. +* +* Copyright © 2012-2016 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("3.1.2.903")] +[assembly: AssemblyFileVersion("3.1.2.903")] diff --git a/VectoCommon/VectoCommon/Properties/Version.tt b/VectoCommon/VectoCommon/Properties/Version.tt new file mode 100644 index 0000000000000000000000000000000000000000..e5ca8e5e9e85e918432dd564d6360e86d5547ed5 --- /dev/null +++ b/VectoCommon/VectoCommon/Properties/Version.tt @@ -0,0 +1,39 @@ +/* +* This file is part of VECTO. +* +* Copyright © 2012-2016 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 +*/ + +<#@ template language="C#" #> +<#@ output extension=".cs"#> +using System.Reflection; +[assembly: AssemblyVersion("3.1.2.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("3.1.2.<#= this.RevisionNumber #>")] +<#+ + int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2015, 1, 1)).TotalDays; +#> \ No newline at end of file diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj index 3eab0336e658a0e8906a55730cdc2f36223765c6..c994ad974c018a6524114452fafb12fd69ebc6d0 100644 --- a/VectoCommon/VectoCommon/VectoCommon.csproj +++ b/VectoCommon/VectoCommon/VectoCommon.csproj @@ -74,6 +74,11 @@ <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> + <DesignTime>True</DesignTime> + </Compile> <Compile Include="Resources\XMLNames.Designer.cs"> <DependentUpon>XMLNames.resx</DependentUpon> <AutoGen>True</AutoGen> @@ -90,6 +95,10 @@ </ItemGroup> <ItemGroup> <None Include="packages.config" /> + <None Include="Properties\Version.tt"> + <Generator>TextTemplatingFileGenerator</Generator> + <LastGenOutput>Version.cs</LastGenOutput> + </None> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources\XMLNames.resx"> diff --git a/VectoCommon/VectoHashingTest/VectoHashTest.cs b/VectoCommon/VectoHashingTest/VectoHashTest.cs index 530e7ec536e88686d82ba8962565675c22c07a4c..1d1ac4a21869adabd7f7172139939f176b953b81 100644 --- a/VectoCommon/VectoHashingTest/VectoHashTest.cs +++ b/VectoCommon/VectoHashingTest/VectoHashTest.cs @@ -32,13 +32,10 @@ using System; using System.IO; using System.Linq; -using System.Security.Cryptography; -using System.Security.Cryptography.Xml; using System.Text; using System.Xml; using System.Xml.Linq; using System.Xml.Schema; -using System.Xml.XPath; using NUnit.Framework; using TUGraz.VectoCore.Utils; using TUGraz.VectoHashing; @@ -421,7 +418,6 @@ namespace VectoHashingTest TestCase(VectoComponents.Angledrive, "ANGL-"), TestCase(VectoComponents.Airdrag, "AD-"), TestCase(VectoComponents.Tyre, "TYRE-"), - ] public void TestIdPrefix(VectoComponents component, string expectedPrefix) { diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj index 59549b68fb3f1b6bccfd92236ff65ba2882d6662..b6a36b9a249c06ba2ff31a73aef4e734321566c5 100644 --- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj +++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj @@ -170,6 +170,10 @@ <Project>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</Project> <Name>VectoCore</Name> </ProjectReference> + <ProjectReference Include="..\VectoCommon\VectoCommon.csproj"> + <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project> + <Name>VectoCommon</Name> + </ProjectReference> <ProjectReference Include="..\VectoHashing\VectoHashing.csproj"> <Project>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</Project> <Name>VectoHashing</Name>