diff --git a/Directory.Build.props b/Directory.Build.props index 420a82407fb339157095ff7ee9fe5dfe98848e2d..b74b1da271ab96741351b298ec8685e34a504791 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,19 +1,22 @@ <Project> <PropertyGroup> - <!-- For a Release Candidate: Uncomment the following line: --> + <!-- For a Release Candidate uncomment the following line: --> <!--<DefineConstants>$(DefineConstants),RELEASE_CANDIDATE</DefineConstants>--> - <!-- For a Release: Uncomment the following line: --> + <!-- For a Release uncomment the following line: --> <!--<DefineConstants>$(DefineConstants),CERTIFICATION_RELEASE</DefineConstants>--> + + <!-- Global VECTO Version --> + <MainProductVersion>0.7.7</MainProductVersion> </PropertyGroup> - <!-- The following settings define the default values for ALL projects --> + <!-- The following settings are used as default values for ALL projects --> <PropertyGroup> - <VersionPrefix>0.7.7.$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix> + <TargetFramework>net45</TargetFramework> + <VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix> <Authors>Graz University of Technology</Authors> <Company>European Union</Company> <Copyright>Copyright © 2012-$([System.DateTime]::UtcNow.Year)</Copyright> - <TargetFramework>net45</TargetFramework> </PropertyGroup> <PropertyGroup> @@ -28,10 +31,11 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <TreatWarningsAsErrors>false</TreatWarningsAsErrors> - <DefineConstants>DEBUG;TRACE</DefineConstants> + <DefineConstants>DEBUG</DefineConstants> + <!--<DefineConstants>DEBUG;TRACE</DefineConstants>--> <PlatformTarget>AnyCPU</PlatformTarget> - <WarningLevel>4</WarningLevel> - <DebugType>full</DebugType> + <WarningLevel>5</WarningLevel> + <DebugType>pdbonly</DebugType> <DebugSymbols>true</DebugSymbols> <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> </PropertyGroup> @@ -39,7 +43,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <DefineConstants /> <DebugType>none</DebugType> - <WarningLevel>4</WarningLevel> + <WarningLevel>5</WarningLevel> <DebugSymbols>false</DebugSymbols> </PropertyGroup> </Project> \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000000000000000000000000000000000000..137b6c1c4943c5855778764c2f21938254edf09b --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,5 @@ +<Project> + <!--<Target Name="VersionMessage" AfterTargets="build"> + <Message Text="$(AssemblyName) -> $(Version)" importance="high"/> + </Target>--> +</Project> \ No newline at end of file diff --git a/VectoCommon/VectoCommon/packages.config b/VectoCommon/VectoCommon/packages.config deleted file mode 100644 index 6798d5a11d50a9174306e5071bcf3741e1256c7a..0000000000000000000000000000000000000000 --- a/VectoCommon/VectoCommon/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" /> - <package id="NLog" version="4.7.13" targetFramework="net45" /> - <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" /> -</packages> \ No newline at end of file diff --git a/VectoCommon/VectoHashing/Properties/AssemblyInfo.cs b/VectoCommon/VectoHashing/Properties/AssemblyInfo.cs deleted file mode 100644 index 7cb6c91fcc8449097199e9465cd3f3b29c4f93ab..0000000000000000000000000000000000000000 --- a/VectoCommon/VectoHashing/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,67 +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; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("VectoHashing")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VectoHashing")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("334248fa-331e-4255-97fe-617e1a497f6f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] diff --git a/VectoCommon/VectoHashing/Properties/Version.cs b/VectoCommon/VectoHashing/Properties/Version.cs deleted file mode 100644 index 4f3fd2a3bf40edec40cde6f2873c753f0c7559f4..0000000000000000000000000000000000000000 --- a/VectoCommon/VectoHashing/Properties/Version.cs +++ /dev/null @@ -1,34 +0,0 @@ -/* -* 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("1.2.0.2527")] -[assembly: AssemblyFileVersion("1.2.0.2527")] diff --git a/VectoCommon/VectoHashing/Properties/Version.tt b/VectoCommon/VectoHashing/Properties/Version.tt deleted file mode 100644 index 7d01959c7f78fbd0f727127a37ed5ebf9f8a7f4b..0000000000000000000000000000000000000000 --- a/VectoCommon/VectoHashing/Properties/Version.tt +++ /dev/null @@ -1,40 +0,0 @@ -/* -* 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"#> -<#@ include file="../../../VectoCore/VectoCore/VersionNumber.t4" once="true" #> -using System.Reflection; -[assembly: AssemblyVersion("1.2.0.<#= GetBuildNumber() #>")] -[assembly: AssemblyFileVersion("1.2.0.<#= GetBuildNumber() #>")] -<#+ - int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2015, 1, 1)).TotalDays; -#> \ No newline at end of file diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj index 8d496c1df758544767cf3891ffe0b7b60c586f1d..7b3124ed952839bcc0d28f109a742ef6f5627384 100644 --- a/VectoCommon/VectoHashing/VectoHashing.csproj +++ b/VectoCommon/VectoHashing/VectoHashing.csproj @@ -1,37 +1,17 @@ -<?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> + <!-- Version Information (only needed if it differs from Global VECTO Version)--> + <MainProductVersion>1.2.9</MainProductVersion> + </PropertyGroup> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>TUGraz.VectoHashing</RootNamespace> <AssemblyName>VectoHashing</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile> - </DocumentationFile> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>bin\Release\VectoHashing.XML</DocumentationFile> + <Product>$(AssemblyName)</Product> + <VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix> </PropertyGroup> + <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -42,43 +22,10 @@ <Reference Include="System.Data" /> <Reference Include="System.Xml" /> </ItemGroup> - <ItemGroup> - <Compile Include="Impl\XmlDsigVectoTransform.cs" /> - <Compile Include="Util\XmlDocumentExtensions.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="VectoHash.cs" /> - <Compile Include="Impl\XmlHashProvider.cs" /> - <Compile Include="Properties\Version.cs"> - <DependentUpon>Version.tt</DependentUpon> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - </Compile> - </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources\XSLT\SortInputData.xslt" /> </ItemGroup> <ItemGroup> - <None Include="Properties\Version.tt"> - <Generator>TextTemplatingFileGenerator</Generator> - <LastGenOutput>Version.cs</LastGenOutput> - </None> - </ItemGroup> - <ItemGroup> - <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\VectoCommon\VectoCommon.csproj"> - <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project> - <Name>VectoCommon</Name> - </ProjectReference> + <ProjectReference Include="..\VectoCommon\VectoCommon.csproj" /> </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" /> -</Project> \ No newline at end of file +</Project>