diff --git a/Directory.Build.props b/Directory.Build.props index caee31747a2730970951544941b240897ddb5725..69b31952b62505d80ad6cf0bac59e2a7cd01b0d7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,7 +12,9 @@ <VersionSuffix>RC</VersionSuffix> <!-- The following settings are used as default values for ALL projects --> - <VersionPrefix>$(MainProductVersion).$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</VersionPrefix> + <Days>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::new(2015,1,1))).Days)</Days> + <VersionPrefix>$(MainProductVersion).$(Days)</VersionPrefix> + <Authors>Graz University of Technology</Authors> <Company>European Union</Company> <Copyright>Copyright © 2012-$([System.DateTime]::UtcNow.Year)</Copyright> diff --git a/Directory.Build.targets b/Directory.Build.targets index 90f6fdba75699cfa2f2ce642ebf01e30809f12f5..1015afb70b1e4c02c35fc516963874f42c5430bd 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -9,7 +9,7 @@ <Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')"> - <Message Text="Packaging in $(Configuration) Configuration" Importance="high" /> + <Message Text="Packaging in $(Configuration) Configuration $(VersionPrefix)" Importance="high" /> <Exec Command="cscript "$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs" "$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx" "$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf""/> <PropertyGroup> <CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate> @@ -176,14 +176,14 @@ <!-- <Copy SourceFiles="$(ParameterDocuStyle)" DestinationFolder="$(DeployPath)User Manual\Parameter Documentation\HTML\css"/> --> <!-- NuGet Files--> <ItemGroup Condition="'$(Configuration)'=='Deploy'"> - <VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\Release\*.nupkg" /> - <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" /> - <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" /> + <VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\Release\*$(Days)*.nupkg" /> + <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*$(Days)*.nupkg" /> + <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*$(Days)*.nupkg" /> </ItemGroup> <ItemGroup Condition="'$(Configuration)'=='MockupDeploy'"> - <VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\MockupRelease\*.nupkg" /> - <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" /> - <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" /> + <VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\MockupRelease\*$(Days)*.nupkg" /> + <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*$(Days)*.nupkg" /> + <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*$(Days)*.nupkg" /> </ItemGroup> <Copy SourceFiles="@(VectoNuget)" DestinationFolder ="$(NuGetPath)"/> diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf index 1de527d4af7a9ccc2c33a03c69af870719ba3164..94cdc98ea1e83dc3041c4a376d76e44ed78aa742 100644 Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