[mapguide-commits] r4900 - in sandbox/maestro-2.5: Maestro MaestroBaseTests

[svn_mapguide at osgeo.org]

Author: jng
Date: 2010-05-17 20:26:06 -0400 (Mon, 17 May 2010)
New Revision: 4900

Modified:
   sandbox/maestro-2.5/Maestro/Maestro.sln
   sandbox/maestro-2.5/MaestroBaseTests/App.config
   sandbox/maestro-2.5/MaestroBaseTests/EditorTests.cs
   sandbox/maestro-2.5/MaestroBaseTests/MaestroBaseTests.csproj
Log:
 - Remove the native project until we're ready to start implementing it.
 - Change MaestroBaseTests to target framework 2.0

Modified: sandbox/maestro-2.5/Maestro/Maestro.sln
===================================================================
--- sandbox/maestro-2.5/Maestro/Maestro.sln	2010-05-18 00:13:51 UTC (rev 4899)
+++ sandbox/maestro-2.5/Maestro/Maestro.sln	2010-05-18 00:26:06 UTC (rev 4900)
@@ -23,8 +23,6 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native Impl", "Native Impl", "{FCC83861-96C6-43CA-B33B-DB1D0DEC8E79}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSGeo.MapGuide.MaestroAPI.Native-2.1.0", "..\OSGeo.MapGuide.MaestroAPI.Native-2.1.0\OSGeo.MapGuide.MaestroAPI.Native-2.1.0.csproj", "{E144AD75-50F3-4C23-8978-D5EC9A3A872F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extended Object Models", "Extended Object Models", "{81BF310C-0BBC-41F0-ADA5-B201D9769AFC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0", "..\Generated\OSGeo.MapGuide.ObjectModels.LayerDefinition-1.1.0.csproj", "{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}"
@@ -89,10 +87,6 @@
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EF1E775-444B-4E5F-87FB-D687C43A68D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E144AD75-50F3-4C23-8978-D5EC9A3A872F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E144AD75-50F3-4C23-8978-D5EC9A3A872F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E144AD75-50F3-4C23-8978-D5EC9A3A872F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E144AD75-50F3-4C23-8978-D5EC9A3A872F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -171,7 +165,6 @@
 		{CFD19053-2172-41D3-8460-0FD2123A1E88} = {CCF50F7F-DD89-41C1-843C-1BFA2375EEE0}
 		{5AD2CDBA-952E-4148-98A1-31D2E0D540D5} = {CCF50F7F-DD89-41C1-843C-1BFA2375EEE0}
 		{07588440-5F9F-4C30-AA06-9CF30BA6DDE6} = {CCF50F7F-DD89-41C1-843C-1BFA2375EEE0}
-		{E144AD75-50F3-4C23-8978-D5EC9A3A872F} = {FCC83861-96C6-43CA-B33B-DB1D0DEC8E79}
 		{B5EA049C-6AB7-4686-A2F4-4BA2EAC0E585} = {81BF310C-0BBC-41F0-ADA5-B201D9769AFC}
 		{EDDB0F74-6FE7-4969-80B0-817A629722CD} = {81BF310C-0BBC-41F0-ADA5-B201D9769AFC}
 		{AC5068F6-CFBE-4BCD-B68B-062725E424D4} = {81BF310C-0BBC-41F0-ADA5-B201D9769AFC}

Modified: sandbox/maestro-2.5/MaestroBaseTests/App.config
===================================================================
--- sandbox/maestro-2.5/MaestroBaseTests/App.config	2010-05-18 00:13:51 UTC (rev 4899)
+++ sandbox/maestro-2.5/MaestroBaseTests/App.config	2010-05-18 00:26:06 UTC (rev 4900)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
 
     <configSections>
@@ -9,8 +9,8 @@
 
     <NUnit>
         <TestRunner>
-            <add key="ApartmentState" value="STA" />
+            <add key="ApartmentState" value="STA"/>
         </TestRunner>
     </NUnit>
 
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

Modified: sandbox/maestro-2.5/MaestroBaseTests/EditorTests.cs
===================================================================
--- sandbox/maestro-2.5/MaestroBaseTests/EditorTests.cs	2010-05-18 00:13:51 UTC (rev 4899)
+++ sandbox/maestro-2.5/MaestroBaseTests/EditorTests.cs	2010-05-18 00:26:06 UTC (rev 4900)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using ICSharpCode.Core;

Modified: sandbox/maestro-2.5/MaestroBaseTests/MaestroBaseTests.csproj
===================================================================
--- sandbox/maestro-2.5/MaestroBaseTests/MaestroBaseTests.csproj	2010-05-18 00:13:51 UTC (rev 4899)
+++ sandbox/maestro-2.5/MaestroBaseTests/MaestroBaseTests.csproj	2010-05-18 00:26:06 UTC (rev 4900)
@@ -10,8 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MaestroBaseTests</RootNamespace>
     <AssemblyName>MaestroBaseTests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,9 +42,6 @@
       <HintPath>..\Thirdparty\NUnit\bin\net-2.0\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq">