Fixing build for SILVERLIGHT and COMPACT_FRAMEWORK before adding more build

variations (WP).  Changes are primarily superficial since they are to support
the Serialization assembly and unit tests compiling in the CF which has not
been done before.

29 files changed, 130 insertions, 39 deletions

diff --git a/src/ProtocolBuffers.Serialization/AbstractReader.cs b/src/ProtocolBuffers.Serialization/AbstractReader.cs
index 3c60139a..a46125fc 100644
--- a/src/ProtocolBuffers.Serialization/AbstractReader.cs
+++ b/src/ProtocolBuffers.Serialization/AbstractReader.cs
@@ -1,5 +1,6 @@
 using System;

 using System.Collections.Generic;

+using System.Globalization;

 using Google.ProtocolBuffers.Descriptors;

 

 //Disable CS3011: only CLS-compliant members can be abstract

@@ -697,5 +698,28 @@ namespace Google.ProtocolBuffers.Serialization
         }

 

         #endregion

+

+        internal static bool TryParseInt32(string text, out int number)

+        {

+            return TryParseInt32(text, NumberStyles.Any, CultureInfo.InvariantCulture, out number);

+        }

+

+        internal static bool TryParseInt32(string text, NumberStyles style, IFormatProvider format, out int number)

+        {

+#if COMPACT_FRAMEWORK

+                try 

+                {

+                    number = int.Parse(text, NumberStyles.Integer, CultureInfo.InvariantCulture); 

+                    return true;

+                }

+                catch 

+                {

+                    number = 0;

+                    return false; 

+                }

+#else

+                return int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out number);

+#endif

+        }

     }

 }
\ No newline at end of file
diff --git a/src/ProtocolBuffers.Serialization/AbstractTextReader.cs b/src/ProtocolBuffers.Serialization/AbstractTextReader.cs
index 8cac696c..3f8a0c05 100644
--- a/src/ProtocolBuffers.Serialization/AbstractTextReader.cs
+++ b/src/ProtocolBuffers.Serialization/AbstractTextReader.cs
@@ -163,7 +163,7 @@ namespace Google.ProtocolBuffers.Serialization
             if (ReadAsText(ref text, typeof(Enum)))

             {

                 int number;

-                if (int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out number))

