From c4497760364d6d6d8e39e80309ba17307975c457 Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Sun, 22 May 2022 18:29:13 +0100
Subject: [PATCH] Testing built-in nupkg publishing

---
 docs/artwork/Clowd_200.png                   | Bin 0 -> 5265 bytes
 src/Directory.Build.props                    |  20 ++++++++++++-------
 src/Squirrel.Tool/Squirrel.Tool.csproj       |  10 +++-------
 src/Squirrel/Squirrel.csproj                 |  11 +++++++---
 vendor/{README.md => THIRD_PARTY_NOTICES.md} |   2 +-
 5 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 docs/artwork/Clowd_200.png
 rename vendor/{README.md => THIRD_PARTY_NOTICES.md} (98%)

diff --git a/docs/artwork/Clowd_200.png b/docs/artwork/Clowd_200.png
new file mode 100644
index 0000000000000000000000000000000000000000..77d49459c1fde15403f3c7281306b2e1c5d8a03c
GIT binary patch
literal 5265
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
XUjv~WXaQc?00000NkvXXu0mjfb@z&;

literal 0
HcmV?d00001

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 03a28097..040c0ac3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,19 +6,25 @@
     <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
     <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
-
-    <LangVersion>9</LangVersion>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <Product>Squirrel</Product>
-    <Authors>Caelan Sayler</Authors>
-
+    
+    <LangVersion>9</LangVersion>
+    <SignAssembly>True</SignAssembly>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <AssemblyOriginatorKeyFile>..\..\Squirrel.snk</AssemblyOriginatorKeyFile>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
+    
+    <Product>Squirrel</Product>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Copyright>Copyright © Caelan Sayler 2021</Copyright>
+    <Authors>Caelan Sayler</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/clowd/Clowd.Squirrel</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/clowd/Clowd.Squirrel</RepositoryUrl>
+    <PackageTags>windows;macos;osx;updater;dotnet;installer;desktop;squirrel;autoupdate;automatic-updates</PackageTags>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(MSBuildProjectExtension)'=='.csproj' ">
diff --git a/src/Squirrel.Tool/Squirrel.Tool.csproj b/src/Squirrel.Tool/Squirrel.Tool.csproj
index 202d0507..9681d435 100644
--- a/src/Squirrel.Tool/Squirrel.Tool.csproj
+++ b/src/Squirrel.Tool/Squirrel.Tool.csproj
@@ -6,24 +6,20 @@
     <IsPackable>true</IsPackable>
     <AssemblyName>csq</AssemblyName>
     <PackageId>csq</PackageId>
+    <Title>Squirrel Locator Tool</Title>
     <ToolCommandName>csq</ToolCommandName>
     <DevelopmentDependency>true</DevelopmentDependency>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <DevelopmentDependency>true</DevelopmentDependency>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackAsTool>true</PackAsTool>
-    <PackageProjectUrl>https://github.com/clowd/Clowd.Squirrel</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/clowd/Clowd.Squirrel</RepositoryUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Description>A .NET Core Tool that uses the Squirrel framework to create installers and update packages for dotnet applications.</Description>
+    <Icon>Clowd_200.png</Icon>
   </PropertyGroup>
   
   <ItemGroup>
     <None Include="..\..\vendor\**" Pack="true" PackagePath="tools\net6.0\any\" />
     <None Include="..\..\build\$(Configuration)\Win32\Setup.exe" Pack="true" PackagePath="tools\net6.0\any\" />
     <None Include="..\..\build\$(Configuration)\Win32\StubExecutable.exe" Pack="true" PackagePath="tools\net6.0\any\" />
+    <None Include="..\..\docs\artwork\Clowd_200.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Squirrel/Squirrel.csproj b/src/Squirrel/Squirrel.csproj
index d607dae4..7375ea72 100644
--- a/src/Squirrel/Squirrel.csproj
+++ b/src/Squirrel/Squirrel.csproj
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0;net5.0;net6.0</TargetFrameworks>
-    <Description>Squirrel</Description>
-    <Title>Squirrel</Title>
     <AssemblyName>SquirrelLib</AssemblyName>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageId>sqbuild</PackageId>
+    <PackageId>Clowd.Squirrel</PackageId>
+    <Title>Squirrel Updater</Title>
+    <Description>Quick and easy installer and automatic updates for desktop applications</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Icon>Clowd_200.png</Icon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,5 +26,9 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Net.Http" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="..\..\docs\artwork\Clowd_200.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
 
 </Project>
diff --git a/vendor/README.md b/vendor/THIRD_PARTY_NOTICES.md
similarity index 98%
rename from vendor/README.md
rename to vendor/THIRD_PARTY_NOTICES.md
index 541db1af..99490597 100644
--- a/vendor/README.md
+++ b/vendor/THIRD_PARTY_NOTICES.md
@@ -23,7 +23,7 @@ This folder contains pre-compiled binaries from a variety of sources. These shou
 - Can be found in the Windows SDK at "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe" or similar, depending on the version of the SDK you have installed.
 - License? https://github.com/dotnet/docs/issues/10478
 
-### 7z.exe / 7z.dll
+### 7za.exe / 7zz
 - Incldued because it is much faster at zipping / unzipping than the available managed algorithms.
 - Can be found at https://www.7-zip.org/
 - License is LGPL & BSD 3: https://www.7-zip.org/license.txt