Browse Source

Changes to support the Portable Library profile

csharptest 13 years ago
parent
commit
efc90f4000

+ 0 - 10
src/AddressBook/Properties/AssemblyInfo.cs

@@ -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

+ 0 - 10
src/ProtoBench/Properties/AssemblyInfo.cs

@@ -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

+ 0 - 10
src/ProtoDump/Properties/AssemblyInfo.cs

@@ -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

+ 0 - 10
src/ProtoGen.Test/Properties/AssemblyInfo.cs

@@ -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

+ 0 - 10
src/ProtoGen/Properties/AssemblyInfo.cs

@@ -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

+ 0 - 10
src/ProtoMunge/Properties/AssemblyInfo.cs

@@ -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

+ 0 - 9
src/ProtocolBuffers.Serialization/Properties/AssemblyInfo.cs

@@ -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:
 //
 //

+ 0 - 14
src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs

@@ -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;
 
 
 [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.
 
 

+ 3 - 3
src/ProtocolBuffers/FrameworkPortability.cs

@@ -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
-        internal const RegexOptions CompiledRegexWhereAvailable = RegexOptions.None;
-#else
+#if CLIENTPROFILE
         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 

+ 0 - 9
src/ProtocolBuffers/Properties/AssemblyInfo.cs

@@ -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:
 //
 //

+ 5 - 1
src/ProtocolBuffers/ThrowHelper.cs

@@ -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
         }
         }
     }
     }
 }
 }