diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-10 10:06:26 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-10 10:06:26 -0800 |
| commit | 18fba0f13871ec40a9d404ef433e8a3c8c91c99a (patch) | |
| tree | 61b956e69b1a9066c3461f9f8f4b79e0912a8e32 | |
| parent | bc215089ca7d9da3a2b313b250d1dee665eda438 (diff) | |
| parent | 95c4100230e4d42060867b9ec8d578e2adfdd777 (diff) | |
| download | protobuf-18fba0f13871ec40a9d404ef433e8a3c8c91c99a.tar.gz protobuf-18fba0f13871ec40a9d404ef433e8a3c8c91c99a.tar.bz2 protobuf-18fba0f13871ec40a9d404ef433e8a3c8c91c99a.zip | |
Merge pull request #1220 from jtattermusch/add_strong_name_key
Check in strong name key.
| -rw-r--r-- | csharp/keys/Google.Protobuf.snk | bin | 0 -> 596 bytes | |||
| -rw-r--r-- | csharp/keys/README.md | 6 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj | 2 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/csharp/keys/Google.Protobuf.snk b/csharp/keys/Google.Protobuf.snk Binary files differnew file mode 100644 index 00000000..7515443c --- /dev/null +++ b/csharp/keys/Google.Protobuf.snk diff --git a/csharp/keys/README.md b/csharp/keys/README.md index 1a014198..ede67357 100644 --- a/csharp/keys/README.md +++ b/csharp/keys/README.md @@ -2,4 +2,8 @@ Contents -------- - Google.Protobuf.public.snk: - Public key to verify strong name of Google.Protobuf assemblies.
\ No newline at end of file + Public key to verify strong name of Google.Protobuf assemblies. +- Google.Protobuf.snk: + Signing key to provide strong name of Google.Protobuf assemblies. + As per [Microsoft guidance](https://msdn.microsoft.com/en-us/library/wd40t7ad(v=vs.110).aspx) + signing key should be checked into the repository. diff --git a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj index 20ae8e48..4f37c5e2 100644 --- a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj +++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj @@ -55,7 +55,7 @@ <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
<SignAssembly>True</SignAssembly>
- <AssemblyOriginatorKeyFile>C:\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 45ef8c63..ef524baf 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -64,7 +64,7 @@ <NoStdLib>true</NoStdLib>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<SignAssembly>True</SignAssembly>
- <AssemblyOriginatorKeyFile>C:\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
|