moved tests, fixed dependencies

--HG-- branch : dev
ekonbenefits · Aug 11, 2011 · 76ce3a0 · 76ce3a0
1 parent b7530ab
commit 76ce3a0
Show file tree

Hide file tree

Showing 49 changed files with 120 additions and 105 deletions.
diff --git a/ImpromptuInterface.sln b/ImpromptuInterface.sln
diff --git a/...promptu.FSharp.Silverlight/FakeUnquote.fs → ...promptu.FSharp.Silverlight/FakeUnquote.fs b/...promptu.FSharp.Silverlight/FakeUnquote.fs → ...promptu.FSharp.Silverlight/FakeUnquote.fs
diff --git a/...itTestImpromptu.FSharp.Silverlight.fsproj → ...itTestImpromptu.FSharp.Silverlight.fsproj b/...itTestImpromptu.FSharp.Silverlight.fsproj → ...itTestImpromptu.FSharp.Silverlight.fsproj
@@ -47,17 +47,26 @@
     <Compile Include="..\UnitTestImpromptuInterface.FSharp\Basic.fs">
       <Link>Basic.fs</Link>
     </Compile>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Castle.Core">
+      <HintPath>..\..\packages\Moq.4.0.10827\lib\Silverlight4\Castle.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp">
-      <HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\Microsoft.CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\Microsoft.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Silverlight.Testing">
       <HintPath>..\tools\Silverlight4-NUnit2.5.8-Apr2010\Microsoft.Silverlight.Testing.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight">
       <HintPath>..\tools\Silverlight4-NUnit2.5.8-Apr2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
     </Reference>
+    <Reference Include="Moq.Silverlight">
+      <HintPath>..\..\packages\Moq.4.0.10827\lib\Silverlight4\Moq.Silverlight.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core">
       <HintPath>$(ProgramFiles)\Microsoft F#\Silverlight\Libraries\Client\$(SilverlightVersion)\FSharp.Core.dll</HintPath>
@@ -75,20 +84,17 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net" />
     <Reference Include="System.Numerics">
-      <HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Numerics.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Numerics.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Browser" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\ImpromptuInterface.FSharp.Silverlight\ImpromptuInterface.FSharp %28Silverlight%29.fsproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.FSharp.Silverlight\ImpromptuInterface.FSharp %28Silverlight%29.fsproj">
       <Name>ImpromptuInterface.FSharp (Silverlight)</Name>
       <Project>{c6f699c3-c2c7-4393-b8c2-b5c234ed23d7}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
       <Name>ImpromptuInterface (Silverlight)</Name>
       <Project>{9181a92f-9a17-45a3-bbdb-eac085a901a0}</Project>
       <Private>True</Private>
@@ -98,6 +104,9 @@
       <Project>{ee860cf5-6707-42f2-8091-3d4dc3ed1d30}</Project>
       <Private>True</Private>
     </ProjectReference>
+    <Reference Include="System.Xml.Linq">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Silverlight\v4.0\Libraries\Client\System.Xml.Linq.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 	     Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Tests/UnitTestImpromptu.FSharp.Silverlight/packages.config b/Tests/UnitTestImpromptu.FSharp.Silverlight/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.0.10827" />
+</packages>
diff --git a/UnitTestImpromptuInterface.FSharp/Basic.fs → ...nitTestImpromptuInterface.FSharp/Basic.fs b/UnitTestImpromptuInterface.FSharp/Basic.fs → ...nitTestImpromptuInterface.FSharp/Basic.fs
diff --git a/.../UnitTestImpromptuInterface.FSharp.fsproj → .../UnitTestImpromptuInterface.FSharp.fsproj b/.../UnitTestImpromptuInterface.FSharp.fsproj → .../UnitTestImpromptuInterface.FSharp.fsproj
@@ -66,12 +66,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.FSharp\ImpromptuInterface.FSharp.fsproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.FSharp\ImpromptuInterface.FSharp.fsproj">
       <Name>ImpromptuInterface.FSharp</Name>
       <Project>{d4d82191-1f83-43fb-8309-83637d8d11e8}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Name>ImpromptuInterface</Name>
       <Project>{dab7c056-660a-4153-8ff2-b80a41310ad7}</Project>
       <Private>True</Private>

