From e805610427f799f88a901d9b7c085243dc67cbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Sat, 31 Aug 2019 15:58:32 +0200 Subject: [PATCH] CI: Don't test capnpc debug build Choco scripts: Fixed install issues --- appveyor.yml | 1 - .../capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec | 5 +++-- chocolatey/capnpc-csharp-win-x86/chocolateyuninstall.ps1 | 2 +- chocolatey/capnpc-csharp/capnpc-csharp.nuspec | 5 +++-- chocolatey/capnpc-csharp/chocolateyuninstall.ps1 | 2 ++ scripts/capnpc-csharp-install-win-x86.ps1 | 2 +- scripts/capnpc-csharp-install.ps1 | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 473ae04..a9e605f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,7 +54,6 @@ test_script: - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Release\netcoreapp2.2\Capnp.Net.Runtime.Tests.Std20.dll - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Debug\netcoreapp2.2\Capnp.Net.Runtime.Tests.Core21.dll - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Release\netcoreapp2.2\Capnp.Net.Runtime.Tests.Core21.dll - - cmd: vstest.console /logger:Appveyor /inIsolation capnpc-csharp.tests\bin\Debug\netcoreapp2.2\capnpc-csharp.tests.dll - cmd: vstest.console /logger:Appveyor /inIsolation capnpc-csharp.tests\bin\Release\netcoreapp2.2\capnpc-csharp.tests.dll on_finish : # any cleanup in here 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 ea88874..ece413d 100644 --- a/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec +++ b/chocolatey/capnpc-csharp-win-x86/capnpc-csharp-win-x86.nuspec @@ -20,6 +20,7 @@ Cap'n Proto C# code generator backend. This is the self-contained variant. It requires Windows x86/x64 (as opposed to the capnpc-csharp package, which is CPU-independent but requires a .NET Core runtime) + https://github.com/c80k/capnproto-dotnetcore/releases/tag/v$version$ @@ -27,8 +28,8 @@ - - + + \ No newline at end of file diff --git a/chocolatey/capnpc-csharp-win-x86/chocolateyuninstall.ps1 b/chocolatey/capnpc-csharp-win-x86/chocolateyuninstall.ps1 index e327e42..93932d4 100644 --- a/chocolatey/capnpc-csharp-win-x86/chocolateyuninstall.ps1 +++ b/chocolatey/capnpc-csharp-win-x86/chocolateyuninstall.ps1 @@ -1,3 +1,3 @@ $ErrorActionPreference = 'Stop' -Uninstall-BinFile capnpc-sharp \ No newline at end of file +Uninstall-BinFile capnpc-csharp \ No newline at end of file diff --git a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec index 4f7dd25..0a9f46c 100644 --- a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec +++ b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec @@ -19,6 +19,7 @@ https://github.com/c80k/capnproto-dotnetcore/issues capnp capnpc RPC serialization cerealization + https://github.com/c80k/capnproto-dotnetcore/releases/tag/v$version$ @@ -28,8 +29,8 @@ - - + + \ No newline at end of file diff --git a/chocolatey/capnpc-csharp/chocolateyuninstall.ps1 b/chocolatey/capnpc-csharp/chocolateyuninstall.ps1 index 40af84f..93932d4 100644 --- a/chocolatey/capnpc-csharp/chocolateyuninstall.ps1 +++ b/chocolatey/capnpc-csharp/chocolateyuninstall.ps1 @@ -1 +1,3 @@ $ErrorActionPreference = 'Stop' + +Uninstall-BinFile capnpc-csharp \ No newline at end of file diff --git a/scripts/capnpc-csharp-install-win-x86.ps1 b/scripts/capnpc-csharp-install-win-x86.ps1 index 760be81..fd69473 100644 --- a/scripts/capnpc-csharp-install-win-x86.ps1 +++ b/scripts/capnpc-csharp-install-win-x86.ps1 @@ -5,6 +5,6 @@ $installDir = "$scriptDir\..\chocolatey\install" if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) { Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs; exit } -choco install $id -s $installDir --force +choco install $id -s $installDir --force -y Pause \ No newline at end of file diff --git a/scripts/capnpc-csharp-install.ps1 b/scripts/capnpc-csharp-install.ps1 index adf0006..3b20394 100644 --- a/scripts/capnpc-csharp-install.ps1 +++ b/scripts/capnpc-csharp-install.ps1 @@ -5,6 +5,6 @@ $installDir = "$scriptDir\..\chocolatey\install" if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) { Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs; exit } -choco install $id --source="'$installDir;https://chocolatey.org/api/v2'" --force +choco install $id --source="'$installDir;https://chocolatey.org/api/v2'" --force -y Pause \ No newline at end of file