diff --git a/.gitignore b/.gitignore index 7378a4cb5a0f731ae745b9e0969b067315929d5a..2dcf8b49fb093c6d5e8efca059017f8a53dafa2e 100644 --- a/.gitignore +++ b/.gitignore @@ -226,3 +226,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum /Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/EM_Maps.xlsx /Nuget +/.idea/.idea.hm_vecto-dev.dir/.idea diff --git a/Directory.Build.props b/Directory.Build.props index bb05d17be7960378096200b72daa485d0718a994..7e25fd45d0017976665a9b0d52281a8d3a58a21d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -51,4 +51,8 @@ <DebugSymbols>false</DebugSymbols> <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)'=='MockupDeploy'"> + <VersionSuffix>Mockup</VersionSuffix> + </PropertyGroup> </Project> \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index ce75c1a89bd2b8c2a6b06e5990da1624fa892138..31653193d10f1b21d9de2bc284847bebbd8c8207 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -11,23 +11,24 @@ <Message Text="Compiling the program in $(Configuration) Configuration" Importance="high" /> </Target>--> <!-- msbuild VECTO.sln -target:CustomClean --> - <Target Name="CustomClean" > + <!-- BeforeTargets="BeforeBuild" --> + <Target Name="CustomClean" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')"> <Message Text="Removing old files" Importance="high" /> - <RemoveDir Directories="$(SolutionDir)VECTO\bin\" /> - <RemoveDir Directories="$(SolutionDir)HashingTool\bin\" /> - <RemoveDir Directories="$(SolutionDir)HashingCmd\bin\" /> - <RemoveDir Directories="$(SolutionDir)VectoConsole\bin\" /> - <RemoveDir Directories="$(SolutionDir)VECTO\bin\" /> - <RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" /> - <RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" /> - - <RemoveDir Directories="$(SolutionDir)Tools\VECTOConsoleStart\bin\" /> - <RemoveDir Directories="$(SolutionDir)Tools\VECTOMultistageStart\bin\" /> - <RemoveDir Directories="$(SolutionDir)Tools\VECTOStart\bin\" /> - <RemoveDir Directories="$(SolutionDir)VectoCore\VectoCore\bin\" /> - <RemoveDir Directories="$(SolutionDir)VectoCommon\VectoCommon\bin\"/> - <RemoveDir Directories="$(SolutionDir)VectoCommon\VectoHashing\bin\"/> - <RemoveDir Directories="$(SolutionDir)VectoMockup\VectoMockup\bin\"/> + <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\')" /> + <RemoveDir Directories="$(SolutionDir)VECTO\bin\" Condition="Exists('$(SolutionDir)VECTO\bin\')" /> + <RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" Condition="Exists('$(SolutionDir)VECTO3GUI2020\bin\')" /> + <RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" Condition="Exists('$(SolutionDir)VECTO3GUI2020\bin\')" /> + + <RemoveDir Directories="$(SolutionDir)Tools\VECTOConsoleStart\bin\" Condition="Exists('$(SolutionDir)Tools\VECTOConsoleStart\bin\')" /> + <RemoveDir Directories="$(SolutionDir)Tools\VECTOMultistageStart\bin\" Condition="Exists('$(SolutionDir)Tools\VECTOMultistageStart\bin\')" /> + <RemoveDir Directories="$(SolutionDir)Tools\VECTOStart\bin\" Condition="Exists('$(SolutionDir)Tools\VECTOStart\bin\')" /> + <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\')" /> </Target> <Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')"> @@ -39,10 +40,11 @@ <CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate> <DeployPath>$(SolutionDir)Deploy\$(CurrentDate)-VECTO-$(Version)\</DeployPath> <NuGetPath>$(SolutionDir)Nuget\$(CurrentDate)-VECTO-NuGet-$(Version)\</NuGetPath> - <DeployPath Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)Deploy\$(CurrentDate)-VECTO_MOCKUP-$(Version)\</DeployPath> - <NuGetPath Condition="'$(Configuration)'=='MockupDeploy'"> $(SolutionDir)Nuget\$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version)\</NuGetPath> + <!-- <DeployPath Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)Deploy\$(CurrentDate)-VECTO_MOCKUP-$(Version)\</DeployPath> + <NuGetPath Condition="'$(Configuration)'=='MockupDeploy'"> $(SolutionDir)Nuget\$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version)\</NuGetPath> --> </PropertyGroup> <RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/> + <RemoveDir Directories="$(SolutionDir)Nuget" Condition="Exists('$(SolutionDir)Nuget')"/> <RemoveDir Directories="$(NuGetPath)" Condition="Exists('$(NuGetPath)')"/> <MakeDir Directories="$(DeployPath)"/> <MakeDir Directories="$(NuGetPath)"/> @@ -226,18 +228,24 @@ <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" /> <VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.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" /> + </ItemGroup> + <Copy SourceFiles="@(VectoNuget)" DestinationFolder ="$(NuGetPath)"/> <PropertyGroup> <NugetDestinationZip>$(SolutionDir)$(CurrentDate)-VECTO-NuGet-$(Version).zip</NugetDestinationZip> - <NugetDestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version).zip</NugetDestinationZip> + <NugetDestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO-NuGet-$(Version).zip</NugetDestinationZip> </PropertyGroup> <ZipDirectory SourceDirectory="$(NuGetPath)" DestinationFile="$(NugetDestinationZip)" Overwrite="true"/> <PropertyGroup> <DestinationZip>$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip</DestinationZip> - <DestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO_MOCKUP-$(Version).zip</DestinationZip> + <DestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip</DestinationZip> </PropertyGroup> <ZipDirectory SourceDirectory="$(SolutionDir)Deploy\" DestinationFile="$(DestinationZip)" Overwrite="true"/> </Target> diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj index 671fd1016966f3e8a83a196bed06436cffb6e062..29f23240637855ac08608357f0a524aa0b2b04f3 100644 --- a/VectoCore/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore/VectoCore.csproj @@ -7,6 +7,7 @@ <Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <GeneratePackageOnBuild>True</GeneratePackageOnBuild> + <VersionSuffix Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">Mockup</VersionSuffix> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'"> <DebugType>full</DebugType>