diff --git a/...ImpromptuInterface.FSharp/packages.config → ...ImpromptuInterface.FSharp/packages.config b/...ImpromptuInterface.FSharp/packages.config → ...ImpromptuInterface.FSharp/packages.config
diff --git a/...omptuInterface.SelfRunner/AssemblyInfo.cs → ...omptuInterface.SelfRunner/AssemblyInfo.cs b/...omptuInterface.SelfRunner/AssemblyInfo.cs → ...omptuInterface.SelfRunner/AssemblyInfo.cs
diff --git a/...ptuInterface.SelfRunner/Support/Helper.cs → ...ptuInterface.SelfRunner/Support/Helper.cs b/...ptuInterface.SelfRunner/Support/Helper.cs → ...ptuInterface.SelfRunner/Support/Helper.cs
diff --git a/...tuInterface.SelfRunner/Support/Program.cs → ...tuInterface.SelfRunner/Support/Program.cs b/...tuInterface.SelfRunner/Support/Program.cs → ...tuInterface.SelfRunner/Support/Program.cs
diff --git a/...tTestImpromptuInterface.SelfRunner.csproj → ...tTestImpromptuInterface.SelfRunner.csproj b/...tTestImpromptuInterface.SelfRunner.csproj → ...tTestImpromptuInterface.SelfRunner.csproj
@@ -90,7 +90,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Project>{DAB7C056-660A-4153-8FF2-B80A41310AD7}</Project>
       <Name>ImpromptuInterface</Name>
     </ProjectReference>

diff --git a/...omptuInterface.SelfRunner/packages.config → ...omptuInterface.SelfRunner/packages.config b/...omptuInterface.SelfRunner/packages.config → ...omptuInterface.SelfRunner/packages.config
diff --git a/UnitTestImpromptuInterface.VBNet/Basic.vb → ...UnitTestImpromptuInterface.VBNet/Basic.vb b/UnitTestImpromptuInterface.VBNet/Basic.vb → ...UnitTestImpromptuInterface.VBNet/Basic.vb
diff --git a/UnitTestImpromptuInterface.VBNet/ClayTest.vb → ...tTestImpromptuInterface.VBNet/ClayTest.vb b/UnitTestImpromptuInterface.VBNet/ClayTest.vb → ...tTestImpromptuInterface.VBNet/ClayTest.vb
diff --git a/UnitTestImpromptuInterface.VBNet/Generics.vb → ...tTestImpromptuInterface.VBNet/Generics.vb b/UnitTestImpromptuInterface.VBNet/Generics.vb → ...tTestImpromptuInterface.VBNet/Generics.vb
diff --git a/...romptuInterface.VBNet/ImpromptuDynamic.vb → ...romptuInterface.VBNet/ImpromptuDynamic.vb b/...romptuInterface.VBNet/ImpromptuDynamic.vb → ...romptuInterface.VBNet/ImpromptuDynamic.vb
diff --git a/UnitTestImpromptuInterface.VBNet/MVVM.vb → .../UnitTestImpromptuInterface.VBNet/MVVM.vb b/UnitTestImpromptuInterface.VBNet/MVVM.vb → .../UnitTestImpromptuInterface.VBNet/MVVM.vb
diff --git a/...stImpromptuInterface.VBNet/PrivateTest.vb → ...stImpromptuInterface.VBNet/PrivateTest.vb b/...stImpromptuInterface.VBNet/PrivateTest.vb → ...stImpromptuInterface.VBNet/PrivateTest.vb
diff --git a/...ImpromptuInterface.VBNet/Serialization.vb → ...ImpromptuInterface.VBNet/Serialization.vb b/...ImpromptuInterface.VBNet/Serialization.vb → ...ImpromptuInterface.VBNet/Serialization.vb
diff --git a/...mptuInterface.VBNet/SingleMethodInvoke.vb → ...mptuInterface.VBNet/SingleMethodInvoke.vb b/...mptuInterface.VBNet/SingleMethodInvoke.vb → ...mptuInterface.VBNet/SingleMethodInvoke.vb
diff --git a/...tuInterface.VBNet/Support/FixtureSetup.vb → ...tuInterface.VBNet/Support/FixtureSetup.vb b/...tuInterface.VBNet/Support/FixtureSetup.vb → ...tuInterface.VBNet/Support/FixtureSetup.vb
diff --git a/...mpromptuInterface.VBNet/Support/Helper.vb → ...mpromptuInterface.VBNet/Support/Helper.vb b/...mpromptuInterface.VBNet/Support/Helper.vb → ...mpromptuInterface.VBNet/Support/Helper.vb
diff --git a/...rface.VBNet/Support/SupportDefinitions.vb → ...rface.VBNet/Support/SupportDefinitions.vb b/...rface.VBNet/Support/SupportDefinitions.vb → ...rface.VBNet/Support/SupportDefinitions.vb
diff --git a/...t/UnitTestImpromptuInterface.VBNET.vbproj → ...t/UnitTestImpromptuInterface.VBNET.vbproj b/...t/UnitTestImpromptuInterface.VBNET.vbproj → ...t/UnitTestImpromptuInterface.VBNET.vbproj
@@ -96,11 +96,11 @@
     <Compile Include="Support\FixtureSetup.vb" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
       <Project>{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}</Project>
       <Name>ImpromptuInterface.MVVM</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Project>{DAB7C056-660A-4153-8FF2-B80A41310AD7}</Project>
       <Name>ImpromptuInterface</Name>
     </ProjectReference>

