From 78af495c3bb7262035c47b4ac43e7389c0eefca8 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Wed, 15 Mar 2023 12:20:32 +0100
Subject: [PATCH] update creation of nuget packages
---
.gitignore | 1 +
Directory.Build.targets | 13 +++++++++++--
VectoCore/VectoCore/VectoCore.csproj | 6 ++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1e56170040..7378a4cb5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -225,3 +225,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
/.idea/.idea.VECTO/.idea
/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/EM_Maps.xlsx
+/Nuget
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c9d5c624c5..7ed146ecd5 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -31,13 +31,16 @@
</Target>
<Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
+
+
<Message Text="Packaging in $(Configuration) Configuration" 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>
<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> $(SolutionDir)Nuget\</NuGetPath>
+ <NuGetPath Condition="'$(Configuration)'=='MockupDeploy'"> $(SolutionDir)Nuget\$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version)\</NuGetPath>
</PropertyGroup>
<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
<RemoveDir Directories="$(NuGetPath)" Condition="Exists('$(NuGetPath)')"/>
@@ -223,9 +226,15 @@
<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>
+ </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>
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 5a03301443..671fd10169 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -134,11 +134,9 @@
<ItemGroup>
<ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
- <PrivateAssets>all</PrivateAssets>
- </ProjectReference>
+ </ProjectReference>
<ProjectReference Include="..\..\VectoCommon\VectoHashing\VectoHashing.csproj">
- <PrivateAssets>all</PrivateAssets>
- </ProjectReference>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
--
GitLab