diff --git a/Src/Newtonsoft.Json.Tests.Silverlight/lib/nunit.framework.dll b/Src/Lib/nunit.framework.silverlight.dll similarity index 100% rename from Src/Newtonsoft.Json.Tests.Silverlight/lib/nunit.framework.dll rename to Src/Lib/nunit.framework.silverlight.dll diff --git a/Src/Newtonsoft.Json.Silverlight.sln b/Src/Newtonsoft.Json.Silverlight.sln new file mode 100644 index 00000000..d207d673 --- /dev/null +++ b/Src/Newtonsoft.Json.Silverlight.sln @@ -0,0 +1,8 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Global + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Src/Newtonsoft.Json.Silverlight/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Silverlight/Properties/AssemblyInfo.cs deleted file mode 100644 index 4de3b9e1..00000000 --- a/Src/Newtonsoft.Json.Silverlight/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Newtonsoft.Json.Silverlight")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Newtonsoft.Json.Silverlight")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: InternalsVisibleTo("Newtonsoft.Json.Tests.Silverlight")] - -// 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("662ae5be-35c7-474d-8947-45dbd63b76dc")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/Newtonsoft.Json.Tests.Silverlight/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests.Silverlight/Properties/AssemblyInfo.cs deleted file mode 100644 index 597881f1..00000000 --- a/Src/Newtonsoft.Json.Tests.Silverlight/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Newtonsoft.Json.Tests.Silverlight")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Newtonsoft.Json.Tests.Silverlight")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[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("d4f36ccb-cde3-463c-9ef9-314f1e517610")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/Newtonsoft.Json.Tests.Silverlight/SilverlightTests.cs b/Src/Newtonsoft.Json.Tests.Silverlight/SilverlightTests.cs deleted file mode 100644 index a0b7e3bb..00000000 --- a/Src/Newtonsoft.Json.Tests.Silverlight/SilverlightTests.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Reflection; -using NUnit.Framework; - -namespace SilverlightNUnitProject2 -{ - [TestFixture] - public class SilverlightTests - { - [Test] - public void SystemVersion() - { - Assembly systemAssembly = typeof(Uri).Assembly; - StringAssert.Contains("=2.0.5.0,", systemAssembly.FullName, - "Check we're testing a Silverlight 2.0 assembly"); - } - } -} diff --git a/Src/Newtonsoft.Json.Tests.Silverlight/readme.txt b/Src/Newtonsoft.Json.Tests.Silverlight/readme.txt deleted file mode 100644 index 147624d3..00000000 --- a/Src/Newtonsoft.Json.Tests.Silverlight/readme.txt +++ /dev/null @@ -1,22 +0,0 @@ - -Silverlight NUnit Project Template -================================== - -NOTE: New references must be marked with... Copy Local: True. - -This project template is designed to work with TestDriven.Net 2.13 or greater. -http://www.testdriven.net/download.aspx - -To execute one or more unit tests use the 'Run Test(s)', 'Test With > Debugger' -or 'Test With > Coverage' commands. Tests will execute using the Silverlight -assemblies, but using the .NET 2.0 runtime. - -Individual methods can be executed using the Silverlight 2.0/CoreCLR runtime -using the 'Test With > silverlight' command. - -For more information see: -http://www.testdriven.net -http://weblogs.asp.net/nunitaddon - -Alternatively you can email: -Jamie Cansdale diff --git a/Src/Newtonsoft.Json.Tests.Silverlight/Newtonsoft.Json.Tests.Silverlight.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj similarity index 80% rename from Src/Newtonsoft.Json.Tests.Silverlight/Newtonsoft.Json.Tests.Silverlight.csproj rename to Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj index 14e1bf35..6eefeae7 100644 --- a/Src/Newtonsoft.Json.Tests.Silverlight/Newtonsoft.Json.Tests.Silverlight.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {0D8C3C2E-62C6-4C93-9377-6F74DD6BFD93} {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} @@ -35,7 +35,10 @@ 4 - + + False + ..\Lib\nunit.framework.silverlight.dll + True @@ -111,12 +114,24 @@ TestFixtureBase.cs - + + + + + + + + + + + + + + + + - - - - + diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 20cb4f50..4999ec2d 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -5,12 +5,18 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Newtonsoft Json.NET Test")] + +#if !SILVERLIGHT +[assembly: AssemblyTitle("Newtonsoft Json.NET Tests")] +#else +[assembly: AssemblyTitle("Newtonsoft Json.NET Tests Silverlight")] +#endif + [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Newtonsoft")] [assembly: AssemblyProduct("Newtonsoft Json.NET Test")] -[assembly: AssemblyCopyright("Copyright © Newtonsoft 2006")] +[assembly: AssemblyCopyright("Copyright © Newtonsoft 2008")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +37,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] diff --git a/Src/Newtonsoft.Json.sln b/Src/Newtonsoft.Json.sln index 600a2c9b..49e3a00f 100644 --- a/Src/Newtonsoft.Json.sln +++ b/Src/Newtonsoft.Json.sln @@ -22,10 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{8F9E13D9-418 Doc\styles.css = Doc\styles.css EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Silverlight", "Newtonsoft.Json.Silverlight\Newtonsoft.Json.Silverlight.csproj", "{DC3C6F3D-2CA1-4278-9B79-63770FB3EA2D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Tests.Silverlight", "Newtonsoft.Json.Tests.Silverlight\Newtonsoft.Json.Tests.Silverlight.csproj", "{0D8C3C2E-62C6-4C93-9377-6F74DD6BFD93}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -40,14 +36,6 @@ Global {3E6E2335-B079-4B5B-A65A-9D586914BCBB}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E6E2335-B079-4B5B-A65A-9D586914BCBB}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E6E2335-B079-4B5B-A65A-9D586914BCBB}.Release|Any CPU.Build.0 = Release|Any CPU - {DC3C6F3D-2CA1-4278-9B79-63770FB3EA2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC3C6F3D-2CA1-4278-9B79-63770FB3EA2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC3C6F3D-2CA1-4278-9B79-63770FB3EA2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC3C6F3D-2CA1-4278-9B79-63770FB3EA2D}.Release|Any CPU.Build.0 = Release|Any CPU - {0D8C3C2E-62C6-4C93-9377-6F74DD6BFD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D8C3C2E-62C6-4C93-9377-6F74DD6BFD93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D8C3C2E-62C6-4C93-9377-6F74DD6BFD93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D8C3C2E-62C6-4C93-9377-6F74DD6BFD93}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Src/Newtonsoft.Json.Silverlight/Newtonsoft.Json.Silverlight.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj similarity index 77% rename from Src/Newtonsoft.Json.Silverlight/Newtonsoft.Json.Silverlight.csproj rename to Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj index 3f45c100..cc214771 100644 --- a/Src/Newtonsoft.Json.Silverlight/Newtonsoft.Json.Silverlight.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {DC3C6F3D-2CA1-4278-9B79-63770FB3EA2D} {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} @@ -211,7 +211,60 @@ Utilities\ValidationUtils.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +