diff options
author | Jon Skeet <skeet@pobox.com> | 2015-08-03 14:05:52 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-08-03 14:05:52 +0100 |
commit | 415f72e07919cefdd7768f6460de9f32576c3248 (patch) | |
tree | 68931f5dff7ac34ecdd291198ff893fe2b16c663 /csharp | |
parent | db9f47a3ed78f55bb4eb8b8b8582a88eb64402d0 (diff) | |
parent | e94bdd9303db0ffba6fc380f3e5f138af91ff6be (diff) | |
download | protobuf-415f72e07919cefdd7768f6460de9f32576c3248.tar.gz protobuf-415f72e07919cefdd7768f6460de9f32576c3248.tar.bz2 protobuf-415f72e07919cefdd7768f6460de9f32576c3248.zip |
Merge pull request #680 from jskeet/aptca
Allow partially-trusted callers again.
Diffstat (limited to 'csharp')
-rw-r--r-- | csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs index 73a78b01..9a484ad6 100644 --- a/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs +++ b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs @@ -32,6 +32,7 @@ using System.Reflection;
using System.Runtime.CompilerServices;
+using System.Security;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -45,6 +46,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
+[assembly: AllowPartiallyTrustedCallers]
#if SIGNED
[assembly: InternalsVisibleTo("Google.Protobuf.Test, PublicKey=" +
|