FabInfra-Mirror/libs.capnproto-dotnetcore_Runtime
1
0
Fork 0
mirror of https://github.com/FabInfra/capnproto-dotnetcore_Runtime.git synced 2025-03-13 23:31:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36 from c80k/interception

Browse Source 
pull back changes
This commit is contained in:
c80k 2019-12-29 23:45:48 +01:00 committed by GitHub
commit abe9921ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Capnp.Net.Runtime.Tests/TcpRpcPorted.cs
View File

@ -482,7 +482,7 @@ namespace Capnp.Net.Runtime.Tests
bool flag = call0.Wait(MediumNonDbgTimeout); bool flag = call0.Wait(MediumNonDbgTimeout);
Assert.IsTrue(flag); 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}"); Logger.Log(LogLevel.Information, $"Oops, object disposed. Counter = {cap.Count}, tx count = {client.SendCount}, rx count = {client.RecvCount}");
throw; throw;

2
Capnp.Net.Runtime/Capnp.Net.Runtime.csproj
View File

@ -18,7 +18,7 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>Git</RepositoryType> <RepositoryType>Git</RepositoryType>
<PackageTags>capnp "Cap'n Proto" RPC serialization cerealization</PackageTags> <PackageTags>capnp "Cap'n Proto" RPC serialization cerealization</PackageTags>
<Version>1.2-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm))</Version> <Version>1.3-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm))</Version>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>

4
Capnp.Net.Runtime/Rpc/RefCountingCapability.cs
View File

@ -72,7 +72,7 @@ namespace Capnp.Rpc
{ {
--_refCount; --_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) if (_refCount <= 0)
{ {
throw new ObjectDisposedException(nameof(ConsumedCapability), "Validation failed, capability is already disposed"); throw new ObjectDisposedException(ToString(), "Validation failed, capability is already disposed");
} }
} }
} }

6
CapnpC.CSharp.MsBuild.Generation/CapnpC.CSharp.MsBuild.Generation.csproj
View File

@ -9,9 +9,9 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl> <PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources> <EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<AssemblyVersion>1.1.0.0</AssemblyVersion> <AssemblyVersion>1.3.0.0</AssemblyVersion>
<FileVersion>1.1.0.0</FileVersion> <FileVersion>1.3.0.0</FileVersion>
<Version>1.1-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm))</Version> <Version>1.3-local$([System.DateTime]::UtcNow.ToString(yyMMddHHmm))</Version>
<NuspecFile>$(MSBuildThisFileDirectory)CapnpC.CSharp.MsBuild.Generation.nuspec</NuspecFile> <NuspecFile>$(MSBuildThisFileDirectory)CapnpC.CSharp.MsBuild.Generation.nuspec</NuspecFile>
<NuspecProperties>version=$(Version);configuration=$(Configuration)</NuspecProperties> <NuspecProperties>version=$(Version);configuration=$(Configuration)</NuspecProperties>

2
MsBuildGenerationTest/MsBuildGenerationTest.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<Version>1.1-local</Version> <Version>1.3-local</Version>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>
<PackageReferenceVersion Condition="'$(PackageReferenceVersion)'==''">$(Version)*</PackageReferenceVersion> <PackageReferenceVersion Condition="'$(PackageReferenceVersion)'==''">$(Version)*</PackageReferenceVersion>
</PropertyGroup> </PropertyGroup>

2
appveyor.yml
View File

@ -1,4 +1,4 @@
version: '1.2.{build}' version: '1.3.{build}'
image: Visual Studio 2019 image: Visual Studio 2019
# branches: # branches:
# only: # only:

2
capnpc-csharp/capnpc-csharp.csproj
View File

@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/c80k/capnproto-dotnetcore</PackageProjectUrl> <PackageProjectUrl>https://github.com/c80k/capnproto-dotnetcore</PackageProjectUrl>
<RepositoryType>Git</RepositoryType> <RepositoryType>Git</RepositoryType>
<PackageTags>capnp capnpc RPC serialization cerealization</PackageTags> <PackageTags>capnp capnpc RPC serialization cerealization</PackageTags>
<Version>1.2.0</Version> <Version>1.3.0</Version>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>
</PropertyGroup> </PropertyGroup>