moved some file around

staxmanade · May 14, 2011 · 0e5c6c9 · 0e5c6c9
1 parent 1bb8fe1
commit 0e5c6c9
Show file tree

Hide file tree

Showing 32 changed files with 40 additions and 686 deletions.
diff --git a/lib/Phone/Microsoft/Microsoft.Phone.Interop.dll b/lib/Phone/Microsoft/Microsoft.Phone.Interop.dll
diff --git a/lib/Phone/Microsoft/Microsoft.Phone.dll b/lib/Phone/Microsoft/Microsoft.Phone.dll
diff --git a/lib/Phone/Microsoft/System.Core.dll b/lib/Phone/Microsoft/System.Core.dll
diff --git a/lib/Phone/Microsoft/System.Net.dll b/lib/Phone/Microsoft/System.Net.dll
diff --git a/lib/Phone/Microsoft/System.Runtime.Serialization.dll b/lib/Phone/Microsoft/System.Runtime.Serialization.dll
diff --git a/lib/Phone/Microsoft/System.Servicemodel.dll b/lib/Phone/Microsoft/System.Servicemodel.dll
diff --git a/lib/Phone/Microsoft/System.Windows.dll b/lib/Phone/Microsoft/System.Windows.dll
diff --git a/lib/Phone/Microsoft/System.Xml.Linq.dll b/lib/Phone/Microsoft/System.Xml.Linq.dll
diff --git a/lib/Phone/Microsoft/System.Xml.dll b/lib/Phone/Microsoft/System.Xml.dll
diff --git a/lib/Phone/Microsoft/System.dll b/lib/Phone/Microsoft/System.dll
diff --git a/...s/WP7_4.0/Microsoft.Phone.Build.Tasks.dll → ...e/WP7_4.0/Microsoft.Phone.Build.Tasks.dll b/...s/WP7_4.0/Microsoft.Phone.Build.Tasks.dll → ...e/WP7_4.0/Microsoft.Phone.Build.Tasks.dll
diff --git a/...WP7_4.0/Microsoft.Phone.PreImport.targets → ...WP7_4.0/Microsoft.Phone.PreImport.targets b/...WP7_4.0/Microsoft.Phone.PreImport.targets → ...WP7_4.0/Microsoft.Phone.PreImport.targets
diff --git a/...rosoft.Phone.Tool.CapabilityDetection.dll → ...rosoft.Phone.Tool.CapabilityDetection.dll b/...rosoft.Phone.Tool.CapabilityDetection.dll → ...rosoft.Phone.Tool.CapabilityDetection.dll
diff --git a/...ft.Phone.Tool.WPAppManifest.Validator.dll → ...ft.Phone.Tool.WPAppManifest.Validator.dll b/...ft.Phone.Tool.WPAppManifest.Validator.dll → ...ft.Phone.Tool.WPAppManifest.Validator.dll
diff --git a/...osoft.Phone.Tool.WPAppManifest.common.dll → ...osoft.Phone.Tool.WPAppManifest.common.dll b/...osoft.Phone.Tool.WPAppManifest.common.dll → ...osoft.Phone.Tool.WPAppManifest.common.dll
diff --git a/..._4.0/Microsoft.Silverlight.CSharp.targets → ..._4.0/Microsoft.Silverlight.CSharp.targets b/..._4.0/Microsoft.Silverlight.CSharp.targets → ..._4.0/Microsoft.Silverlight.CSharp.targets
diff --git a/..._4.0/Microsoft.Silverlight.Common.targets → ..._4.0/Microsoft.Silverlight.Common.targets b/..._4.0/Microsoft.Silverlight.Common.targets → ..._4.0/Microsoft.Silverlight.Common.targets
@@ -80,7 +80,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         DependsOnTargets="$(GetFrameworkPathsDependsOn)"
      >
 
-<!--        <GetSilverlightFrameworkPath 
+        <GetSilverlightFrameworkPath 
             RegistryBase="$(FrameworkRegistryBaseWithVersion)"
             RuntimePathRegistryKey="$(RuntimePathRegistryKey)"
             RuntimeVersionRegistryKey="$(RuntimeVersionRegistryKey)"
