From af5c9eb44469c7d1e05fb167bdc4a8d4ab15439e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 1 Aug 2019 19:09:48 +0200 Subject: [PATCH] Corrections according to Chocolatey review --- .gitignore | 2 ++ capnpc-csharp/capnpc-csharp.csproj | 2 +- scripts/capnpc-csharp-pack.ps1 | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 537eaeb..cc27174 100644 --- a/.gitignore +++ b/.gitignore @@ -330,3 +330,5 @@ ASALocalRun/ # MFractors (Xamarin productivity tool) working folder .mfractor/ +.vscode/tasks.json +.vscode/launch.json diff --git a/capnpc-csharp/capnpc-csharp.csproj b/capnpc-csharp/capnpc-csharp.csproj index 93bdeb0..79a2e26 100644 --- a/capnpc-csharp/capnpc-csharp.csproj +++ b/capnpc-csharp/capnpc-csharp.csproj @@ -5,7 +5,7 @@ netcoreapp2.1 CapnpC 7.1 - true + false MIT Christian Köllner and contributors Cap'n Proto C# code generator backend diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index af920b3..62c7e26 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -4,9 +4,16 @@ $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path $chocoDir = "$scriptDir\..\chocolatey" $csprojDir = "$scriptDir\..\capnpc-csharp" $csprojFile = "capnpc-csharp.csproj" +$installDir = "$chocoDir\install" +dotnet build -c Release "$scriptDir\..\Capnp.Net.sln" 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\install" -choco pack "$chocoDir\$id_win_x86\$id_win_x86.nuspec" --outputdirectory "$chocoDir\install" +If(!(test-path $installDir)) +{ + New-Item -ItemType Directory -Force -Path $installDir +} + +choco pack "$chocoDir\$id\$id.nuspec" --outputdirectory $installDir +choco pack "$chocoDir\$id_win_x86\$id_win_x86.nuspec" --outputdirectory $installDir