+                if (TryParseInt32(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out number))

                 {

                     value = number;

                     return true;

diff --git a/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs b/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs
index 01234ea6..de8a76b4 100644
--- a/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs
+++ b/src/ProtocolBuffers.Serialization/JsonFormatWriter.cs
@@ -100,7 +100,7 @@ namespace Google.ProtocolBuffers.Serialization
 

         private class JsonStreamWriter : JsonFormatWriter

         {

-#if SILVERLIGHT || COMPACT_FRAMEWORK_35

+#if SILVERLIGHT || COMPACT_FRAMEWORK

             static readonly Encoding Encoding = new UTF8Encoding(false);

 #else

             private static readonly Encoding Encoding = Encoding.ASCII;

diff --git a/src/ProtocolBuffers.Serialization/JsonTextCursor.cs b/src/ProtocolBuffers.Serialization/JsonTextCursor.cs
index 48e84ccc..1a798809 100644
--- a/src/ProtocolBuffers.Serialization/JsonTextCursor.cs
+++ b/src/ProtocolBuffers.Serialization/JsonTextCursor.cs
@@ -322,7 +322,7 @@ namespace Google.ProtocolBuffers.Serialization
                                 string hex = new string(new char[] {ReadChar(), ReadChar(), ReadChar(), ReadChar()});

                                 int result;

                                 Assert(

-                                    int.TryParse(hex, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture,

+                                    AbstractTextReader.TryParseInt32(hex, NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture,

                                                  out result),

                                     "Expected a 4-character hex specifier.");

                                 sb.Add((char) result);

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

 

 [assembly: AssemblyVersion("2.4.1.473")]

-#if !COMPACT_FRAMEWORK_35

+#if !COMPACT_FRAMEWORK

 

 [assembly: AssemblyFileVersion("2.4.1.473")]

 #endif

diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj
index 6ac39241..b349fcfd 100644
--- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj
+++ b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj
index 0c4222d9..c2605735 100644
--- a/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj
+++ b/src/ProtocolBuffers.Serialization/ProtocolBuffersLite.Serialization.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

diff --git a/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs b/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs
index 7a956954..a2f683f7 100644
--- a/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs
+++ b/src/ProtocolBuffers.Serialization/RecursionLimitExceeded.cs
@@ -7,7 +7,7 @@ namespace Google.ProtocolBuffers.Serialization
     /// <summary>

     /// The exception raised when a recursion limit is reached while parsing input.

     /// </summary>

-#if !SILVERLIGHT

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

     [Serializable]

 #endif

     public sealed class RecursionLimitExceededException : FormatException

@@ -18,7 +18,7 @@ namespace Google.ProtocolBuffers.Serialization
         {

         }

 

-#if !SILVERLIGHT

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

         private RecursionLimitExceededException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)

             : base(info, context)

         {

diff --git a/src/ProtocolBuffers.Serialization/XmlFormatReader.cs b/src/ProtocolBuffers.Serialization/XmlFormatReader.cs
index 59d7ad4e..71ede7d2 100644
--- a/src/ProtocolBuffers.Serialization/XmlFormatReader.cs
+++ b/src/ProtocolBuffers.Serialization/XmlFormatReader.cs
@@ -269,7 +269,7 @@ namespace Google.ProtocolBuffers.Serialization
         {

             int number;

             string temp;

-            if (null != (temp = _input.GetAttribute("value")) && int.TryParse(temp, out number))

+            if (null != (temp = _input.GetAttribute("value")) && TryParseInt32(temp, out number))

             {

                 Skip();

                 value = number;

diff --git a/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs b/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs
index ce0c57c4..f6e7537c 100644
--- a/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs
+++ b/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs
@@ -196,7 +196,7 @@ namespace Google.ProtocolBuffers
                 0x9abcdef012345678UL);

         }

 

-#if !SILVERLIGHT

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

         [TestMethod]

         public void WriteWholeMessage()

         {

diff --git a/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs b/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
index 9c0afe46..c2eaadf6 100644
--- a/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
+++ b/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs
@@ -19,14 +19,15 @@ namespace Google.ProtocolBuffers.Compatibility
             TextFormat.Merge(new StringReader((string)message), registry, (IBuilder)builder);

             return builder;

         }

-

-        [TestMethod, System.ComponentModel.Description("This test can take a very long time to run.")]

+        //This test can take a very long time to run.

+        [TestMethod]

         public override void RoundTripMessage2OptimizeSize()

         {

             //base.RoundTripMessage2OptimizeSize();

         }

 

-        [TestMethod, System.ComponentModel.Description("This test can take a very long time to run.")]

+        //This test can take a very long time to run.

+        [TestMethod]

         public override void RoundTripMessage2OptimizeSpeed()

         {

             //base.RoundTripMessage2OptimizeSpeed();

diff --git a/src/ProtocolBuffers.Test/IssuesTest.cs b/src/ProtocolBuffers.Test/IssuesTest.cs
index 7096a52d..a80021c5 100644
--- a/src/ProtocolBuffers.Test/IssuesTest.cs
+++ b/src/ProtocolBuffers.Test/IssuesTest.cs
@@ -34,26 +34,32 @@
 

 #endregion

 

+

+using System;

+using System.Collections.Generic;

+using Google.ProtocolBuffers.Collections;

 using Google.ProtocolBuffers.Descriptors;

-using NUnit.Framework;

+using Google.ProtocolBuffers.TestProtos;

+using Microsoft.VisualStudio.TestTools.UnitTesting;

 using UnitTest.Issues.TestProtos;

 

+

 namespace Google.ProtocolBuffers

 {

     /// <summary>

     /// Tests for issues which aren't easily compartmentalized into other unit tests.

     /// </summary>

-    [TestFixture]

+    [TestClass]

     public class IssuesTest

     {

         // Issue 45

-        [Test]

+        [TestMethod]

         public void FieldCalledItem()

         {

             ItemField message = new ItemField.Builder { Item = 3 }.Build();

             FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");

             Assert.IsNotNull(field);

-            Assert.AreEqual(3, message[field]);

+            Assert.AreEqual(3, (int)message[field]);

         }

     }

 }

diff --git a/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs b/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
index 7b9c24d1..676b565f 100644
--- a/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
+++ b/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs
@@ -38,7 +38,11 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("2.4.1.473")]

 

 [assembly: AssemblyVersion("2.4.1.473")]

+#if !COMPACT_FRAMEWORK

 [assembly: AssemblyFileVersion("2.4.1.473")]

+

+#endif

+

 // We don't really need CLSCompliance, but if the assembly builds with no warnings,

 // that means the generator is okay.

 

diff --git a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
index 07ccf81e..3ef8a946 100644
--- a/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
+++ b/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

@@ -58,14 +59,25 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="mscorlib" />

+    <Reference Include="System" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFrameworkClass)' == 'CLIENTPROFILE' ">

     <Reference Include="nunit.framework">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\lib\NUnit\lib\nunit.framework.dll</HintPath>

     </Reference>

-    <Reference Include="mscorlib" />

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFrameworkClass)' != 'CLIENTPROFILE' ">

+    <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="..\..\lib\NUnit-config\Microsoft.VisualStudio.TestTools.cs">

@@ -83,6 +95,7 @@
     <Compile Include="Compatibility\TestResources.cs" />

     <Compile Include="Compatibility\TextCompatibilityTests.cs" />

     <Compile Include="Compatibility\XmlCompatibilityTests.cs" />

+    <Compile Include="SerializableAttribute.cs" />

     <Compile Include="TestProtos\UnitTestExtrasProtoFile.cs" />

     <Compile Include="TestRpcForMimeTypes.cs" />

     <Compile Include="TestReaderForUrlEncoded.cs" />

diff --git a/src/ProtocolBuffers.Test/ReusableBuilderTest.cs b/src/ProtocolBuffers.Test/ReusableBuilderTest.cs
index 93129b2f..a63f6575 100644
--- a/src/ProtocolBuffers.Test/ReusableBuilderTest.cs
+++ b/src/ProtocolBuffers.Test/ReusableBuilderTest.cs
@@ -13,7 +13,8 @@ namespace Google.ProtocolBuffers
     [TestClass]

     public class ReusableBuilderTest

     {

-        [TestMethod, System.ComponentModel.Description("Issue 28: Circular message dependencies result in null defaults for DefaultInstance")]

+        //Issue 28: Circular message dependencies result in null defaults for DefaultInstance

+        [TestMethod]

         public void EnsureStaticCicularReference()

         {

             MyMessageAReferenceB ab = MyMessageAReferenceB.DefaultInstance;

diff --git a/src/ProtocolBuffers.Test/SerializableTest.cs b/src/ProtocolBuffers.Test/SerializableTest.cs
index edf6ce49..b55358ef 100644
--- a/src/ProtocolBuffers.Test/SerializableTest.cs
+++ b/src/ProtocolBuffers.Test/SerializableTest.cs
@@ -1,4 +1,5 @@
-using System;

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

+using System;

 using System.Collections.Generic;

 using System.IO;

 using System.Runtime.Serialization;

@@ -175,3 +176,4 @@ namespace Google.ProtocolBuffers
         }

     }

 }

