From b0fdf30525c8572db3aaffb2d02345d89072037b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Mon, 30 Dec 2019 19:27:11 +0100 Subject: [PATCH 01/39] Enabled .NET Core CLI tool build --- appveyor.yml | 5 ++++- capnpc-csharp/capnpc-csharp.csproj | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bfbe4fb..d375d89 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,7 +51,10 @@ 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 +# - path: chocolatey\install\capnpc-csharp.$(appveyor_build_version).nupkg +# name: capnpc-csharp +# type: NuGetPackage + - path: capnpc-csharp\nupkg\capnpc-csharp.$(appveyor_build_version).nupkg name: capnpc-csharp type: NuGetPackage clone_depth: 1 diff --git a/capnpc-csharp/capnpc-csharp.csproj b/capnpc-csharp/capnpc-csharp.csproj index f5088f0..50f7dc4 100644 --- a/capnpc-csharp/capnpc-csharp.csproj +++ b/capnpc-csharp/capnpc-csharp.csproj @@ -5,7 +5,10 @@ netcoreapp2.1 CapnpC 7.1 - false + true + true + capnpc-csharp + ./nupkg/capnpc-csharp MIT Christian Köllner and contributors Cap'n Proto C# code generator backend From d2f3405cec817e3d16b3f0a8d8b35b6f2743d438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Tue, 31 Dec 2019 00:24:28 +0100 Subject: [PATCH 02/39] - SemVer fix - deprecated choco capnp-csharp - include CLI capnpc-csharp in test --- appveyor.yml | 17 ++++++++------- chocolatey/capnpc-csharp/capnpc-csharp.nuspec | 21 +++++++------------ scripts/capnpc-csharp-pack.ps1 | 3 ++- 3 files changed, 19 insertions(+), 22 deletions(-) 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 From 09c5e31f34d1529cfa64b4482684b7fd6ab12353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Tue, 31 Dec 2019 00:51:23 +0100 Subject: [PATCH 03/39] version fix --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 00a61e1..7892b2f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.3.0-alpha' +version: '1.3.0' image: Visual Studio 2019 # branches: # only: @@ -62,6 +62,7 @@ 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: choco install capnproto --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 @@ -69,7 +70,7 @@ test_script: - 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: dotnet tool install --global capnpc-csharp + - cmd: dotnet tool uninstall --global capnpc-csharp - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - cmd: notinstalled-test - cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install From f4130ab82803b9d3d13e427853a53c16b11ad8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:12:19 +0100 Subject: [PATCH 04/39] semver fix --- appveyor.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7892b2f..3b7237e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ -version: '1.3.0' +environment: + semver: "1.3.0" +version: '{semver}+{build}' image: Visual Studio 2019 # branches: # only: @@ -17,10 +19,10 @@ dotnet_csproj: patch: true file: '**\*.csproj;**\*.props;**\*.fsproj;**\*.xml' version: '{version}' - package_version: '{version}' + package_version: '{semver}' assembly_version: '{version}' file_version: '{version}' - informational_version: '{version}' + informational_version: '{semver}' before_build: - cmd: dotnet --version - cmd: msbuild -ver From 118fb81ec46cc1a4c541d0bc4c12f09ce44b27ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:13:30 +0100 Subject: [PATCH 05/39] appveyor fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3b7237e..c12161f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: semver: "1.3.0" -version: '{semver}+{build}' +version: '$(semver)+{build}' image: Visual Studio 2019 # branches: # only: From 9e4171e3e334fbcef0cc096a10e47ccae075364a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:38:16 +0100 Subject: [PATCH 06/39] semver + appveyor fix --- appveyor.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c12161f..3c83ff6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,11 @@ environment: - semver: "1.3.0" -version: '$(semver)+{build}' + major: 1 + minor: 3 + patch: 0 + semver: '$(major).$(minor).$(patch)' + fullsemver: '$(semver)+{build}' + msasmver: '$(major).$(minor).{build}.$(patch)' +version: '$(fullsemver)' image: Visual Studio 2019 # branches: # only: @@ -18,11 +23,11 @@ install: dotnet_csproj: patch: true file: '**\*.csproj;**\*.props;**\*.fsproj;**\*.xml' - version: '{version}' - package_version: '{semver}' - assembly_version: '{version}' - file_version: '{version}' - informational_version: '{semver}' + version: '$(semver)' + package_version: '$(semver)' + assembly_version: '$(msasmver)' + file_version: '$(msasmver)' + informational_version: '$(fullsemver)' before_build: - cmd: dotnet --version - cmd: msbuild -ver From 279b8ff1dc273288ad8f99145bf6ce60d2455242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:51:55 +0100 Subject: [PATCH 07/39] appveyor fix --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3c83ff6..5e47e92 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,10 @@ environment: major: 1 minor: 3 patch: 0 - semver: '$(major).$(minor).$(patch)' - fullsemver: '$(semver)+{build}' - msasmver: '$(major).$(minor).{build}.$(patch)' +init: + - cmd: set semver='%major%.%minor%.%patch%' + - cmd: set fullsemver='%semver%+{build}' + - cmd: set msasmver='%major%.%minor%.{build}.%patch%' version: '$(fullsemver)' image: Visual Studio 2019 # branches: From 72e638803a426405413a4c15e23319a0f3a927d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:52:53 +0100 Subject: [PATCH 08/39] appveyor fix --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5e47e92..0e6a805 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,8 @@ init: - cmd: set semver='%major%.%minor%.%patch%' - cmd: set fullsemver='%semver%+{build}' - cmd: set msasmver='%major%.%minor%.{build}.%patch%' + # Good practise, because Windows line endings are different from Unix/Linux ones + - cmd: git config --global core.autocrlf true version: '$(fullsemver)' image: Visual Studio 2019 # branches: @@ -13,9 +15,6 @@ image: Visual Studio 2019 # - master cache: - c:\Tools\vcpkg\installed -init: - # Good practise, because Windows line endings are different from Unix/Linux ones - - cmd: git config --global core.autocrlf true install: - cd c:\tools\vcpkg - vcpkg integrate install From 757a35b399ff96c0b3a5aeafa9cf811bf54c2750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:57:30 +0100 Subject: [PATCH 09/39] appveyor fix --- appveyor.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0e6a805..0b5cd91 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,13 +2,7 @@ environment: major: 1 minor: 3 patch: 0 -init: - - cmd: set semver='%major%.%minor%.%patch%' - - cmd: set fullsemver='%semver%+{build}' - - cmd: set msasmver='%major%.%minor%.{build}.%patch%' - # Good practise, because Windows line endings are different from Unix/Linux ones - - cmd: git config --global core.autocrlf true -version: '$(fullsemver)' +version: '$(major).$(minor).$(patch)+{build}' image: Visual Studio 2019 # branches: # only: @@ -20,6 +14,11 @@ install: - vcpkg integrate install - vcpkg install capnproto - cd %APPVEYOR_BUILD_FOLDER% +init: + - cmd: set semver='%major%.%minor%.%patch%' + - cmd: set msasmver='%major%.%minor%.{build}.%patch%' + # Good practise, because Windows line endings are different from Unix/Linux ones + - cmd: git config --global core.autocrlf true dotnet_csproj: patch: true file: '**\*.csproj;**\*.props;**\*.fsproj;**\*.xml' @@ -27,7 +26,7 @@ dotnet_csproj: package_version: '$(semver)' assembly_version: '$(msasmver)' file_version: '$(msasmver)' - informational_version: '$(fullsemver)' + informational_version: '{version}' before_build: - cmd: dotnet --version - cmd: msbuild -ver From 3620beae12f9d29b747115366da0c57c67a1c697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 17:59:02 +0100 Subject: [PATCH 10/39] appveyor fix --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0b5cd91..c88dd59 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ install: - vcpkg install capnproto - cd %APPVEYOR_BUILD_FOLDER% init: - - cmd: set semver='%major%.%minor%.%patch%' - - cmd: set msasmver='%major%.%minor%.{build}.%patch%' + - cmd: set semver=%major%.%minor%.%patch% + - cmd: set msasmver=%major%.%minor%.%build%.%patch% # Good practise, because Windows line endings are different from Unix/Linux ones - cmd: git config --global core.autocrlf true dotnet_csproj: From cedd033c42c88f857b35c726e2f3d006b081aa2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 18:04:20 +0100 Subject: [PATCH 11/39] appveyor fix --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index c88dd59..4837b01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,8 @@ install: init: - cmd: set semver=%major%.%minor%.%patch% - cmd: set msasmver=%major%.%minor%.%build%.%patch% + - cmd: echo %semver% + - cmd: echo %msasmver% # Good practise, because Windows line endings are different from Unix/Linux ones - cmd: git config --global core.autocrlf true dotnet_csproj: From 32006e242772d3d42fcd8204705480ef193a0f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 18:05:30 +0100 Subject: [PATCH 12/39] appveyor fix --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 4837b01..78c13e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ environment: major: 1 minor: 3 patch: 0 + build: {build} version: '$(major).$(minor).$(patch)+{build}' image: Visual Studio 2019 # branches: From 60bc36fedd0711f4cdff31e96c7ddf8fc1025e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 18:06:39 +0100 Subject: [PATCH 13/39] appveyor fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 78c13e7..c5249ec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ environment: major: 1 minor: 3 patch: 0 - build: {build} + build: '{build}' version: '$(major).$(minor).$(patch)+{build}' image: Visual Studio 2019 # branches: From b948b841113624a9fa24764daeb83cdbe2fe10c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 18:10:52 +0100 Subject: [PATCH 14/39] appveyor fix --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c5249ec..6e11ddc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,6 @@ environment: major: 1 minor: 3 patch: 0 - build: '{build}' version: '$(major).$(minor).$(patch)+{build}' image: Visual Studio 2019 # branches: @@ -17,7 +16,7 @@ install: - cd %APPVEYOR_BUILD_FOLDER% init: - cmd: set semver=%major%.%minor%.%patch% - - cmd: set msasmver=%major%.%minor%.%build%.%patch% + - cmd: set msasmver=%major%.%minor%.%APPVEYOR_BUILD_NUMBER%.%patch% - cmd: echo %semver% - cmd: echo %msasmver% # Good practise, because Windows line endings are different from Unix/Linux ones From 766e823aaba20b456e56104b6fb4f1c7b74da4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 19:37:19 +0100 Subject: [PATCH 15/39] versioning --- Capnp.Net.Runtime/Capnp.Net.Runtime.csproj | 2 ++ CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj | 3 +++ appveyor.yml | 10 +++++----- capnpc-csharp/capnpc-csharp.csproj | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj b/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj index 2d6ac0e..756bd88 100644 --- a/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj +++ b/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj @@ -19,6 +19,8 @@ Git capnp "Cap'n Proto" RPC serialization cerealization 1.3-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm)) + 1.3.0.0 + 1.3.0.0 Debug;Release true diff --git a/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj b/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj index e752fdf..2179b56 100644 --- a/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj +++ b/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj @@ -3,6 +3,9 @@ netstandard2.0;netcoreapp2.1 Debug;Release + 1.3.0.0 + 1.3.0.0 + 1.3.0.0 diff --git a/appveyor.yml b/appveyor.yml index 6e11ddc..780c080 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,19 +50,19 @@ build_script: after_build: # For once the build has completed artifacts: - - path: bin\Release\Capnp.Net.Runtime.$(appveyor_build_version).nupkg + - path: bin\Release\Capnp.Net.Runtime.$(semver).nupkg name: Capnp.Net.Runtime type: NuGetPackage - - path: bin\Release\CapnpC.CSharp.MsBuild.Generation.$(appveyor_build_version).nupkg + - path: bin\Release\CapnpC.CSharp.MsBuild.Generation.$(semver).nupkg name: CapnpC.CSharp.MsBuild.Generation type: NuGetPackage - - path: chocolatey\install\capnpc-csharp-win-x86.$(appveyor_build_version).nupkg + - path: chocolatey\install\capnpc-csharp-win-x86.$(semver).nupkg name: capnpc-csharp-win-x86 type: NuGetPackage - - path: chocolatey\install\capnpc-csharp.$(appveyor_build_version)-deprecated.nupkg + - path: chocolatey\install\capnpc-csharp.$(semver)-deprecated.nupkg name: capnpc-csharp-deprecated type: NuGetPackage - - path: capnpc-csharp\nupkg\capnpc-csharp.$(appveyor_build_version).nupkg + - path: capnpc-csharp\nupkg\capnpc-csharp.$(semver).nupkg name: capnpc-csharp type: NuGetPackage clone_depth: 1 diff --git a/capnpc-csharp/capnpc-csharp.csproj b/capnpc-csharp/capnpc-csharp.csproj index 50f7dc4..0ada204 100644 --- a/capnpc-csharp/capnpc-csharp.csproj +++ b/capnpc-csharp/capnpc-csharp.csproj @@ -17,6 +17,8 @@ Git capnp capnpc RPC serialization cerealization 1.3.0 + 1.3.0.0 + 1.3.0.0 Debug;Release From 72f85fb380d4e5d4f6c8a14efd07aa13cf0b2273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 20:21:29 +0100 Subject: [PATCH 16/39] versioning fix --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 780c080..3e800d2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,19 +50,19 @@ build_script: after_build: # For once the build has completed artifacts: - - path: bin\Release\Capnp.Net.Runtime.$(semver).nupkg + - path: bin\Release\Capnp.Net.Runtime.*.nupkg name: Capnp.Net.Runtime type: NuGetPackage - - path: bin\Release\CapnpC.CSharp.MsBuild.Generation.$(semver).nupkg + - path: bin\Release\CapnpC.CSharp.MsBuild.Generation.*.nupkg name: CapnpC.CSharp.MsBuild.Generation type: NuGetPackage - - path: chocolatey\install\capnpc-csharp-win-x86.$(semver).nupkg + - path: chocolatey\install\capnpc-csharp-win-x86.*.nupkg name: capnpc-csharp-win-x86 type: NuGetPackage - - path: chocolatey\install\capnpc-csharp.$(semver)-deprecated.nupkg + - path: chocolatey\install\capnpc-csharp.*-deprecated.nupkg name: capnpc-csharp-deprecated type: NuGetPackage - - path: capnpc-csharp\nupkg\capnpc-csharp.$(semver).nupkg + - path: capnpc-csharp\nupkg\capnpc-csharp.*.nupkg name: capnpc-csharp type: NuGetPackage clone_depth: 1 From 0a04aa886cb4bb979132160213d375a7ab355cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 20:40:07 +0100 Subject: [PATCH 17/39] versioning fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3e800d2..8abbd91 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,7 +46,7 @@ build_script: - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Release" - cmd: msbuild ./CapnpCompatTest.sln /p:Configuration="Debug" - cmd: msbuild ./CapnpCompatTest.sln /p:Configuration="Release" - - ps: scripts\capnpc-csharp-pack.ps1 $env:appveyor_build_version + - ps: scripts\capnpc-csharp-pack.ps1 $env:semver after_build: # For once the build has completed artifacts: From 37f442186122214c320c01088638913a8a199f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 20:49:30 +0100 Subject: [PATCH 18/39] choco packaging fix --- chocolatey/capnpc-csharp/capnpc-csharp.nuspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec index 8b0b66c..7a819d2 100644 --- a/chocolatey/capnpc-csharp/capnpc-csharp.nuspec +++ b/chocolatey/capnpc-csharp/capnpc-csharp.nuspec @@ -23,7 +23,9 @@ capnp capnpc RPC serialization cerealization https://github.com/c80k/capnproto-dotnetcore/releases/tag/v$version$ - + + + \ No newline at end of file From 16a9240df60c20eb4fc3adb1139618bdcde140a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 20:53:17 +0100 Subject: [PATCH 19/39] choco packaging fix --- scripts/capnpc-csharp-pack.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index 360a386..0bb46b1 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -21,4 +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 +Rename-Item -Path "$installDir\$id.$version.nupkg" -NewName "$installDir\$id.$version-deprecated.nupkg" \ No newline at end of file From 2c1398906c235da667f202ee11401d5460ea3e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 20:59:02 +0100 Subject: [PATCH 20/39] choco packaging fix --- scripts/capnpc-csharp-pack.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index 0bb46b1..6d5a34f 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -21,4 +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.$version.nupkg" -NewName "$installDir\$id.$version-deprecated.nupkg" \ No newline at end of file +Rename-Item -Path "$installDir\$id.$version.nupkg" -NewName "$id.$version-deprecated.nupkg" \ No newline at end of file From 2ae5ad9d783b15c5bea9b7e1cbc68ddf66c6e054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 21:34:17 +0100 Subject: [PATCH 21/39] deployment fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8abbd91..c35cb5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,7 +62,7 @@ artifacts: - path: chocolatey\install\capnpc-csharp.*-deprecated.nupkg name: capnpc-csharp-deprecated type: NuGetPackage - - path: capnpc-csharp\nupkg\capnpc-csharp.*.nupkg + - path: capnpc-csharp\nupkg\*.nupkg name: capnpc-csharp type: NuGetPackage clone_depth: 1 From fb949e7ae525edf8a03385045dd795ffcede4870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 22:13:11 +0100 Subject: [PATCH 22/39] deployment fix --- capnpc-csharp/capnpc-csharp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capnpc-csharp/capnpc-csharp.csproj b/capnpc-csharp/capnpc-csharp.csproj index 0ada204..3834a2b 100644 --- a/capnpc-csharp/capnpc-csharp.csproj +++ b/capnpc-csharp/capnpc-csharp.csproj @@ -8,7 +8,7 @@ true true capnpc-csharp - ./nupkg/capnpc-csharp + ./nupkg MIT Christian Köllner and contributors Cap'n Proto C# code generator backend From 5d94d1f8d3bd3415192408d0d82bcfaf21f23b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 22:38:33 +0100 Subject: [PATCH 23/39] introducing nbgv --- Directory.Build.props | 9 +++++++++ version.json | 13 +++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 Directory.Build.props create mode 100644 version.json diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..46af06b --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + 3.0.28 + all + + + \ No newline at end of file diff --git a/version.json b/version.json new file mode 100644 index 0000000..436aeab --- /dev/null +++ b/version.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.0-beta", + "publicReleaseRefSpec": [ + "^refs/heads/master$", + "^refs/heads/v\\d+(?:\\.\\d+)?$" + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} \ No newline at end of file From 033d42f91d6e01687315d387710dc207da1abc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 22:39:00 +0100 Subject: [PATCH 24/39] adaptions for nbgv --- Capnp.Net.Runtime/Capnp.Net.Runtime.csproj | 3 --- .../CapnpC.CSharp.Generator.csproj | 3 --- .../CapnpC.CSharp.MsBuild.Generation.csproj | 3 --- appveyor.yml | 23 ++++--------------- capnpc-csharp/capnpc-csharp.csproj | 3 --- scripts/capnpc-csharp-pack.ps1 | 2 +- version.json | 2 +- 7 files changed, 6 insertions(+), 33 deletions(-) diff --git a/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj b/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj index 756bd88..6b5d624 100644 --- a/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj +++ b/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj @@ -18,9 +18,6 @@ MIT Git capnp "Cap'n Proto" RPC serialization cerealization - 1.3-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm)) - 1.3.0.0 - 1.3.0.0 Debug;Release true diff --git a/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj b/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj index 2179b56..e752fdf 100644 --- a/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj +++ b/CapnpC.CSharp.Generator/CapnpC.CSharp.Generator.csproj @@ -3,9 +3,6 @@ netstandard2.0;netcoreapp2.1 Debug;Release - 1.3.0.0 - 1.3.0.0 - 1.3.0.0 diff --git a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj index c2aa0e7..44f3dec 100644 --- a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj +++ b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj @@ -9,9 +9,6 @@ true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - 1.3.0.0 - 1.3.0.0 - 1.3-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm)) $(MSBuildThisFileDirectory)CapnpC.CSharp.MsBuild.Generation.nuspec version=$(Version);configuration=$(Configuration) diff --git a/appveyor.yml b/appveyor.yml index c35cb5e..3752b3e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,3 @@ -environment: - major: 1 - minor: 3 - patch: 0 -version: '$(major).$(minor).$(patch)+{build}' image: Visual Studio 2019 # branches: # only: @@ -14,21 +9,11 @@ install: - vcpkg integrate install - vcpkg install capnproto - cd %APPVEYOR_BUILD_FOLDER% + - dotnet tool install -g . nbgv init: - - cmd: set semver=%major%.%minor%.%patch% - - cmd: set msasmver=%major%.%minor%.%APPVEYOR_BUILD_NUMBER%.%patch% - - cmd: echo %semver% - - cmd: echo %msasmver% # Good practise, because Windows line endings are different from Unix/Linux ones + - cmd: nbgv cloud - cmd: git config --global core.autocrlf true -dotnet_csproj: - patch: true - file: '**\*.csproj;**\*.props;**\*.fsproj;**\*.xml' - version: '$(semver)' - package_version: '$(semver)' - assembly_version: '$(msasmver)' - file_version: '$(msasmver)' - informational_version: '{version}' before_build: - cmd: dotnet --version - cmd: msbuild -ver @@ -43,10 +28,10 @@ before_build: - cmd: dotnet restore ./capnpc-csharp/capnpc-csharp.csproj --verbosity m build_script: - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Debug" - - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Release" + - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Release" /p:PublicRelease=true - cmd: msbuild ./CapnpCompatTest.sln /p:Configuration="Debug" - cmd: msbuild ./CapnpCompatTest.sln /p:Configuration="Release" - - ps: scripts\capnpc-csharp-pack.ps1 $env:semver + - ps: scripts\capnpc-csharp-pack.ps1 after_build: # For once the build has completed artifacts: diff --git a/capnpc-csharp/capnpc-csharp.csproj b/capnpc-csharp/capnpc-csharp.csproj index 3834a2b..090c3d4 100644 --- a/capnpc-csharp/capnpc-csharp.csproj +++ b/capnpc-csharp/capnpc-csharp.csproj @@ -16,9 +16,6 @@ https://github.com/c80k/capnproto-dotnetcore Git capnp capnpc RPC serialization cerealization - 1.3.0 - 1.3.0.0 - 1.3.0.0 Debug;Release diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index 6d5a34f..aa70736 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -8,7 +8,7 @@ $csprojDir = "$scriptDir\..\capnpc-csharp" $csprojFile = "capnpc-csharp.csproj" $installDir = "$chocoDir\install" -dotnet build -c Release "$scriptDir\..\Capnp.Net.sln" +dotnet build -c Release "$scriptDir\..\Capnp.Net.sln" /p:PublicRelease=true 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" diff --git a/version.json b/version.json index 436aeab..d7759d4 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0-beta", + "version": "1.3", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" From 0497ebb63fe52a853cfaf093458d6be1ef19e331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:34:19 +0100 Subject: [PATCH 25/39] nbgv-related fixes --- .../CapnpC.CSharp.MsBuild.Generation.csproj | 3 +-- .../CapnpC.CSharp.MsBuild.Generation.nuspec | 6 ++--- Directory.Build.targets | 23 +++++++++++++++++++ version.json | 3 ++- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 Directory.Build.targets diff --git a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj index 44f3dec..92c5f3c 100644 --- a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj +++ b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj @@ -9,9 +9,8 @@ true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - + $(MSBuildThisFileDirectory)CapnpC.CSharp.MsBuild.Generation.nuspec - version=$(Version);configuration=$(Configuration) true ..\bin\$(Configuration) Debug;Release diff --git a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec index e048bb9..e3ad91d 100644 --- a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec +++ b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.nuspec @@ -21,9 +21,9 @@ - - - + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..20033a9 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,23 @@ + + + + $(NuspecProperties);config=$(Configuration) + $(NuspecProperties);version=$(NuGetPackageVersion) + $(NuspecProperties);SolutionDir=$(SolutionDir) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/version.json b/version.json index d7759d4..b47b6b2 100644 --- a/version.json +++ b/version.json @@ -7,7 +7,8 @@ ], "cloudBuild": { "buildNumber": { - "enabled": true + "enabled": true, + "setVersionVariables": true } } } \ No newline at end of file From 609b6aaa09b764fe61ded065cc0384105797bc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:37:17 +0100 Subject: [PATCH 26/39] appveyor/nbgv fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3752b3e..6bf0ac8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,9 +12,9 @@ install: - dotnet tool install -g . nbgv init: # Good practise, because Windows line endings are different from Unix/Linux ones - - cmd: nbgv cloud - cmd: git config --global core.autocrlf true before_build: + - cmd: nbgv cloud - cmd: dotnet --version - cmd: msbuild -ver - cmd: dotnet restore ./Capnp.Net.Runtime/Capnp.Net.Runtime.csproj --verbosity m From 7e6987f4c5606d39351b2fc9f72d00f201be1b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:39:00 +0100 Subject: [PATCH 27/39] appveyor/nbgv fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6bf0ac8..4ec9ac7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ install: - vcpkg integrate install - vcpkg install capnproto - cd %APPVEYOR_BUILD_FOLDER% - - dotnet tool install -g . nbgv + - dotnet tool install -g nbgv init: # Good practise, because Windows line endings are different from Unix/Linux ones - cmd: git config --global core.autocrlf true From 244803a1446d960c8c52e467fff883d15f9e7a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:42:13 +0100 Subject: [PATCH 28/39] nbgv cloud seems to crash --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4ec9ac7..4857f2c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ image: Visual Studio 2019 # branches: # only: # - master +version: {build} cache: - c:\Tools\vcpkg\installed install: @@ -14,7 +15,7 @@ init: # Good practise, because Windows line endings are different from Unix/Linux ones - cmd: git config --global core.autocrlf true before_build: - - cmd: nbgv cloud +# - cmd: nbgv cloud - cmd: dotnet --version - cmd: msbuild -ver - cmd: dotnet restore ./Capnp.Net.Runtime/Capnp.Net.Runtime.csproj --verbosity m From 6dbf0343142abba49d925bdd2b812fe81f84f45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:42:47 +0100 Subject: [PATCH 29/39] appveyor fix --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4857f2c..234dd96 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2019 # branches: # only: # - master -version: {build} +version: '{build}' cache: - c:\Tools\vcpkg\installed install: From 6efeaa067871b4094f224b5bed64f23b4f5bdaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:51:05 +0100 Subject: [PATCH 30/39] does this fix the crash? --- version.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/version.json b/version.json index b47b6b2..d7759d4 100644 --- a/version.json +++ b/version.json @@ -7,8 +7,7 @@ ], "cloudBuild": { "buildNumber": { - "enabled": true, - "setVersionVariables": true + "enabled": true } } } \ No newline at end of file From 5208531ef2f2abc3612e9116449c702f25dd370e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Thu, 2 Jan 2020 23:59:32 +0100 Subject: [PATCH 31/39] no shallow cloning anymore! --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 234dd96..41ad4c1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,7 +51,6 @@ artifacts: - path: capnpc-csharp\nupkg\*.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 From 9e7c604108c1c3be5cf98289c6f8e04804973402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 00:40:41 +0100 Subject: [PATCH 32/39] nbgv / choco pack fi --- appveyor.yml | 2 +- scripts/capnpc-csharp-pack.ps1 | 4 ++-- version.json | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 41ad4c1..80c8bd5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ init: # Good practise, because Windows line endings are different from Unix/Linux ones - cmd: git config --global core.autocrlf true before_build: -# - cmd: nbgv cloud + - cmd: nbgv cloud - cmd: dotnet --version - cmd: msbuild -ver - cmd: dotnet restore ./Capnp.Net.Runtime/Capnp.Net.Runtime.csproj --verbosity m diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index aa70736..29d11fd 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -1,5 +1,5 @@ -param($version = "1.0.0") - +$jversion = nbgv get-version -f json | ConvertFrom-Json +$version = $($jversion.NuGetPackageVersion) $id = "capnpc-csharp" $id_win_x86 = "capnpc-csharp-win-x86" $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path diff --git a/version.json b/version.json index d7759d4..b47b6b2 100644 --- a/version.json +++ b/version.json @@ -7,7 +7,8 @@ ], "cloudBuild": { "buildNumber": { - "enabled": true + "enabled": true, + "setVersionVariables": true } } } \ No newline at end of file From 83e48fca00bc0a8e849e707aef8a17aa63f4ad3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 01:16:06 +0100 Subject: [PATCH 33/39] removed PublicRelease flag --- appveyor.yml | 2 +- scripts/capnpc-csharp-pack.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 80c8bd5..4c2e316 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ before_build: - cmd: dotnet restore ./capnpc-csharp/capnpc-csharp.csproj --verbosity m build_script: - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Debug" - - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Release" /p:PublicRelease=true + - cmd: msbuild ./Capnp.Net.sln /p:Configuration="Release" - cmd: msbuild ./CapnpCompatTest.sln /p:Configuration="Debug" - cmd: msbuild ./CapnpCompatTest.sln /p:Configuration="Release" - ps: scripts\capnpc-csharp-pack.ps1 diff --git a/scripts/capnpc-csharp-pack.ps1 b/scripts/capnpc-csharp-pack.ps1 index 29d11fd..6aadac5 100644 --- a/scripts/capnpc-csharp-pack.ps1 +++ b/scripts/capnpc-csharp-pack.ps1 @@ -8,7 +8,7 @@ $csprojDir = "$scriptDir\..\capnpc-csharp" $csprojFile = "capnpc-csharp.csproj" $installDir = "$chocoDir\install" -dotnet build -c Release "$scriptDir\..\Capnp.Net.sln" /p:PublicRelease=true +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" From fbfa827279c1415dba3aa1daf20030b85597c6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 01:37:31 +0100 Subject: [PATCH 34/39] dotnet tool fix --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4c2e316..6be8c88 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,10 @@ test_script: # - cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y - cmd: choco install capnproto --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 + - powershell: | + $jversion = nbgv get-version -f json | ConvertFrom-Json + $version = $($jversion.NuGetPackageVersion) + dotnet tool install --global --add-source ./nupkg capnpc-csharp --version $(version) - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - cmd: compile-test - cmd: cd %APPVEYOR_BUILD_FOLDER% From cfce6e87f4f066a709ce3e73ff096f81bebce83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 01:51:26 +0100 Subject: [PATCH 35/39] dotnet tool hack --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6be8c88..5451b4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,10 +57,9 @@ test_script: # - cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y - cmd: choco install capnproto --source="https://chocolatey.org/api/v2" --force -y - cmd: cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp - - powershell: | - $jversion = nbgv get-version -f json | ConvertFrom-Json - $version = $($jversion.NuGetPackageVersion) - dotnet tool install --global --add-source ./nupkg capnpc-csharp --version $(version) + - cmd: echo dotnet tool install --global --add-source ./nupkg capnpc-csharp --version > install.bat + - cmd: nbgv get-version -v NuGetPackageVersion >> install.bat + - cmd: install.bat - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - cmd: compile-test - cmd: cd %APPVEYOR_BUILD_FOLDER% From 2248311b5f609d97bcb3f2927e2417f29d8a2286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 01:59:15 +0100 Subject: [PATCH 36/39] dotnet tool test hack (even uglier) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5451b4f..fe6d357 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ test_script: # - cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y - cmd: choco install capnproto --source="https://chocolatey.org/api/v2" --force -y - cmd: cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp - - cmd: echo dotnet tool install --global --add-source ./nupkg capnpc-csharp --version > install.bat + - cmd: echo|set /p="dotnet tool install --global --add-source ./nupkg capnpc-csharp --version " > install.bat - cmd: nbgv get-version -v NuGetPackageVersion >> install.bat - cmd: install.bat - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test From 5bfd40c245e38978ada890473d5323114bb3103f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 02:06:15 +0100 Subject: [PATCH 37/39] dotnet tool test fix (even more uglier) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fe6d357..f36ed7b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ test_script: # - cmd: choco install capnpc-csharp --source=".;https://chocolatey.org/api/v2" --force -y - cmd: choco install capnproto --source="https://chocolatey.org/api/v2" --force -y - cmd: cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp - - cmd: echo|set /p="dotnet tool install --global --add-source ./nupkg capnpc-csharp --version " > install.bat + - cmd: echo|set /p="dotnet tool install --global --add-source ./nupkg capnpc-csharp --version " > install.bat & exit 0 - cmd: nbgv get-version -v NuGetPackageVersion >> install.bat - cmd: install.bat - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test From e075339fecfb88e66ef58ad9ecd14e8c1459c85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 02:17:07 +0100 Subject: [PATCH 38/39] install test fix (less ugly) --- appveyor.yml | 58 +++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f36ed7b..98510e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,36 +52,34 @@ artifacts: name: capnpc-csharp type: NuGetPackage 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: choco install capnproto --source="https://chocolatey.org/api/v2" --force -y - - cmd: cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp - - cmd: echo|set /p="dotnet tool install --global --add-source ./nupkg capnpc-csharp --version " > install.bat & exit 0 - - cmd: nbgv get-version -v NuGetPackageVersion >> install.bat - - cmd: install.bat - - 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: dotnet tool uninstall --global capnpc-csharp - - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - - cmd: notinstalled-test - - cmd: cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install - - cmd: choco install capnpc-csharp-win-x86 --source=".;https://chocolatey.org/api/v2" --force -y - - cmd: cd %APPVEYOR_BUILD_FOLDER%\install-test - - cmd: compile-test - - cmd: choco uninstall capnpc-csharp-win-x86 -y - - cmd: notinstalled-test - - cmd: cd %APPVEYOR_BUILD_FOLDER% - - cmd: vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.MsBuild.Generation.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.MsBuild.Generation.Tests.dll - - cmd: msbuild -t:restore ./MsBuildGenerationTest/MsBuildGenerationTest.csproj /p:Configuration="Debug" /p:PackageReferenceVersion="%APPVEYOR_BUILD_VERSION%" - - cmd: msbuild ./MsBuildGenerationTest/MsBuildGenerationTest.sln /p:Configuration="Debug" /p:PackageReferenceVersion="%APPVEYOR_BUILD_VERSION%" - - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Debug\net471\Capnp.Net.Runtime.Tests.Std20.dll - - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Release\net471\Capnp.Net.Runtime.Tests.Std20.dll - - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Debug\netcoreapp2.1\Capnp.Net.Runtime.Tests.Core21.dll - - cmd: vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Release\netcoreapp2.1\Capnp.Net.Runtime.Tests.Core21.dll + - cmd: | + nbgv get-version -v NuGetPackageVersion >> version.txt + set /P VERSION=< version.txt + vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.Generator.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.Generator.Tests.dll + choco install capnproto --source="https://chocolatey.org/api/v2" --force -y + cd %APPVEYOR_BUILD_FOLDER%\capnpc-csharp + dotnet tool install --global --add-source ./nupkg capnpc-csharp --version %VERSION% + cd %APPVEYOR_BUILD_FOLDER%\install-test + compile-test + cd %APPVEYOR_BUILD_FOLDER% + vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.Generator.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.Generator.Tests.dll + dotnet tool uninstall --global capnpc-csharp + cd %APPVEYOR_BUILD_FOLDER%\install-test + notinstalled-test + cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install + choco install capnpc-csharp-win-x86 --source=".;https://chocolatey.org/api/v2" --force -y + cd %APPVEYOR_BUILD_FOLDER%\install-test + compile-test + choco uninstall capnpc-csharp-win-x86 -y + notinstalled-test + cd %APPVEYOR_BUILD_FOLDER% + vstest.console /logger:Appveyor /inIsolation CapnpC.CSharp.MsBuild.Generation.Tests\bin\Release\netcoreapp2.1\CapnpC.CSharp.MsBuild.Generation.Tests.dll + msbuild -t:restore ./MsBuildGenerationTest/MsBuildGenerationTest.csproj /p:Configuration="Debug" /p:PackageReferenceVersion="%VERSION%" + msbuild ./MsBuildGenerationTest/MsBuildGenerationTest.sln /p:Configuration="Debug" /p:PackageReferenceVersion="%VERSION%" + vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Debug\net471\Capnp.Net.Runtime.Tests.Std20.dll + vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests\bin\Release\net471\Capnp.Net.Runtime.Tests.Std20.dll + vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Debug\netcoreapp2.1\Capnp.Net.Runtime.Tests.Core21.dll + vstest.console /logger:Appveyor /inIsolation Capnp.Net.Runtime.Tests.Core21\bin\Release\netcoreapp2.1\Capnp.Net.Runtime.Tests.Core21.dll on_finish : # any cleanup in here deploy: From 5daec1fb11507bc2b203f627f21e2e027c2829a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6llner?= Date: Fri, 3 Jan 2020 02:23:44 +0100 Subject: [PATCH 39/39] force choco install of locally built package --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 98510e8..a42263e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,7 +67,7 @@ test_script: cd %APPVEYOR_BUILD_FOLDER%\install-test notinstalled-test cd %APPVEYOR_BUILD_FOLDER%\chocolatey\install - choco install capnpc-csharp-win-x86 --source=".;https://chocolatey.org/api/v2" --force -y + choco install capnpc-csharp-win-x86 --source=".;https://chocolatey.org/api/v2" --force -y --version %VERSION% --pre cd %APPVEYOR_BUILD_FOLDER%\install-test compile-test choco uninstall capnpc-csharp-win-x86 -y