@@ -89,7 +89,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
             <Output TaskParameter="SilverlightSDKPaths" ItemName="_TargetFrameworkSDKDirectoryItem" Condition="'$(TargetFrameworkSDKDirectory)' == ''"/>
             <Output TaskParameter="SilverlightRuntimeVersion" PropertyName="SilverlightRuntimeVersion" Condition="'$(SilverlightRuntimeVersion)' == ''"/>
         </GetSilverlightFrameworkPath>
--->
+
         <!-- Reset some items from the above task. Will remove when we merge with SL build system -->
         <PropertyGroup>
             <_FullFrameworkReferenceAssemblyPaths>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToStandardLibraries($(TargetFrameworkIdentifier), $(TargetFrameworkVersion), ''))</_FullFrameworkReferenceAssemblyPaths>

diff --git a/...Microsoft.Silverlight.VisualBasic.targets → ...Microsoft.Silverlight.VisualBasic.targets b/...Microsoft.Silverlight.VisualBasic.targets → ...Microsoft.Silverlight.VisualBasic.targets
diff --git a/....Silverlight.WindowsPhone.Build.Tasks.dll → ....Silverlight.WindowsPhone.Build.Tasks.dll b/....Silverlight.WindowsPhone.Build.Tasks.dll → ....Silverlight.WindowsPhone.Build.Tasks.dll
diff --git a/...ilverlight.WindowsPhone.Overrides.targets → ...ilverlight.WindowsPhone.Overrides.targets b/...ilverlight.WindowsPhone.Overrides.targets → ...ilverlight.WindowsPhone.Overrides.targets
diff --git a/tools/WP7_4.0/Rules.xml → lib/Phone/WP7_4.0/Rules.xml b/tools/WP7_4.0/Rules.xml → lib/Phone/WP7_4.0/Rules.xml
diff --git a/tools/WP7_4.0/ShellTokens.xsd → lib/Phone/WP7_4.0/ShellTokens.xsd b/tools/WP7_4.0/ShellTokens.xsd → lib/Phone/WP7_4.0/ShellTokens.xsd
diff --git a/lib/Phone/WP7_4.0/StatLight.targets b/lib/Phone/WP7_4.0/StatLight.targets
@@ -0,0 +1,13 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SilverlightBuildResources>$(CompileTimeSolutionDir)..\lib\Phone\WP7_4.0\</SilverlightBuildResources>
+    <TargetFrameworkDirectory>$(SilverlightBuildResources)Reference Assemblies\</TargetFrameworkDirectory>
+    <TargetFrameworkSDKDirectory>$(SilverlightBuildResources)Reference Assemblies\</TargetFrameworkSDKDirectory>
+    <_TargetFrameworkSDKDirectoryItem>$(SilverlightBuildResources)Reference Assemblies\</_TargetFrameworkSDKDirectoryItem>
+    <_FullFrameworkReferenceAssemblyPaths>$(SilverlightBuildResources)Reference Assemblies\;</_FullFrameworkReferenceAssemblyPaths>
+    <_TargetFrameworkDirectories>$(SilverlightBuildResources)Reference Assemblies\;</_TargetFrameworkDirectories>
+    <!--<SilverlightRuntimeVersion>3.0.40624.0</SilverlightRuntimeVersion>-->
+  </PropertyGroup>
+  <Import Project="Microsoft.Silverlight.WindowsPhone.Overrides.targets" />
+  <Import Project="Microsoft.Silverlight.CSharp.targets" />
+</Project>
diff --git a/tools/WP7_4.0/XamlServicesWP.dll → lib/Phone/WP7_4.0/XamlServicesWP.dll b/tools/WP7_4.0/XamlServicesWP.dll → lib/Phone/WP7_4.0/XamlServicesWP.dll
diff --git a/tools/WP7_4.0/YamanoteCommonTypes.xsd → lib/Phone/WP7_4.0/YamanoteCommonTypes.xsd b/tools/WP7_4.0/YamanoteCommonTypes.xsd → lib/Phone/WP7_4.0/YamanoteCommonTypes.xsd
diff --git a/tools/WP7_4.0/YamanoteManifestSchema.xsd → lib/Phone/WP7_4.0/YamanoteManifestSchema.xsd b/tools/WP7_4.0/YamanoteManifestSchema.xsd → lib/Phone/WP7_4.0/YamanoteManifestSchema.xsd
diff --git a/tools/WP7_4.0/zlib114.dll → lib/Phone/WP7_4.0/zlib114.dll b/tools/WP7_4.0/zlib114.dll → lib/Phone/WP7_4.0/zlib114.dll
diff --git a/src/StatLight.Client.Harness.Phone/StatLight.Client.Harness.Phone.csproj b/src/StatLight.Client.Harness.Phone/StatLight.Client.Harness.Phone.csproj
@@ -279,7 +279,7 @@
     <Resource Include="StatLight.logo.png" />
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(CompileTimeSolutionDir)..\..\tools\WP7_4.0\StatLight.WP7.4.0.targets" />
+  <Import Project="$(CompileTimeSolutionDir)..\..\lib\Phone\WP7_4.0\StatLight.targets" />
   <!-- 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.
   <Target Name="BeforeBuild">