+#endif
\ No newline at end of file
diff --git a/src/ProtocolBuffers.Test/TestUtil.cs b/src/ProtocolBuffers.Test/TestUtil.cs
index dd1c981d..12d73d16 100644
--- a/src/ProtocolBuffers.Test/TestUtil.cs
+++ b/src/ProtocolBuffers.Test/TestUtil.cs
@@ -49,12 +49,11 @@ using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

 #endif

 

-

 namespace Google.ProtocolBuffers

 {

     internal static class TestUtil

     {

-#if !SILVERLIGHT

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

         private static string testDataDirectory;

 

         internal static string TestDataDirectory

@@ -1769,6 +1768,9 @@ namespace Google.ProtocolBuffers
 

         public static void TestInMultipleCultures(CultureAction test)

         {

+#if COMPACT_FRAMEWORK

+            test();

+#else

             CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;

             foreach (string culture in TestCultures)

             {

@@ -1782,6 +1784,7 @@ namespace Google.ProtocolBuffers
                     Thread.CurrentThread.CurrentCulture = originalCulture;

                 }

             }

+#endif

         }

 

         /// <summary>

diff --git a/src/ProtocolBuffers.Test/TextFormatTest.cs b/src/ProtocolBuffers.Test/TextFormatTest.cs
index 299b2650..10ab4e15 100644
--- a/src/ProtocolBuffers.Test/TextFormatTest.cs
+++ b/src/ProtocolBuffers.Test/TextFormatTest.cs
@@ -41,6 +41,7 @@ using Google.ProtocolBuffers.TestProtos;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

 using System.Globalization;

 using System.Threading;

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

 

 namespace Google.ProtocolBuffers

 {

@@ -175,7 +176,10 @@ namespace Google.ProtocolBuffers
         /// </summary>

         private static ByteString Bytes(string str)

         {

-            return ByteString.CopyFrom(Encoding.GetEncoding(28591).GetBytes(str));

+            byte[] bytes = new byte[str.Length];

+            for (int i = 0; i < bytes.Length; i++)

+                bytes[i] = (byte)str[i];

+            return ByteString.CopyFrom(bytes);

         }

 

         [TestMethod]

@@ -568,4 +572,5 @@ namespace Google.ProtocolBuffers
             Assert.AreEqual(longText, builder.OptionalString);

         }

     }

