Merge branch 'develop' into 'tug-dev'

Develop

See merge request vecto/tug-itna/mq_vecto-sim!1

Directory.Build.props

@@ -2,14 +2,14 @@
   <PropertyGroup>
     <DefineConstants />
     <!-- For a Release-Candidate uncomment the following line: -->
-    <!--<DefineConstants>RELEASE_CANDIDATE</DefineConstants>-->
+    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
 
     <!-- For a Release uncomment the following line: -->
     <!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
 
     <!-- Global VECTO Version -->
-    <MainProductVersion>0.7.10</MainProductVersion>
-    <VersionSuffix>DEV</VersionSuffix>
+    <MainProductVersion>4.0.0</MainProductVersion>
+    <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>

Directory.Build.targets

@@ -12,9 +12,14 @@
 	</Target>-->
 	<!-- msbuild VECTO.sln -target:CustomClean -->
 	<!-- BeforeTargets="BeforeBuild" -->
-	<Target Name="CustomClean" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
-		<Message Text="Removing old files" Importance="high" />
-		<RemoveDir Directories="$(SolutionDir)VECTO\bin\"                       Condition="Exists('$(SolutionDir)VECTO\bin\')"                      />                                    
+	
+		<Target Name="CustomClean">
+		 <!-- Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')"> -->
+		<Message Text="Removing old files $(ProjectDir)bin\" Importance="high" />
+		<Message Text="Removing old files $(ProjectDir)obj\" Importance="high" />
+		<RemoveDir Directories="$(ProjectDir)bin\"/>
+		<RemoveDir Directories="$(ProjectDir)obj\"/>
+		<!-- <RemoveDir Directories="$(SolutionDir)VECTO\bin\"                       Condition="Exists('$(SolutionDir)VECTO\bin\')"                      />                                    
 		<RemoveDir Directories="$(SolutionDir)HashingTool\bin\"                 Condition="Exists('$(SolutionDir)HashingTool\bin\')"                />                                 
 		<RemoveDir Directories="$(SolutionDir)HashingCmd\bin\"                  Condition="Exists('$(SolutionDir)HashingCmd\bin\')"                 />                                  
 		<RemoveDir Directories="$(SolutionDir)VectoConsole\bin\"                Condition="Exists('$(SolutionDir)VectoConsole\bin\')"               />                              
@@ -28,7 +33,7 @@
 		<RemoveDir Directories="$(SolutionDir)VectoCore\VectoCore\bin\"         Condition="Exists('$(SolutionDir)VectoCore\VectoCore\bin\')"        />                              
 		<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoCommon\bin\"     Condition="Exists('$(SolutionDir)VectoCommon\VectoCommon\bin\')"    />                                      
 		<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoHashing\bin\"    Condition="Exists('$(SolutionDir)VectoCommon\VectoHashing\bin\')"   />                            
-		<RemoveDir Directories="$(SolutionDir)VectoMockup\VectoMockup\bin\"     Condition="Exists('$(SolutionDir)VectoMockup\VectoMockup\bin\')"    />                                               
+		<RemoveDir Directories="$(SolutionDir)VectoMockup\VectoMockup\bin\"     Condition="Exists('$(SolutionDir)VectoMockup\VectoMockup\bin\')"    />                                                -->
 	</Target>
 
 	<Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">