From 4088cee48418ad039cfdaff44e5f2314516a3a1c Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Thu, 14 Mar 2024 16:30:13 +0000
Subject: [PATCH] Move nuget packaging properties to shared targets

---
 Velopack.sln                             |  1 +
 src/Directory.Build.props                | 24 ++++-------
 src/Directory.Build.targets              | 52 ++++++++++++++++++++++++
 src/Velopack.Build/Velopack.Build.csproj | 41 +++----------------
 src/Velopack.Vpk/Velopack.Vpk.csproj     | 36 ++++------------
 src/Velopack/Velopack.csproj             | 17 +-------
 6 files changed, 74 insertions(+), 97 deletions(-)
 create mode 100644 src/Directory.Build.targets

diff --git a/Velopack.sln b/Velopack.sln
index b9b70bc6..f86afbaa 100644
--- a/Velopack.sln
+++ b/Velopack.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLe
 		.gitignore = .gitignore
 		.github\workflows\build.yml = .github\workflows\build.yml
 		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Build.targets = src\Directory.Build.targets
 		nuget.config = nuget.config
 		README.md = README.md
 		Velopack.entitlements = Velopack.entitlements
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 92156a56..7610a81c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+  
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
@@ -8,23 +9,17 @@
     <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    
-    <LangVersion>latest</LangVersion>
-    <SignAssembly>True</SignAssembly>
+
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <AssemblyOriginatorKeyFile>..\..\Velopack.snk</AssemblyOriginatorKeyFile>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
-    
+
     <Product>Velopack</Product>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright © Caelan Sayler 2021</Copyright>
-    <Authors>Caelan Sayler;Kevin Bost</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/velopack/velopack</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/velopack/velopack</RepositoryUrl>
-    <PackageTags>windows;macos;osx;updater;dotnet;installer;desktop;squirrel;velopack;autoupdate;automatic-updates</PackageTags>
+    <Description>Installer and automatic update framework for cross-platform desktop applications</Description>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\Velopack.snk</AssemblyOriginatorKeyFile>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(MSBuildProjectExtension)'=='.csproj' ">
@@ -32,9 +27,4 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' ">
-    <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
-    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
-    <OutDir>$(OutputPath)$(Platform)\</OutDir>
-  </PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
new file mode 100644
index 00000000..b3006e9f
--- /dev/null
+++ b/src/Directory.Build.targets
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  
+  <!-- Automatically add all NuGet related properties if VelopackPackageId is set -->
+  <PropertyGroup Condition=" '$(VelopackPackageId)' != '' ">
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Copyright>Copyright © Velopack Ltd. All rights reserved.</Copyright>
+    <Authors>Velopack Ltd;Caelan Sayler;Kevin Bost</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/velopack/velopack</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/velopack/velopack</RepositoryUrl>
+    <PackageTags>windows;macos;osx;updater;dotnet;installer;desktop;squirrel;velopack;autoupdate;automatic-updates</PackageTags>
+    <PackageIcon>Velopack_200.png</PackageIcon>
+    <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Title>$(VelopackPackageId)</Title>
+    <Product>$(VelopackPackageId)</Product>
+    <PackageId>$(VelopackPackageId)</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
+  <Target Name="AddNugetStaticFiles" BeforeTargets="Build">
+    <ItemGroup Condition=" '$(VelopackPackageId)' != '' ">
+      <None Include="..\..\artwork\Velopack_200.png" Pack="true" PackagePath="\" />
+      <None Include="..\..\README_NUGET.md" Pack="true" PackagePath="\" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AddNugetVendorLibs" BeforeTargets="Build" Condition=" '$(VelopackPackageVendorLibs)' == 'true' ">
+    <ItemGroup Condition=" $([System.OperatingSystem]::IsWindows()) or '$(PackRustAssets)' == 'true' ">
+      <None Include="..\Rust\target\release\update.exe" Pack="true" PackagePath="vendor" />
+      <None Include="..\Rust\target\release\setup.exe" Pack="true" PackagePath="vendor" />
+      <None Include="..\Rust\target\release\stub.exe" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\vendor\rcedit.exe" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\vendor\zstd.exe" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\vendor\signtool.exe" Pack="true" PackagePath="vendor" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" $([System.OperatingSystem]::IsMacOS()) or '$(PackRustAssets)' == 'true' ">
+      <None Include="..\Rust\target\release\UpdateMac" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\Velopack.entitlements" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\artwork\DefaultApp.icns" Pack="true" PackagePath="vendor" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" $([System.OperatingSystem]::IsLinux()) or '$(PackRustAssets)' == 'true' ">
+      <None Include="..\Rust\target\release\UpdateNix" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\vendor\appimagetool-x86_64.AppImage" Pack="true" PackagePath="vendor" />
+      <None Include="..\..\artwork\DefaultApp_64.png" Pack="true" PackagePath="vendor" />
+    </ItemGroup>
+  </Target>
+  
+</Project>
\ No newline at end of file
diff --git a/src/Velopack.Build/Velopack.Build.csproj b/src/Velopack.Build/Velopack.Build.csproj
index 2e63d0e3..e9b6d087 100644
--- a/src/Velopack.Build/Velopack.Build.csproj
+++ b/src/Velopack.Build/Velopack.Build.csproj
@@ -10,6 +10,12 @@
     <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <VelopackPackageId>Velopack.Build</VelopackPackageId>
