diff --git a/appveyor.yml b/appveyor.yml index d375d89..00a61e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.3.{build}' +version: '1.3.0-alpha' image: Visual Studio 2019 # branches: # only: @@ -51,22 +51,25 @@ artifacts: - path: chocolatey\install\capnpc-csharp-win-x86.$(appveyor_build_version).nupkg name: capnpc-csharp-win-x86 type: NuGetPackage -# - path: chocolatey\install\capnpc-csharp.$(appveyor_build_version).nupkg -# name: capnpc-csharp -# type: NuGetPackage + - path: chocolatey\install\capnpc-csharp.$(appveyor_build_version)-deprecated.nupkg + name: capnpc-csharp-deprecated + type: NuGetPackage - path: capnpc-csharp\nupkg\capnpc-csharp.$(appveyor_build_version).nupkg name: capnpc-csharp type: NuGetPackage clone_depth: 1 test_script: - cmd: vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.Generator.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.Generator.Tests.dll - - cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install - - cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y +# - cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install +# - cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y + - cmd: cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp + - cmd: dotnet tool install --global --add-source ./nupkg capnpc-csharp - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - cmd: compile-test - cmd: cd %APPVEYOR_BUILD_FOLDER% - cmd: vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.Generator.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.Generator.Tests.dll - - cmd: choco uninstall capnpc-csharp -y +# - cmd: choco uninstall capnpc-csharp -y + - cmd: dotnet tool install --global capnpc-csharp - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - cmd: notinstalled-test - cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install diff --git a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec index 801c842..8b0b66c 100644 --- a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec +++ b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec @@ -10,8 +10,11 @@ https://github.com/c80k/capnproto-dotnetcore/blob/master/LICENSE https://github.com/c80k/capnproto-dotnetcore - capnpc-csharp (Install) - Cap'n Proto C# code generator backend, portable .NET Core 2.1 + [Deprecated] capnpc-csharp (Install) + Cap'n Proto C# code generator backend, portable .NET Core 2.1 + This package is deprecated now. It was converted to a .NET Core CLI tool which is now hosted here: https://www.nuget.org/packages/capnpc-csharp + To install, type: dotnet tool install -g capnpc-csharp + Cap'n Proto C# code generator backend. This is the portable variant which depends on .NET Core 2.1 (as opposed to capnpc-csharp-win-x86) Christian Köllner and contributors https://github.com/c80k/capnproto-dotnetcore @@ -20,17 +23,7 @@ capnp capnpc RPC serialization cerealization https://github.com/c80k/capnproto-dotnetcore/releases/tag/v$version$ - - - - + - - - - - - - - + \ No newline at end of file diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index 79935d5..360a386 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -10,7 +10,7 @@ $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" +# dotnet publish -c Release -o "$chocoDir\$id\bin" "$csprojDir\$csprojFile" If(!(test-path $installDir)) { @@ -21,3 +21,4 @@ Copy-Item "$scriptDir\..\LICENSE" -Destination "$chocoDir\LICENSE.txt" choco pack "$chocoDir\$id\$id.nuspec" --version $version --outputdirectory $installDir choco pack "$chocoDir\$id_win_x86\$id_win_x86.nuspec" --version $version --outputdirectory $installDir +Rename-Item -Path "$installDir\$id.nupkg" -NewName "$installDir\$id-deprecated.nupkg" \ No newline at end of file