diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-08-02 01:05:00 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-08-02 01:24:27 -0700 |
| commit | d331d2f60fdce61ee81c3ab4ad66ba6d7e72cdd9 (patch) | |
| tree | 74bf84f14584d2507b7c42a736a3c4377bd8665e /csharp/src/Google.Protobuf | |
| parent | 0df900f0dc0efe7312206666f7ad5b6e448c0133 (diff) | |
| download | protobuf-d331d2f60fdce61ee81c3ab4ad66ba6d7e72cdd9.tar.gz protobuf-d331d2f60fdce61ee81c3ab4ad66ba6d7e72cdd9.tar.bz2 protobuf-d331d2f60fdce61ee81c3ab4ad66ba6d7e72cdd9.zip | |
make changes and fixes in signing
Diffstat (limited to 'csharp/src/Google.Protobuf')
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 8 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.nuspec | 2 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs | 20 |
3 files changed, 6 insertions, 24 deletions
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 2784d9b2..8a19067a 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -14,8 +14,6 @@ <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
<OldToolsVersion>3.5</OldToolsVersion>
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
</PropertyGroup>
@@ -27,7 +25,7 @@ <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
<DocumentationFile>bin\Debug\Google.Protobuf.xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
@@ -40,7 +38,7 @@ <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>
+ <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
@@ -53,7 +51,7 @@ <IntermediateOutputPath>obj\ReleaseSigned\</IntermediateOutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);SIGNED</DefineConstants>
+ <DefineConstants>TRACE;SIGNED</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec index 1f502626..228457a3 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec +++ b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec @@ -23,7 +23,6 @@ <file src="..\..\..\cmake\Release\protoc.exe" target="tools" /> <file src="..\..\..\src\google\protobuf\any.proto" target="tools\google\protobuf" /> <file src="..\..\..\src\google\protobuf\api.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\descriptor.proto" target="tools\google\protobuf" /> <file src="..\..\..\src\google\protobuf\duration.proto" target="tools\google\protobuf" /> <file src="..\..\..\src\google\protobuf\empty.proto" target="tools\google\protobuf" /> <file src="..\..\..\src\google\protobuf\field_mask.proto" target="tools\google\protobuf" /> @@ -33,6 +32,5 @@ <file src="..\..\..\src\google\protobuf\any.proto" target="tools\google\protobuf" /> <file src="..\..\..\src\google\protobuf\type.proto" target="tools\google\protobuf" /> <file src="..\..\..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf" /> - <file src="..\..\..\src\google\protobuf\compiler\plugin.proto" target="tools\google\protobuf\compiler\plugin.proto" /> </files> </package> diff --git a/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs index c1bca8d8..73a78b01 100644 --- a/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs +++ b/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs @@ -46,19 +46,6 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.1.555")]
-
-[assembly: AssemblyVersion("2.4.1.555")]
-
#if SIGNED
[assembly: InternalsVisibleTo("Google.Protobuf.Test, PublicKey=" +
"002400000480000094000000060200000024000052534131000400000100010025800fbcfc63a1" +
@@ -70,7 +57,6 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Google.Protobuf.Test")]
#endif
-#if !NOFILEVERSION
-[assembly: AssemblyFileVersion("3.0.0.1")]
-#endif
-
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyInformationalVersion("3.0.0-alpha4")]
|