diff --git a/...tImpromptuInterface.VBNet/packages.config → ...tImpromptuInterface.VBNet/packages.config b/...tImpromptuInterface.VBNet/packages.config → ...tImpromptuInterface.VBNet/packages.config
diff --git a/UnitTestImpromptuInterface/Basic.cs → Tests/UnitTestImpromptuInterface/Basic.cs b/UnitTestImpromptuInterface/Basic.cs → Tests/UnitTestImpromptuInterface/Basic.cs
diff --git a/UnitTestImpromptuInterface/ClayTest.cs → Tests/UnitTestImpromptuInterface/ClayTest.cs b/UnitTestImpromptuInterface/ClayTest.cs → Tests/UnitTestImpromptuInterface/ClayTest.cs
diff --git a/UnitTestImpromptuInterface/Curry.cs → Tests/UnitTestImpromptuInterface/Curry.cs b/UnitTestImpromptuInterface/Curry.cs → Tests/UnitTestImpromptuInterface/Curry.cs
diff --git a/UnitTestImpromptuInterface/Generics.cs → Tests/UnitTestImpromptuInterface/Generics.cs b/UnitTestImpromptuInterface/Generics.cs → Tests/UnitTestImpromptuInterface/Generics.cs
diff --git a/...estImpromptuInterface/ImpromptuDynamic.cs → ...estImpromptuInterface/ImpromptuDynamic.cs b/...estImpromptuInterface/ImpromptuDynamic.cs → ...estImpromptuInterface/ImpromptuDynamic.cs
diff --git a/UnitTestImpromptuInterface/MVVM.cs → Tests/UnitTestImpromptuInterface/MVVM.cs b/UnitTestImpromptuInterface/MVVM.cs → Tests/UnitTestImpromptuInterface/MVVM.cs
diff --git a/UnitTestImpromptuInterface/PrivateTest.cs → ...UnitTestImpromptuInterface/PrivateTest.cs b/UnitTestImpromptuInterface/PrivateTest.cs → ...UnitTestImpromptuInterface/PrivateTest.cs
diff --git a/UnitTestImpromptuInterface/Serialization.cs → ...itTestImpromptuInterface/Serialization.cs b/UnitTestImpromptuInterface/Serialization.cs → ...itTestImpromptuInterface/Serialization.cs
diff --git a/...tImpromptuInterface/SingleMethodInvoke.cs → ...tImpromptuInterface/SingleMethodInvoke.cs b/...tImpromptuInterface/SingleMethodInvoke.cs → ...tImpromptuInterface/SingleMethodInvoke.cs
diff --git a/UnitTestImpromptuInterface/SpeedTest.cs → ...s/UnitTestImpromptuInterface/SpeedTest.cs b/UnitTestImpromptuInterface/SpeedTest.cs → ...s/UnitTestImpromptuInterface/SpeedTest.cs
diff --git a/...mpromptuInterface/Support/FixtureSetup.cs → ...mpromptuInterface/Support/FixtureSetup.cs b/...mpromptuInterface/Support/FixtureSetup.cs → ...mpromptuInterface/Support/FixtureSetup.cs
diff --git a/UnitTestImpromptuInterface/Support/Helper.cs → ...tTestImpromptuInterface/Support/Helper.cs b/UnitTestImpromptuInterface/Support/Helper.cs → ...tTestImpromptuInterface/Support/Helper.cs
diff --git a/...tuInterface/Support/SupportDefinitions.cs → ...tuInterface/Support/SupportDefinitions.cs b/...tuInterface/Support/SupportDefinitions.cs → ...tuInterface/Support/SupportDefinitions.cs
diff --git a/...terface/UnitTestImpromptuInterface.csproj → ...terface/UnitTestImpromptuInterface.csproj b/...terface/UnitTestImpromptuInterface.csproj → ...terface/UnitTestImpromptuInterface.csproj
@@ -94,11 +94,11 @@
     <Compile Include="SingleMethodInvoke.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.MVVM\ImpromptuInterface.MVVM.csproj">
       <Project>{D6AFD960-23A5-4EB0-9EEE-33AEC422B1CB}</Project>
       <Name>ImpromptuInterface.MVVM</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface\ImpromptuInterface.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface\ImpromptuInterface.csproj">
       <Project>{DAB7C056-660A-4153-8FF2-B80A41310AD7}</Project>
       <Name>ImpromptuInterface</Name>
     </ProjectReference>

