Commit efc90f40 authored by csharptest's avatar csharptest Committed by rogerk

Changes to support the Portable Library profile

parent 6716432c
...@@ -14,16 +14,6 @@ using System.Runtime.InteropServices; ...@@ -14,16 +14,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("57123e6e-28d1-4b9e-80a5-5e720df8035a")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
......
...@@ -15,18 +15,8 @@ using System.Runtime.InteropServices; ...@@ -15,18 +15,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2009")] [assembly: AssemblyCopyright("Copyright © 2009")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("0f515d09-9a6c-49ec-8500-14a5303ebadf")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
......
...@@ -15,16 +15,6 @@ using System.Runtime.InteropServices; ...@@ -15,16 +15,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("fed7572b-d747-4704-a6da-6c3c61088346")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
......
...@@ -15,16 +15,6 @@ using System.Runtime.InteropServices; ...@@ -15,16 +15,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("40720ee3-2d15-4271-8c42-8f9cfd01b52f")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
......
...@@ -14,16 +14,6 @@ using System.Runtime.InteropServices; ...@@ -14,16 +14,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7101763b-7a38-41be-87f5-7ede4c554509")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
......
...@@ -15,16 +15,6 @@ using System.Runtime.InteropServices; ...@@ -15,16 +15,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("4d26ed0e-a6ca-4df9-bb87-59429d49b676")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
......
...@@ -46,15 +46,6 @@ using System.Runtime.CompilerServices; ...@@ -46,15 +46,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright © 2008")] [assembly: AssemblyCopyright("Copyright © 2008")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("279b643d-70e8-47ae-9eb1-500d1c48bab6")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
......
...@@ -16,16 +16,6 @@ using System.Runtime.InteropServices; ...@@ -16,16 +16,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("54e627c3-daaa-4850-82cf-f25b7f097e78")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
...@@ -39,10 +29,6 @@ using System.Runtime.InteropServices; ...@@ -39,10 +29,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion("2.4.1.473")] [assembly: AssemblyVersion("2.4.1.473")]
#if !NOFILEVERSION
[assembly: AssemblyFileVersion("2.4.1.473")]
#endif
// We don't really need CLSCompliance, but if the assembly builds with no warnings, // We don't really need CLSCompliance, but if the assembly builds with no warnings,
// that means the generator is okay. // that means the generator is okay.
......
...@@ -52,10 +52,10 @@ namespace Google.ProtocolBuffers ...@@ -52,10 +52,10 @@ namespace Google.ProtocolBuffers
internal static readonly string NewLine = System.Environment.NewLine; internal static readonly string NewLine = System.Environment.NewLine;
#endif #endif
#if SILVERLIGHT #if CLIENTPROFILE
internal const RegexOptions CompiledRegexWhereAvailable = RegexOptions.None;
#else
internal const RegexOptions CompiledRegexWhereAvailable = RegexOptions.Compiled; internal const RegexOptions CompiledRegexWhereAvailable = RegexOptions.Compiled;
#else
internal const RegexOptions CompiledRegexWhereAvailable = RegexOptions.None;
#endif #endif
internal static CultureInfo InvariantCulture internal static CultureInfo InvariantCulture
......
...@@ -46,15 +46,6 @@ using System.Runtime.CompilerServices; ...@@ -46,15 +46,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright © 2008")] [assembly: AssemblyCopyright("Copyright © 2008")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("279b643d-70e8-47ae-9eb1-500d1c48bab6")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
......
...@@ -82,7 +82,11 @@ namespace Google.ProtocolBuffers ...@@ -82,7 +82,11 @@ namespace Google.ProtocolBuffers
public static Exception CreateMissingMethod(Type type, string methodName) public static Exception CreateMissingMethod(Type type, string methodName)
{ {
return new MissingMethodException(String.Format("The method '{0}' was not found on type {1}", methodName, type)); #if CLIENTPROFILE
return new System.MissingMethodException(type.FullName, methodName);
#else
return new System.ArgumentException(String.Format("The method '{0}' was not found on type {1}.", methodName, type));
#endif
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment