- SemVer fix

- deprecated choco capnp-csharp
- include CLI capnpc-csharp in test
This commit is contained in:
Christian Köllner 2019-12-31 00:24:28 +01:00
parent b0fdf30525
commit d2f3405cec
3 changed files with 19 additions and 22 deletions

View File

@ -1,4 +1,4 @@
version: '1.3.{build}' version: '1.3.0-alpha'
image: Visual Studio 2019 image: Visual Studio 2019
# branches: # branches:
# only: # only:
@ -51,22 +51,25 @@ artifacts:
- path: chocolatey\install\capnpc-csharp-win-x86.$(appveyor_build_version).nupkg - path: chocolatey\install\capnpc-csharp-win-x86.$(appveyor_build_version).nupkg
name: capnpc-csharp-win-x86 name: capnpc-csharp-win-x86
type: NuGetPackage type: NuGetPackage
# - path: chocolatey\install\capnpc-csharp.$(appveyor_build_version).nupkg - path: chocolatey\install\capnpc-csharp.$(appveyor_build_version)-deprecated.nupkg
# name: capnpc-csharp name: capnpc-csharp-deprecated
# type: NuGetPackage type: NuGetPackage
- path: capnpc-csharp\nupkg\capnpc-csharp.$(appveyor_build_version).nupkg - path: capnpc-csharp\nupkg\capnpc-csharp.$(appveyor_build_version).nupkg
name: capnpc-csharp name: capnpc-csharp
type: NuGetPackage type: NuGetPackage
clone_depth: 1 clone_depth: 1
test_script: test_script:
- cmd: vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.Generator.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.Generator.Tests.dll - 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: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install
- cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y # - 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: cd %APPVEYOR_BUILD_FOLDER%\install-test
- cmd: compile-test - cmd: compile-test
- cmd: cd %APPVEYOR_BUILD_FOLDER% - 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: 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: cd %APPVEYOR_BUILD_FOLDER%\install-test
- cmd: notinstalled-test - cmd: notinstalled-test
- cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install - cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install

View File

@ -10,8 +10,11 @@
<!--<license type="expression">MIT</license>--> <!--<license type="expression">MIT</license>-->
<licenseUrl>https://github.com/c80k/capnproto-dotnetcore/blob/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/c80k/capnproto-dotnetcore/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl> <projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl>
<title>capnpc-csharp (Install)</title> <title>[Deprecated] capnpc-csharp (Install)</title>
<description>Cap'n Proto C# code generator backend, portable .NET Core 2.1</description> <description>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
</description>
<summary>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)</summary> <summary>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)</summary>
<copyright>Christian Köllner and contributors</copyright> <copyright>Christian Köllner and contributors</copyright>
<projectSourceUrl>https://github.com/c80k/capnproto-dotnetcore</projectSourceUrl> <projectSourceUrl>https://github.com/c80k/capnproto-dotnetcore</projectSourceUrl>
@ -20,17 +23,7 @@
<tags>capnp capnpc RPC serialization cerealization</tags> <tags>capnp capnpc RPC serialization cerealization</tags>
<!--<repository type="Git" />--> <!--<repository type="Git" />-->
<releaseNotes>https://github.com/c80k/capnproto-dotnetcore/releases/tag/v$version$</releaseNotes> <releaseNotes>https://github.com/c80k/capnproto-dotnetcore/releases/tag/v$version$</releaseNotes>
<dependencies> <dependencies/>
<dependency id="capnproto" version="0.7.0" />
<dependency id="dotnetcore-runtime.install" version="2.1.6" />
</dependencies>
</metadata> </metadata>
<files> <files/>
<file src="chocolateyinstall.ps1" target="tools" />
<file src="chocolateyuninstall.ps1" target="tools" />
<file src=".\capnpc-csharp.ps1" target="tools" />
<file src="..\LICENSE.txt" target="tools" />
<file src="..\VERIFICATION.txt" target="tools" />
<file src=".\bin\**" target="bin" />
</files>
</package> </package>

View File

@ -10,7 +10,7 @@ $installDir = "$chocoDir\install"
dotnet build -c Release "$scriptDir\..\Capnp.Net.sln" 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 -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)) 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\$id.nuspec" --version $version --outputdirectory $installDir
choco pack "$chocoDir\$id_win_x86\$id_win_x86.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"