diff --git a/UnitTestImpromptuInterface/packages.config → ...nitTestImpromptuInterface/packages.config b/UnitTestImpromptuInterface/packages.config → ...nitTestImpromptuInterface/packages.config
diff --git a/...ce.Silverlight/Properties/AssemblyInfo.cs → ...ce.Silverlight/Properties/AssemblyInfo.cs b/...ce.Silverlight/Properties/AssemblyInfo.cs → ...ce.Silverlight/Properties/AssemblyInfo.cs
diff --git a/...utInterface.Silverlight/Support/Helper.cs → ...utInterface.Silverlight/Support/Helper.cs b/...utInterface.Silverlight/Support/Helper.cs → ...utInterface.Silverlight/Support/Helper.cs
diff --git a/...TestImpromptuInterface.Silverlight.csproj → ...TestImpromptuInterface.Silverlight.csproj b/...TestImpromptuInterface.Silverlight.csproj → ...TestImpromptuInterface.Silverlight.csproj
@@ -87,7 +87,9 @@
       <HintPath>..\tools\Silverlight4-NUnit2.5.8-Apr2010\NUnit.Silverlight.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Net" />
     <Reference Include="System.Windows.Browser" />
@@ -148,11 +150,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ImpromptuInterface.MVVM.Silverlight\ImpromptuInterface.MVVM %28Silverlight%29.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.MVVM.Silverlight\ImpromptuInterface.MVVM %28Silverlight%29.csproj">
       <Project>{56215C8D-85AE-4FCB-BD33-89E6ABBA407B}</Project>
       <Name>ImpromptuInterface.MVVM %28Silverlight%29</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
+    <ProjectReference Include="..\..\ImpromptuInterface.Silverlight\ImpromptuInterface %28Silverlight%29.csproj">
       <Project>{9181A92F-9A17-45A3-BBDB-EAC085A901A0}</Project>
       <Name>ImpromptuInterface %28Silverlight%29</Name>
     </ProjectReference>

diff --git a/...ry.Silverlight/Properties/AssemblyInfo.cs → ...ry.Silverlight/Properties/AssemblyInfo.cs b/...ry.Silverlight/Properties/AssemblyInfo.cs → ...ry.Silverlight/Properties/AssemblyInfo.cs
diff --git a/...UnitTestSupportLibrary.Silverlight.csproj → ...UnitTestSupportLibrary.Silverlight.csproj b/...UnitTestSupportLibrary.Silverlight.csproj → ...UnitTestSupportLibrary.Silverlight.csproj
diff --git a/UnitTestSupportLibrary/ExampleOp.cs → Tests/UnitTestSupportLibrary/ExampleOp.cs b/UnitTestSupportLibrary/ExampleOp.cs → Tests/UnitTestSupportLibrary/ExampleOp.cs
diff --git a/...SupportLibrary/Properties/AssemblyInfo.cs → ...SupportLibrary/Properties/AssemblyInfo.cs b/...SupportLibrary/Properties/AssemblyInfo.cs → ...SupportLibrary/Properties/AssemblyInfo.cs
diff --git a/UnitTestSupportLibrary/SupportTypes.cs → Tests/UnitTestSupportLibrary/SupportTypes.cs b/UnitTestSupportLibrary/SupportTypes.cs → Tests/UnitTestSupportLibrary/SupportTypes.cs
diff --git a/...portLibrary/UnitTestSupportLibrary.csproj → ...portLibrary/UnitTestSupportLibrary.csproj b/...portLibrary/UnitTestSupportLibrary.csproj → ...portLibrary/UnitTestSupportLibrary.csproj