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+)?$"