diff --git a/src/StatLight.IntegrationTests.Phone.MSTest/StatLight.IntegrationTests.Phone.MSTest.csproj b/src/StatLight.IntegrationTests.Phone.MSTest/StatLight.IntegrationTests.Phone.MSTest.csproj
@@ -48,19 +48,33 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Phone" />
-    <Reference Include="Microsoft.Phone.Interop" />
+    <Reference Include="Microsoft.Phone">
+      <HintPath>..\..\lib\Phone\Microsoft\Microsoft.Phone.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Phone.Interop" >
+      <HintPath>..\..\lib\Phone\Microsoft\Microsoft.Phone.Interop.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Silverlight.Testing">
       <HintPath>..\..\lib\Silverlight\Microsoft\May2010\Microsoft.Silverlight.Testing.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight">
       <HintPath>..\..\lib\Silverlight\Microsoft\May2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
     </Reference>
-    <Reference Include="System.Windows" />
-    <Reference Include="system" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows" >
+      <HintPath>..\..\lib\Phone\Microsoft\System.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>..\..\lib\Phone\Microsoft\System.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core" >
+      <HintPath>..\..\lib\Phone\Microsoft\System.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net" >
+      <HintPath>..\..\lib\Phone\Microsoft\System.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>..\..\lib\Phone\Microsoft\System.Xml.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -95,7 +109,7 @@
     </Content>
     <Content Include="SplashScreenImage.jpg" />
   </ItemGroup>
-  <Import Project="$(CompileTimeSolutionDir)\..\tools\WP7_4.0\StatLight.WP7.4.0.targets" />
+  <Import Project="$(CompileTimeSolutionDir)..\..\lib\Phone\WP7_4.0\StatLight.targets" />
   <!-- 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.
   <Target Name="BeforeBuild">

diff --git a/src/StatLight.sln b/src/StatLight.sln
@@ -405,7 +405,6 @@ Global
 		{40538134-161C-43F3-95E5-19F65D785E5F} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
 		{AA0B1C80-97AE-49F5-8310-5A7683BE47BF} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
 		{36D8CEA4-99BE-47E1-9687-3D4271CEA1DD} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
-		{2B165D32-B05D-4694-9792-8DD5B235BCE6} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
 		{6FBC8BF8-9DDF-4D25-8937-601A29ECA11B} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
 		{C3AB121A-CCE6-4CE8-AD23-BA1ED7046E8D} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
 		{38CB392B-B6F3-42AD-9393-26D4843830CF} = {CBFFC0A9-9D77-443F-84FB-831A1C368EA0}
@@ -417,5 +416,7 @@ Global
 		{C4BBAD1C-DE96-402E-961F-A0FE2A37E07D} = {CBBFE51F-1DDC-43CC-B78B-FDF51A1119F8}
 		{877807B6-7A79-48D4-B837-ECBF3F633047} = {9A0C1877-DBA4-4713-9C46-80489375F196}
 		{8300EF36-1FCB-4DFE-BC13-EF9D137646B8} = {9A0C1877-DBA4-4713-9C46-80489375F196}
+		{EBDA7B79-46B5-4763-AD62-9F0AA25AF2D6} = {9A0C1877-DBA4-4713-9C46-80489375F196}
+		{2B165D32-B05D-4694-9792-8DD5B235BCE6} = {9A0C1877-DBA4-4713-9C46-80489375F196}
 	EndGlobalSection
 EndGlobal