From 32873501f5da6cca21b7e5f46e0cb00dc542b3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6llner?= <christian.koellner.80@gmail.com>
Date: Sun, 14 Jul 2019 19:41:13 +0200
Subject: [PATCH] Choco deployment fixed

---
 chocolatey/VERIFICATION                                |  6 ++++++
 .../capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec |  8 ++++++++
 chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1 |  1 -
 chocolatey/capnpc-csharp/capnpc-csharp.nuspec          | 10 +++++++++-
 scripts/capnpc-csharp-pack.ps1                         |  4 ++--
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 chocolatey/VERIFICATION

diff --git a/chocolatey/VERIFICATION b/chocolatey/VERIFICATION
new file mode 100644
index 0000000..999a956
--- /dev/null
+++ b/chocolatey/VERIFICATION
@@ -0,0 +1,6 @@
+VERIFICATION
+Verification is intended to assist the Chocolatey moderators and community
+in verifying that this package's contents are trustworthy.
+ 
+This package is published by the capnproto-dotnetcore project itself. Any binaries will be 
+identical to other package types published by the project.
\ No newline at end of file
diff --git a/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec b/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec
index 7ccff88..cda2546 100644
--- a/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec
+++ b/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec
@@ -3,20 +3,28 @@
   <metadata>
     <id>capnpc-csharp-win-x86</id>
     <version>1.0.0</version>
+    <packageSourceUrl>https://chocolatey.org/packages/capnpc-csharp-win-x86/1.0.0</packageSourceUrl>
     <authors>Christian Köllner and contributors</authors>
     <owners>Christian Köllner and contributors</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <!--<license type="expression">MIT</license>-->
     <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
     <projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl>
+    <title>capnpc-csharp (Install)</title>
     <description>Cap'n Proto C# code generator backend, self-contained Windows x86</description>
     <copyright>Christian Köllner and contributors</copyright>
     <tags>capnp capnpc RPC serialization cerealization</tags>
+    <summary>Cap'n Proto C# code generator backend, self-contained Windows x86</summary>
     <!--<repository type="Git" />-->
+    <dependencies>
+        <dependency id="capnproto" version="0.7.0" />
+    </dependencies>
   </metadata>
 <files>
     <file src="chocolateyinstall.ps1" target="tools" />
     <file src="chocolateyuninstall.ps1" target="tools" />
+    <file src="..\..\LICENSE" target="tools\LICENSE" />
+    <file src="..\VERIFICATION" target="tools\VERIFICATION" />
     <file src=".\bin\**" target="tools" />
   </files>
 </package>
\ No newline at end of file
diff --git a/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1 b/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1
index e54c74c..025b147 100644
--- a/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1
+++ b/chocolatey/capnpc-csharp-win-x86/chocolateyinstall.ps1
@@ -2,5 +2,4 @@ $ErrorActionPreference = 'Stop'
 
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 
-choco install capnproto
 Install-Binfile -Name capnpc-csharp -Path "$toolsDir\capnpc-csharp.exe"
diff --git a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec
index 268a3dd..89d81e4 100644
--- a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec
+++ b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
-    <id>capnpc-csharp-win-x86</id>
+    <id>capnpc-csharp</id>
     <version>1.0.0</version>
+    <packageSourceUrl>https://chocolatey.org/packages/capnpc-csharp/1.0.0</packageSourceUrl>
     <authors>Christian Köllner and contributors</authors>
     <owners>Christian Köllner and contributors</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <!--<license type="expression">MIT</license>-->
     <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
     <projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl>
+    <title>capnpc-csharp (Install)</title>
     <description>Cap'n Proto C# code generator backend, portable .NET Core 2.1</description>
+    <summary>Cap'n Proto C# code generator backend, portable .NET Core 2.1</summary>
     <copyright>Christian Köllner and contributors</copyright>
     <tags>capnp capnpc RPC serialization cerealization</tags>
     <!--<repository type="Git" />-->
+    <dependencies>
+        <dependency id="capnproto" version="0.7.0" />
+    </dependencies>
   </metadata>
 <files>
     <file src="chocolateyinstall.ps1" target="tools" />
     <file src="chocolateyuninstall.ps1" target="tools" />
+    <file src="..\..\LICENSE" target="tools\LICENSE" />
+    <file src="..\VERIFICATION" target="tools\VERIFICATION" />
     <file src=".\bin\**" target="tools" />
   </files>
 </package>
\ No newline at end of file
diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1
index 7ecb46a..af920b3 100644
--- a/scripts/capnpc-csharp-pack.ps1
+++ b/scripts/capnpc-csharp-pack.ps1
@@ -8,5 +8,5 @@ $csprojFile = "capnpc-csharp.csproj"
 dotnet publish -c Release -r win-x86 --self-contained -o "$chocoDir\$id_win_x86\bin" "$csprojDir\$csprojFile"
 dotnet publish -c Release -o "$chocoDir\$id\bin" "$csprojDir\$csprojFile"
 
-choco pack "$chocoDir\$id\$id.nuspec" --outputdirectory "$chocoDir\$id\bin"
-choco pack "$chocoDir\$id_win_x86\$id_win_x86.nuspec" --outputdirectory "$chocoDir\$id_win_x86\bin"
+choco pack "$chocoDir\$id\$id.nuspec" --outputdirectory "$chocoDir\install"
+choco pack "$chocoDir\$id_win_x86\$id_win_x86.nuspec" --outputdirectory "$chocoDir\install"