From 5bd56bff59996cdd5bbd615f0f55d3da674770f7 Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Sun, 29 Aug 2021 13:03:01 +0100
Subject: [PATCH] Update nuspec & add pack script

---
 Squirrel.sln                                  |  2 +-
 pack.cmd                                      |  1 +
 pack.ps1                                      | 11 +++++
 src/Clowd.Squirrel.nuspec                     | 33 +++++++++++++++
 ...rel.windows.props => Clowd.Squirrel.props} |  5 +++
 src/Squirrel.nuspec                           | 40 -------------------
 6 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 pack.cmd
 create mode 100644 pack.ps1
 create mode 100644 src/Clowd.Squirrel.nuspec
 rename src/{squirrel.windows.props => Clowd.Squirrel.props} (58%)
 delete mode 100644 src/Squirrel.nuspec

diff --git a/Squirrel.sln b/Squirrel.sln
index 7361cfbf..f184783b 100644
--- a/Squirrel.sln
+++ b/Squirrel.sln
@@ -16,8 +16,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLevel", "{ED657D2C-F8A0-4012-A64F-7367D41BE4D2}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		src\Clowd.Squirrel.nuspec = src\Clowd.Squirrel.nuspec
 		src\Directory.Build.props = src\Directory.Build.props
-		src\Squirrel.nuspec = src\Squirrel.nuspec
 		vendor\wix\template.wxs = vendor\wix\template.wxs
 	EndProjectSection
 EndProject
diff --git a/pack.cmd b/pack.cmd
new file mode 100644
index 00000000..b746ae55
--- /dev/null
+++ b/pack.cmd
@@ -0,0 +1 @@
+powershell -ExecutionPolicy Bypass -File ./pack.ps1
\ No newline at end of file
diff --git a/pack.ps1 b/pack.ps1
new file mode 100644
index 00000000..eb4d657c
--- /dev/null
+++ b/pack.ps1
@@ -0,0 +1,11 @@
+Set-Location "$PSScriptRoot"
+$ErrorActionPreference = "Stop"
+
+# get current git version
+$gitVerJson = (&nbgv get-version -f json) | ConvertFrom-Json
+$version = $gitVerJson.SimpleVersion + $gitVerJson.PrereleaseVersion
+
+& "$PSScriptRoot\.nuget\NuGet.exe" pack "$PSScriptRoot\src\Clowd.Squirrel.nuspec" `
+-BasePath "$PSScriptRoot\src" `
+-OutputDirectory "$PSScriptRoot\build" `
+-Version $version
\ No newline at end of file
diff --git a/src/Clowd.Squirrel.nuspec b/src/Clowd.Squirrel.nuspec
new file mode 100644
index 00000000..39ee47b6
--- /dev/null
+++ b/src/Clowd.Squirrel.nuspec
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <version>0.0.0</version> <!-- should be set on the command line -->
+    <authors>GitHub, Anaïs Betts, Caelan Sayler, others</authors>
+    <owners>Caelan Sayler</owners>
+    <licenseUrl>https://github.com/clowd/Clowd.Squirrel/blob/master/COPYING</licenseUrl>
+    <projectUrl>https://github.com/clowd/Clowd.Squirrel</projectUrl>
+    <iconUrl>https://user-images.githubusercontent.com/1287295/131249078-9e131e51-0b66-4dc7-8c0a-99cbea6bcf80.png</iconUrl>
+
+    <dependencies>
+      <dependency id="Microsoft.CSharp" version="4.7.0" />
+      <dependency id="Microsoft.Web.Xdt" version="3.1.0" />
+      <dependency id="System.ComponentModel.Annotations" version="5.0.0" />
+      <dependency id="System.IO.Packaging" version="5.0.0" />
+      <dependency id="Microsoft.Win32.Registry" version="5.0.0" />
+      <dependency id="Mono.Cecil" version="0.11.4" />
+      <dependency id="SharpCompress" version="0.28.3" />
+      <dependency id="System.Drawing.Common" version="5.0.2" />
+    </dependencies>
+
+    <id>Clowd.Squirrel</id>
+    <title>Squirrel for Windows</title>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>An installation and update framework for Windows applications</description>
+    <copyright>Copyright © GitHub 2017, Caelan Sayler 2021</copyright>
+  </metadata>
+  <files>
+    <file src="..\build\Release\netstandard2.0\*" target="lib\netstandard2.0" />
+    <file src="..\build\publish\*" target="tools" />
+    <file src="Clowd.Squirrel.props" target="build" />
+  </files>
+</package>
diff --git a/src/squirrel.windows.props b/src/Clowd.Squirrel.props
similarity index 58%
rename from src/squirrel.windows.props
rename to src/Clowd.Squirrel.props
index 0b45b327..9df58873 100644
--- a/src/squirrel.windows.props
+++ b/src/Clowd.Squirrel.props
@@ -2,4 +2,9 @@
   <PropertyGroup>
     <SquirrelToolsPath>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)..\tools'))</SquirrelToolsPath>
   </PropertyGroup>
+
+  <Target Name="PrintSquirrelPath" AfterTargets="Publish,Build">
+    <Message Importance="high" Text="SquirrelToolsPath: '$(SquirrelToolsPath)'" />
+  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/src/Squirrel.nuspec b/src/Squirrel.nuspec
deleted file mode 100644
index 028c0068..00000000
--- a/src/Squirrel.nuspec
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <version>2.0.1</version>
-    <authors>GitHub</authors>
-    <owners>Anaïs Betts</owners>
-    <licenseUrl>https://github.com/squirrel/Squirrel.Windows/blob/master/COPYING</licenseUrl>
-    <projectUrl>https://github.com/squirrel/Squirrel.Windows</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/Squirrel/Squirrel.Windows/master/docs/artwork/Squirrel-Logo-Square.png</iconUrl>
-
-    <dependencies>
-      <dependency id="DeltaCompressionDotNet" version="[1.1,2.0)" />
-      <dependency id="Mono.Cecil" version="0.11.2" />
-      <dependency id="SharpCompress" version="[0.17.1]" />
-    </dependencies>
-
-    <id>squirrel.windows</id>
-    <title>Squirrel for Windows</title>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>An installation and update framework for Windows applications</description>
-    <copyright>Copyright GitHub© 2017</copyright>
-  </metadata>
-  <files>
-    <file src="..\Build\Release\Net45\Squirrel.*" target="lib\Net45" />
-    <file src="..\Build\Release\Net45\NuGet.Squirrel.*" target="lib\Net45" />
-    <file src="..\Build\Release\Net45\ICSharpCode.*" target="lib\Net45" />
-    <file src="squirrel.windows.props" target="build" />
-    <file src="..\Build\Release\Win32\Setup.exe" target="tools" />
-    <file src="..\Build\Release\Win32\WriteZipToSetup.exe" target="tools" />
-    <file src="..\Build\Release\Win32\StubExecutable.exe" target="tools" />
-    <file src="..\Build\Release\Net45\Update.exe" target="tools\Squirrel.exe" />
-    <file src="..\Build\Release\Net45\Update-Mono.exe" target="tools\Squirrel-Mono.exe" />
-    <file src="..\Build\Release\Net45\Update.com" target="tools\Squirrel.com" />
-    <file src="..\Build\Release\Net45\SyncReleases.exe" target="tools" />
-    <file src="Update\signtool.exe" target="tools\signtool.exe" />
-    <file src="Update\rcedit.exe" target="tools\rcedit.exe" />
-    <file src="..\vendor\wix\*" target="tools" />
-    <file src="..\vendor\7zip\*" target="tools" />
-  </files>
-</package>