updating packaging configuration to include vecto3 gui exe and dlls,...

updating packaging configuration to include vecto3 gui exe and dlls, downgrading json.net library to version 8, updating build config for deployment target

Build/Packaging.targets

@@ -82,10 +82,20 @@
 		<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\hashingcmd.exe"/>
 		
 		<VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/>
+		
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\VECTO3.exe*"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\System.Windows.Interactivity.dll"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.WindowsAPICodePack*.dll"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.WindowsAPICodePack*.dll"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.Expression.Interactions.dll"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\MahApps.*.dll"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ICSharpCode.AvalonEdit.dll"/>
+		<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ControlzEx.dll"/>
 	</ItemGroup>
 	
 	<Message Text="@(VectoCommandLine)"/>
 	<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(OutputPath)"/>
+	<Copy SourceFiles="@(Vecto3GUI)" DestinationFolder="$(OutputPath)"/>
 	<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(OutputPath)"/>
 	<Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(OutputPath)\Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" />
 	<Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(OutputPath)\Declaration" />
@@ -113,6 +123,7 @@
 		<ZipFiles Include="$(OutputPath)*.ini" />
 		<ZipFiles Include="$(OutputPath)VECTO.exe*" />
 		<ZipFiles Include="$(OutputPath)vectocmd.exe*"/>
+		<ZipFiles Include="$(OutputPath)VECTO3.exe*" />
 		<ZipFiles Include="$(OutputPath)HashingTool.exe*"/>
 		<ZipFiles Include="$(OutputPath)hashingcmd.exe*"/>
 	</ItemGroup>

VECTO.sln

@@ -800,8 +800,8 @@ Global
 		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.DebugTUG|x64.Build.0 = Debug|Any CPU
 		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
 		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.DebugTUG|x86.Build.0 = Debug|Any CPU
-		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
-		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|Any CPU.Build.0 = Debug|Any CPU
+		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
+		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|Any CPU.Build.0 = Release|Any CPU
 		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|x64.ActiveCfg = Debug|Any CPU
 		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|x64.Build.0 = Debug|Any CPU
 		{A17C6067-4DD9-41FC-B335-39F3DE1DE6B3}.Deploy|x86.ActiveCfg = Debug|Any CPU

VECTO3GUI/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // 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.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+//[assembly: AssemblyVersion("1.0.0.0")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]

VECTO3GUI/Properties/Version.cs

+/*
+* 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.1.0.1954")]
+[assembly: AssemblyFileVersion("0.1.0.1954")]

VECTO3GUI/Properties/Version.tt

+/*
+* 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
+*/
+
+<#@ template language="C#" #>
+<#@ output extension=".cs"#>
+<#@ include file="../../VectoCore/VectoCore/VersionNumber.t4" once="true" #>
+using System.Reflection;
+[assembly: AssemblyVersion("0.1.0.<#= GetBuildNumber() #>")]
+[assembly: AssemblyFileVersion("0.1.0.<#=  GetBuildNumber() #>")]
+<#+ 
+	int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2017, 1, 1)).TotalDays; 
+#>
\ No newline at end of file

VECTO3GUI/VECTO3GUI.csproj

@@ -127,8 +127,9 @@
     <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <HintPath>..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
@@ -197,6 +198,11 @@
     <Compile Include="Model\TempDataObject\AuxiliariesBusComponentData.cs" />
     <Compile Include="Model\TempDataObject\ITempDataObject.cs" />
     <Compile Include="Model\TempDataObject\VehicleBusComponentData.cs" />
+    <Compile Include="Properties\Version.cs">
+      <DependentUpon>Version.tt</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Util\AllowedEntry.cs" />
     <Compile Include="Util\Component.cs" />
     <Compile Include="Util\RelayCommand.cs" />
@@ -657,7 +663,15 @@
   <ItemGroup>
     <Resource Include="Resources\Icon2.ico" />
   </ItemGroup>
-  <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>
   <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.

VECTO3GUI/ViewModel/Impl/JobEntry.cs

@@ -161,7 +161,7 @@ namespace VECTO3GUI.ViewModel.Impl
 	}
 	
 
-	[JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
+	//[JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
 	public class JobBody : ObservableObject
 	{
 		private string _completedVehicle;

VECTO3GUI/packages.config

@@ -5,7 +5,7 @@
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net452" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net452" />
   <package id="MahApps.Metro.IconPacks" version="3.7.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
   <package id="Ninject" version="3.3.4" targetFramework="net452" />
   <package id="Ninject.Extensions.Factory" version="3.3.2" targetFramework="net452" />
   <package id="NLog" version="4.5.11" targetFramework="net452" />