diff --git a/Capnp.Net.Runtime.Tests/TcpRpcPorted.cs b/Capnp.Net.Runtime.Tests/TcpRpcPorted.cs index 90b2b72..3402ce9 100644 --- a/Capnp.Net.Runtime.Tests/TcpRpcPorted.cs +++ b/Capnp.Net.Runtime.Tests/TcpRpcPorted.cs @@ -482,7 +482,7 @@ namespace Capnp.Net.Runtime.Tests bool flag = call0.Wait(MediumNonDbgTimeout); Assert.IsTrue(flag); } - catch (RpcException exception) when (exception.Message == "Cannot access a disposed object.") + catch (AggregateException exception) when (exception.InnerException is RpcException rpcException && rpcException.Message == "Cannot access a disposed object.") { Logger.Log(LogLevel.Information, $"Oops, object disposed. Counter = {cap.Count}, tx count = {client.SendCount}, rx count = {client.RecvCount}"); throw; diff --git a/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj b/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj index bb63b16..2d6ac0e 100644 --- a/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj +++ b/Capnp.Net.Runtime/Capnp.Net.Runtime.csproj @@ -18,7 +18,7 @@ MIT Git capnp "Cap'n Proto" RPC serialization cerealization - 1.2-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm)) + 1.3-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm)) Debug;Release true diff --git a/Capnp.Net.Runtime/Rpc/RefCountingCapability.cs b/Capnp.Net.Runtime/Rpc/RefCountingCapability.cs index 16fb7fc..e60e3dc 100644 --- a/Capnp.Net.Runtime/Rpc/RefCountingCapability.cs +++ b/Capnp.Net.Runtime/Rpc/RefCountingCapability.cs @@ -72,7 +72,7 @@ namespace Capnp.Rpc { --_refCount; - throw new ObjectDisposedException(nameof(ConsumedCapability)); + throw new ObjectDisposedException(ToString(), "Attempted to add reference to capability which was already released"); } } } @@ -106,7 +106,7 @@ namespace Capnp.Rpc { if (_refCount <= 0) { - throw new ObjectDisposedException(nameof(ConsumedCapability), "Validation failed, capability is already disposed"); + throw new ObjectDisposedException(ToString(), "Validation failed, capability is already disposed"); } } } diff --git a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj index fc757d6..c2aa0e7 100644 --- a/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj +++ b/CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj @@ -9,9 +9,9 @@ true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - 1.1.0.0 - 1.1.0.0 - 1.1-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm)) + 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/MsBuildGenerationTest/MsBuildGenerationTest.csproj b/MsBuildGenerationTest/MsBuildGenerationTest.csproj index 22ff1a8..c415422 100644 --- a/MsBuildGenerationTest/MsBuildGenerationTest.csproj +++ b/MsBuildGenerationTest/MsBuildGenerationTest.csproj @@ -3,7 +3,7 @@ Exe netcoreapp2.2 - 1.1-local + 1.3-local Debug;Release $(Version)* diff --git a/appveyor.yml b/appveyor.yml index b18d96d..bfbe4fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.2.{build}' +version: '1.3.{build}' image: Visual Studio 2019 # branches: # only: diff --git a/capnpc-csharp/capnpc-csharp.csproj b/capnpc-csharp/capnpc-csharp.csproj index 373c3a3..f5088f0 100644 --- a/capnpc-csharp/capnpc-csharp.csproj +++ b/capnpc-csharp/capnpc-csharp.csproj @@ -13,7 +13,7 @@ https://github.com/c80k/capnproto-dotnetcore Git capnp capnpc RPC serialization cerealization - 1.2.0 + 1.3.0 Debug;Release