Added NOEXTENSIONS and NOFILEVERSION. Internalized golden_message test dependencies

4 files changed, 13 insertions, 9 deletions

diff --git a/src/ProtocolBuffers/FieldAccess/ReflectionUtil.cs b/src/ProtocolBuffers/FieldAccess/ReflectionUtil.cs
index 24f7fba9..3c9504c4 100644
--- a/src/ProtocolBuffers/FieldAccess/ReflectionUtil.cs
+++ b/src/ProtocolBuffers/FieldAccess/ReflectionUtil.cs
@@ -137,7 +137,7 @@ namespace Google.ProtocolBuffers.FieldAccess
         internal static Func<TResult> CreateDelegateFunc<TResult>(MethodInfo method)

         {

 #if !NOCREATEDELEGATE

-            object tdelegate = Delegate.CreateDelegate(typeof(Func<TResult>), null, method, true);

+            object tdelegate = Delegate.CreateDelegate(typeof(Func<TResult>), null, method);

             return (Func<TResult>)tdelegate;

 #else

             return delegate() { return (TResult)method.Invoke(null, null); };

@@ -147,7 +147,7 @@ namespace Google.ProtocolBuffers.FieldAccess
         internal static Func<T, TResult> CreateDelegateFunc<T, TResult>(MethodInfo method)

         {

 #if !NOCREATEDELEGATE

-            object tdelegate = Delegate.CreateDelegate(typeof(Func<T, TResult>), null, method, true);

+            object tdelegate = Delegate.CreateDelegate(typeof(Func<T, TResult>), null, method);

             return (Func<T, TResult>)tdelegate;

 #else

             if (method.IsStatic)

@@ -161,7 +161,7 @@ namespace Google.ProtocolBuffers.FieldAccess
         internal static Func<T1, T2, TResult> CreateDelegateFunc<T1, T2, TResult>(MethodInfo method)

         {

 #if !NOCREATEDELEGATE

-            object tdelegate = Delegate.CreateDelegate(typeof(Func<T1, T2, TResult>), null, method, true);

+            object tdelegate = Delegate.CreateDelegate(typeof(Func<T1, T2, TResult>), null, method);

             return (Func<T1, T2, TResult>)tdelegate;

 #else

             if (method.IsStatic)

@@ -175,7 +175,7 @@ namespace Google.ProtocolBuffers.FieldAccess
         internal static Action<T1, T2> CreateDelegateAction<T1, T2>(MethodInfo method)

         {

 #if !NOCREATEDELEGATE

-            object tdelegate = Delegate.CreateDelegate(typeof(Action<T1, T2>), null, method, true);

+            object tdelegate = Delegate.CreateDelegate(typeof(Action<T1, T2>), null, method);

             return (Action<T1, T2>)tdelegate;

 #else

             if (method.IsStatic)

diff --git a/src/ProtocolBuffers/Properties/AssemblyInfo.cs b/src/ProtocolBuffers/Properties/AssemblyInfo.cs
index 95bc4a61..fec3b29e 100644
--- a/src/ProtocolBuffers/Properties/AssemblyInfo.cs
+++ b/src/ProtocolBuffers/Properties/AssemblyInfo.cs
@@ -68,8 +68,8 @@ using System.Runtime.CompilerServices;
 // [assembly: AssemblyVersion("2.4.1.473")]

 

 [assembly: AssemblyVersion("2.4.1.473")]

-#if !COMPACT_FRAMEWORK

 

+#if !NOFILEVERSION

 [assembly: AssemblyFileVersion("2.4.1.473")]

 #endif

 

diff --git a/src/ProtocolBuffers/ProtocolBuffers.csproj b/src/ProtocolBuffers/ProtocolBuffers.csproj
index a325992c..620fe4a5 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -25,11 +25,12 @@
     <OutputPath>bin\Debug\</OutputPath>

     <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

     <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <DefineConstants>DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

     <NoStdLib>true</NoStdLib>

+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <DebugType>pdbonly</DebugType>

@@ -37,11 +38,12 @@
     <OutputPath>bin\Release\</OutputPath>

     <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

     <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>TRACE</DefineConstants>

+    <DefineConstants>TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

     <NoStdLib>true</NoStdLib>

+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

   </PropertyGroup>

   <ItemGroup>

     <Reference Include="mscorlib" />

diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.csproj
index 51aad864..a8a5e829 100644
--- a/src/ProtocolBuffers/ProtocolBuffersLite.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffersLite.csproj
@@ -25,10 +25,11 @@
     <OutputPath>bin\Debug\</OutputPath>

     <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

     <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>DEBUG;TRACE;LITE</DefineConstants>

+    <DefineConstants>DEBUG;TRACE;LITE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <NoStdLib>true</NoStdLib>

+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <DebugType>pdbonly</DebugType>

@@ -36,10 +37,11 @@
     <OutputPath>bin\Release\</OutputPath>

     <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>

     <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>

-    <DefineConstants>TRACE;LITE</DefineConstants>

+    <DefineConstants>TRACE;LITE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

     <NoStdLib>true</NoStdLib>

+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>

   </PropertyGroup>

   <ItemGroup>

     <Reference Include="mscorlib" />