+    <VelopackPackageVendorLibs>true</VelopackPackageVendorLibs>
+    <DevelopmentDependency>true</DevelopmentDependency>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Improve devloop by clearing this package from NuGet cache before building -->
     <HttpNuGetCache>$(LocalAppData)\NuGet\v3-cache</HttpNuGetCache>
@@ -23,18 +29,6 @@
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeTfmDependenciesInPackage</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Title>Velopack.Build</Title>
-    <Description>Velopack.Build</Description>
-    <PackageId>Velopack.Build</PackageId>
-    <PackageIcon>Velopack_200.png</PackageIcon>
-    <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
-    <Description>Quick and easy installer and automatic updates for cross-platform desktop applications</Description>
-    <DevelopmentDependency>true</DevelopmentDependency>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RepositoryUrl>https://github.com/velopack/velopack</RepositoryUrl>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Velopack.Packaging.Unix\Velopack.Packaging.Unix.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Velopack.Packaging.Windows\Velopack.Packaging.Windows.csproj" PrivateAssets="all" />
@@ -46,32 +40,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\artwork\Velopack_200.png" Pack="true" PackagePath="/" />
-    <None Include="..\..\README_NUGET.md" Pack="true" PackagePath="/" />
     <None Include="Velopack.Build.targets" Pack="true" PackagePath="build/Velopack.Build.targets" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $([System.OperatingSystem]::IsWindows()) or '$(PackRustAssets)' == 'true' ">
-    <None Include="..\Rust\target\release\update.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\Rust\target\release\setup.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\Rust\target\release\stub.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\rcedit.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\zstd.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\signtool.exe" Pack="true" PackagePath="vendor" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $([System.OperatingSystem]::IsMacOS()) or '$(PackRustAssets)' == 'true' ">
-    <None Include="..\Rust\target\release\UpdateMac" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\Velopack.entitlements" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\artwork\DefaultApp.icns" Pack="true" PackagePath="vendor" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $([System.OperatingSystem]::IsLinux()) or '$(PackRustAssets)' == 'true' ">
-    <None Include="..\Rust\target\release\UpdateNix" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\appimagetool-x86_64.AppImage" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\artwork\DefaultApp_64.png" Pack="true" PackagePath="vendor" />
-  </ItemGroup>
-
   <Target Name="IncludeTfmDependenciesInPackage">
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(TargetDir)*.*">
diff --git a/src/Velopack.Vpk/Velopack.Vpk.csproj b/src/Velopack.Vpk/Velopack.Vpk.csproj
index 16fe411c..6f5f1278 100644
--- a/src/Velopack.Vpk/Velopack.Vpk.csproj
+++ b/src/Velopack.Vpk/Velopack.Vpk.csproj
@@ -3,40 +3,18 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <IsPackable>true</IsPackable>
     <AssemblyName>vpk</AssemblyName>
-    <PackageId>vpk</PackageId>
-    <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
-    <Title>Velopack CLI</Title>
-    <ToolCommandName>vpk</ToolCommandName>
-    <DevelopmentDependency>true</DevelopmentDependency>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackAsTool>true</PackAsTool>
-    <Description>A .NET Core Tool to build Velopack releases.</Description>
-    <PackageIcon>Velopack_200.png</PackageIcon>
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);CA2007;CS8002</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="..\..\artwork\Velopack_200.png" Pack="true" PackagePath="\" />
-    <None Include="..\..\README_NUGET.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(PackRustAssets)' == 'true'">
-    <None Include="..\Rust\target\release\UpdateMac" Pack="true" PackagePath="vendor" />
-    <None Include="..\Rust\target\release\UpdateNix" Pack="true" PackagePath="vendor" />
-    <None Include="..\Rust\target\release\update.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\Rust\target\release\setup.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\Rust\target\release\stub.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\appimagetool-x86_64.AppImage" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\rcedit.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\zstd.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\vendor\signtool.exe" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\Velopack.entitlements" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\artwork\DefaultApp.icns" Pack="true" PackagePath="vendor" />
-    <None Include="..\..\artwork\DefaultApp_64.png" Pack="true" PackagePath="vendor" />
-  </ItemGroup>
+  <PropertyGroup>
+    <VelopackPackageId>vpk</VelopackPackageId>
+    <VelopackPackageVendorLibs>true</VelopackPackageVendorLibs>
+    <ToolCommandName>vpk</ToolCommandName>
+    <PackAsTool>true</PackAsTool>
+    <DevelopmentDependency>true</DevelopmentDependency>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
diff --git a/src/Velopack/Velopack.csproj b/src/Velopack/Velopack.csproj
index 5a4cec61..80019b1e 100644
--- a/src/Velopack/Velopack.csproj
+++ b/src/Velopack/Velopack.csproj
@@ -8,24 +8,9 @@
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>9</LangVersion>
+    <VelopackPackageId>Velopack</VelopackPackageId>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Title>Velopack</Title>
-    <Description>Velopack</Description>
-    <PackageId>Velopack</PackageId>
-    <PackageIcon>Velopack_200.png</PackageIcon>
-    <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
-    <Description>Quick and easy installer and automatic updates for cross-platform desktop applications</Description>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RepositoryUrl>https://github.com/velopack/velopack</RepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\artwork\Velopack_200.png" Pack="true" PackagePath="\" />
-    <None Include="..\..\README_NUGET.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NuGet.Versioning" Version="6.9.1" />
   </ItemGroup>