Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move nuget packaging properties to shared targets

Browse Source
This commit is contained in:
Caelan Sayler
2024-03-14 16:30:13 +00:00
parent 4834a5182f
commit 4088cee484
6 changed files with 74 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Velopack.sln
View File

@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLe
.gitignore = .gitignore .gitignore = .gitignore
.github\workflows\build.yml = .github\workflows\build.yml .github\workflows\build.yml = .github\workflows\build.yml
src\Directory.Build.props = src\Directory.Build.props src\Directory.Build.props = src\Directory.Build.props
src\Directory.Build.targets = src\Directory.Build.targets
nuget.config = nuget.config nuget.config = nuget.config
README.md = README.md README.md = README.md
Velopack.entitlements = Velopack.entitlements Velopack.entitlements = Velopack.entitlements

24
src/Directory.Build.props
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
@@ -8,23 +9,17 @@
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<LangVersion>latest</LangVersion>
<SignAssembly>True</SignAssembly>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages> <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<AssemblyOriginatorKeyFile>..\..\Velopack.snk</AssemblyOriginatorKeyFile>
<DebugType>embedded</DebugType> <DebugType>embedded</DebugType>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap> <PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
<Product>Velopack</Product> <Product>Velopack</Product>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> <Description>Installer and automatic update framework for cross-platform desktop applications</Description>
<Copyright>Copyright © Caelan Sayler 2021</Copyright> <SignAssembly>true</SignAssembly>
<Authors>Caelan Sayler;Kevin Bost</Authors> <AssemblyOriginatorKeyFile>..\..\Velopack.snk</AssemblyOriginatorKeyFile>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <LangVersion>latest</LangVersion>
<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>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(MSBuildProjectExtension)'=='.csproj' "> <ItemGroup Condition=" '$(MSBuildProjectExtension)'=='.csproj' ">
@@ -32,9 +27,4 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' ">
<Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
<IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
<OutDir>$(OutputPath)$(Platform)\</OutDir>
</PropertyGroup>
</Project> </Project>

52
src/Directory.Build.targets Normal file
View File

@@ -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>

41
src/Velopack.Build/Velopack.Build.csproj
View File

@@ -10,6 +10,12 @@
<NoWarn>$(NoWarn);NU5128</NoWarn> <NoWarn>$(NoWarn);NU5128</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<VelopackPackageId>Velopack.Build</VelopackPackageId>
<VelopackPackageVendorLibs>true</VelopackPackageVendorLibs>
<DevelopmentDependency>true</DevelopmentDependency>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Improve devloop by clearing this package from NuGet cache before building --> <!-- Improve devloop by clearing this package from NuGet cache before building -->
<HttpNuGetCache>$(LocalAppData)\NuGet\v3-cache</HttpNuGetCache> <HttpNuGetCache>$(LocalAppData)\NuGet\v3-cache</HttpNuGetCache>
@@ -23,18 +29,6 @@
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeTfmDependenciesInPackage</TargetsForTfmSpecificContentInPackage> <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeTfmDependenciesInPackage</TargetsForTfmSpecificContentInPackage>
</PropertyGroup> </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> <ItemGroup>
<ProjectReference Include="..\Velopack.Packaging.Unix\Velopack.Packaging.Unix.csproj" PrivateAssets="all" /> <ProjectReference Include="..\Velopack.Packaging.Unix\Velopack.Packaging.Unix.csproj" PrivateAssets="all" />
<ProjectReference Include="..\Velopack.Packaging.Windows\Velopack.Packaging.Windows.csproj" PrivateAssets="all" /> <ProjectReference Include="..\Velopack.Packaging.Windows\Velopack.Packaging.Windows.csproj" PrivateAssets="all" />
@@ -46,32 +40,9 @@
</ItemGroup> </ItemGroup>
<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" /> <None Include="Velopack.Build.targets" Pack="true" PackagePath="build/Velopack.Build.targets" />
</ItemGroup> </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"> <Target Name="IncludeTfmDependenciesInPackage">
<ItemGroup> <ItemGroup>
<TfmSpecificPackageFile Include="$(TargetDir)*.*"> <TfmSpecificPackageFile Include="$(TargetDir)*.*">

36
src/Velopack.Vpk/Velopack.Vpk.csproj
View File

@@ -3,40 +3,18 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks> <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<AssemblyName>vpk</AssemblyName> <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> <LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);CA2007;CS8002</NoWarn> <NoWarn>$(NoWarn);CA2007;CS8002</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <PropertyGroup>
<None Include="..\..\artwork\Velopack_200.png" Pack="true" PackagePath="\" /> <VelopackPackageId>vpk</VelopackPackageId>
<None Include="..\..\README_NUGET.md" Pack="true" PackagePath="\" /> <VelopackPackageVendorLibs>true</VelopackPackageVendorLibs>
</ItemGroup> <ToolCommandName>vpk</ToolCommandName>
<PackAsTool>true</PackAsTool>
<ItemGroup Condition="'$(PackRustAssets)' == 'true'"> <DevelopmentDependency>true</DevelopmentDependency>
<None Include="..\Rust\target\release\UpdateMac" Pack="true" PackagePath="vendor" /> </PropertyGroup>
<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>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />

17
src/Velopack/Velopack.csproj
View File

@@ -8,24 +8,9 @@
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings> <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<CheckEolTargetFramework>false</CheckEolTargetFramework> <CheckEolTargetFramework>false</CheckEolTargetFramework>
<LangVersion>9</LangVersion> <LangVersion>9</LangVersion>
<VelopackPackageId>Velopack</VelopackPackageId>
</PropertyGroup> </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> <ItemGroup>
<PackageReference Include="NuGet.Versioning" Version="6.9.1" /> <PackageReference Include="NuGet.Versioning" Version="6.9.1" />
</ItemGroup> </ItemGroup>