-}
\ No newline at end of file
+}

+#endif
\ No newline at end of file
diff --git a/src/ProtocolBuffers/CodedInputStream.cs b/src/ProtocolBuffers/CodedInputStream.cs
index be88d154..230c585c 100644
--- a/src/ProtocolBuffers/CodedInputStream.cs
+++ b/src/ProtocolBuffers/CodedInputStream.cs
@@ -231,7 +231,7 @@ namespace Google.ProtocolBuffers
         /// </summary>

         public bool ReadDouble(ref double value)

         {

-#if SILVERLIGHT || COMPACT_FRAMEWORK_35

+#if SILVERLIGHT || COMPACT_FRAMEWORK

             if (BitConverter.IsLittleEndian && 8 <= bufferSize - bufferPos)

             {

                 value = BitConverter.ToDouble(buffer, bufferPos);

diff --git a/src/ProtocolBuffers/CodedOutputStream.cs b/src/ProtocolBuffers/CodedOutputStream.cs
index 889ade7f..f4d637c1 100644
--- a/src/ProtocolBuffers/CodedOutputStream.cs
+++ b/src/ProtocolBuffers/CodedOutputStream.cs
@@ -496,7 +496,7 @@ namespace Google.ProtocolBuffers
         /// </summary>

         public void WriteDoubleNoTag(double value)

         {

-#if SILVERLIGHT || COMPACT_FRAMEWORK_35

+#if SILVERLIGHT || COMPACT_FRAMEWORK

             byte[] rawBytes = BitConverter.GetBytes(value);

             if (!BitConverter.IsLittleEndian) 

                 ByteArray.Reverse(rawBytes);

diff --git a/src/ProtocolBuffers/CustomSerialization.cs b/src/ProtocolBuffers/CustomSerialization.cs
index 6b7a38eb..22d87379 100644
--- a/src/ProtocolBuffers/CustomSerialization.cs
+++ b/src/ProtocolBuffers/CustomSerialization.cs
@@ -40,7 +40,7 @@ using System.Runtime.Serialization;
 /*

  * This entire source file is not supported on the Silverlight platform

  */

-#if !SILVERLIGHT

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

 namespace Google.ProtocolBuffers

 {

     /* 

diff --git a/src/ProtocolBuffers/EnumLite.cs b/src/ProtocolBuffers/EnumLite.cs
index a6a25f4e..450ecb77 100644
--- a/src/ProtocolBuffers/EnumLite.cs
+++ b/src/ProtocolBuffers/EnumLite.cs
@@ -98,7 +98,7 @@ namespace Google.ProtocolBuffers
         public EnumLiteMap()

         {

             items = new SortedList<int, IEnumLite>();

-#if SILVERLIGHT

+#if SILVERLIGHT || COMPACT_FRAMEWORK

     // Silverlight doesn't support Enum.GetValues

     // TODO(jonskeet): Validate that this reflection is permitted, e.g. in Windows Phone 7

             foreach (System.Reflection.FieldInfo fi in typeof(TEnum).GetFields(System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public))

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

 

 [assembly: AssemblyVersion("2.4.1.473")]

-#if !COMPACT_FRAMEWORK_35

+#if !COMPACT_FRAMEWORK

 

 [assembly: AssemblyFileVersion("2.4.1.473")]

 #endif

diff --git a/src/ProtocolBuffers/ProtocolBuffers.csproj b/src/ProtocolBuffers/ProtocolBuffers.csproj
index e473f8b5..bc7211ed 100644
--- a/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.csproj
index 4773c5ad..645112ce 100644
--- a/src/ProtocolBuffers/ProtocolBuffersLite.csproj
+++ b/src/ProtocolBuffers/ProtocolBuffersLite.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

diff --git a/src/ProtocolBuffers/ThrowHelper.cs b/src/ProtocolBuffers/ThrowHelper.cs
index f04a7f16..22584dd0 100644
--- a/src/ProtocolBuffers/ThrowHelper.cs
+++ b/src/ProtocolBuffers/ThrowHelper.cs
@@ -82,7 +82,7 @@ namespace Google.ProtocolBuffers
 

         public static Exception CreateMissingMethod(Type type, string methodName)

         {

-#if SILVERLIGHT

+#if SILVERLIGHT || COMPACT_FRAMEWORK

             return new MissingMethodException(String.Format("The method '{0}' was not found on type {1}", methodName, type));

 #else

             return new MissingMethodException(String.Format("{0}", type), methodName);

diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj
index 0adb9135..55cf43b7 100644
--- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj
+++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

@@ -39,14 +40,25 @@
     <NoStdLib>true</NoStdLib>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="mscorlib" />

+    <Reference Include="System" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFrameworkClass)' == 'CLIENTPROFILE' ">

     <Reference Include="nunit.framework">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\lib\NUnit\lib\nunit.framework.dll</HintPath>

     </Reference>

-    <Reference Include="mscorlib" />

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFrameworkClass)' != 'CLIENTPROFILE' ">

+    <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="..\..\lib\NUnit-config\Microsoft.VisualStudio.TestTools.cs">

@@ -66,6 +78,7 @@
     <Compile Include="ExtendableBuilderLiteTest.cs" />

     <Compile Include="ExtendableMessageLiteTest.cs" />

     <Compile Include="LiteTest.cs" />

+    <Compile Include="SerializableAttribute.cs" />

     <Compile Include="SerializableLiteTest.cs" />

     <Compile Include="TestLiteByApi.cs" />

     <Compile Include="TestProtos\UnitTestExtrasLiteProtoFile.cs" />

diff --git a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj
index e516198a..42f18c32 100644
--- a/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj
+++ b/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

+    <TargetFrameworkClass>CLIENTPROFILE</TargetFrameworkClass>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

@@ -39,14 +40,25 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

+    <Reference Include="mscorlib" />

+    <Reference Include="System" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFrameworkClass)' == 'CLIENTPROFILE' ">

     <Reference Include="nunit.framework">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\lib\NUnit\lib\nunit.framework.dll</HintPath>

     </Reference>

-    <Reference Include="mscorlib" />

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFrameworkClass)' != 'CLIENTPROFILE' ">

+    <Reference Include="Microsoft.Silverlight.Testing, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll</HintPath>

+    </Reference>

+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>

+    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="..\..\lib\NUnit-config\Microsoft.VisualStudio.TestTools.cs">

@@ -62,6 +74,7 @@
     <Compile Include="InteropLiteTest.cs" />

     <Compile Include="LiteTest.cs" />

     <Compile Include="MissingFieldAndExtensionTest.cs" />

+    <Compile Include="SerializableAttribute.cs" />

     <Compile Include="TestLiteByApi.cs" />

     <Compile Include="TestProtos\UnitTestExtrasFullProtoFile.cs" />

     <Compile Include="TestProtos\UnitTestExtrasLiteProtoFile.cs" />

diff --git a/src/ProtocolBuffersLite.Test/SerializableLiteTest.cs b/src/ProtocolBuffersLite.Test/SerializableLiteTest.cs
index a688a909..5049f30a 100644
--- a/src/ProtocolBuffersLite.Test/SerializableLiteTest.cs
+++ b/src/ProtocolBuffersLite.Test/SerializableLiteTest.cs
@@ -1,4 +1,5 @@
 using System;

+#if !SILVERLIGHT && !COMPACT_FRAMEWORK

 using System.Collections.Generic;

 using System.IO;

 using System.Runtime.Serialization;

@@ -51,3 +52,4 @@ namespace Google.ProtocolBuffers
         }

     }

 }

+#endif
\ No newline at end of file