From: unknown <hskwk@.(none)>
Date: Mon, 21 Jun 2010 04:29:00 +0000 (+0900)
Subject: 3 to 4
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;ds=sidebyside;h=cb8916a7a5cd929f57b3f9edd99209680db90546;p=psychlops%2Fsilverlight.git

3 to 4
---

diff --git a/dev3/Properties/AssemblyInfo.cs b/dev4/Properties/AssemblyInfo.cs
similarity index 100%
rename from dev3/Properties/AssemblyInfo.cs
rename to dev4/Properties/AssemblyInfo.cs
diff --git a/dev3/PsychlopsSilverlight3.csproj b/dev4/PsychlopsSilverlight3.csproj
similarity index 83%
rename from dev3/PsychlopsSilverlight3.csproj
rename to dev4/PsychlopsSilverlight3.csproj
index 81480c4..5e69ddd 100644
--- a/dev3/PsychlopsSilverlight3.csproj
+++ b/dev4/PsychlopsSilverlight3.csproj
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +14,17 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PsychlopsSilverlight3</RootNamespace>
     <AssemblyName>PsychlopsSilverlight3</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,7 +79,7 @@
     <Compile Include="psychlops\psychlops.cs" />
     <Compile Include="psychlops\core\graphic\shape.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.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/dev3/WriteableBitmapEx/License.txt b/dev4/WriteableBitmapEx/License.txt
similarity index 100%
rename from dev3/WriteableBitmapEx/License.txt
rename to dev4/WriteableBitmapEx/License.txt
diff --git a/dev3/WriteableBitmapEx/Readme.txt b/dev4/WriteableBitmapEx/Readme.txt
similarity index 100%
rename from dev3/WriteableBitmapEx/Readme.txt
rename to dev4/WriteableBitmapEx/Readme.txt
diff --git a/dev3/WriteableBitmapEx/WriteableBitmapEx.XML b/dev4/WriteableBitmapEx/WriteableBitmapEx.XML
similarity index 100%
rename from dev3/WriteableBitmapEx/WriteableBitmapEx.XML
rename to dev4/WriteableBitmapEx/WriteableBitmapEx.XML
diff --git a/dev3/WriteableBitmapEx/WriteableBitmapEx.dll b/dev4/WriteableBitmapEx/WriteableBitmapEx.dll
similarity index 100%
rename from dev3/WriteableBitmapEx/WriteableBitmapEx.dll
rename to dev4/WriteableBitmapEx/WriteableBitmapEx.dll
diff --git a/dev3/WriteableBitmapEx/WriteableBitmapEx.pdb b/dev4/WriteableBitmapEx/WriteableBitmapEx.pdb
similarity index 100%
rename from dev3/WriteableBitmapEx/WriteableBitmapEx.pdb
rename to dev4/WriteableBitmapEx/WriteableBitmapEx.pdb
diff --git a/dev3/psychlops/core/app/app.cs b/dev4/psychlops/core/app/app.cs
similarity index 100%
rename from dev3/psychlops/core/app/app.cs
rename to dev4/psychlops/core/app/app.cs
diff --git a/dev3/psychlops/core/app/misc.cs b/dev4/psychlops/core/app/misc.cs
similarity index 100%
rename from dev3/psychlops/core/app/misc.cs
rename to dev4/psychlops/core/app/misc.cs
diff --git a/dev3/psychlops/core/device/clock.cs b/dev4/psychlops/core/device/clock.cs
similarity index 100%
rename from dev3/psychlops/core/device/clock.cs
rename to dev4/psychlops/core/device/clock.cs
diff --git a/dev3/psychlops/core/device/hid.cs b/dev4/psychlops/core/device/hid.cs
similarity index 100%
rename from dev3/psychlops/core/device/hid.cs
rename to dev4/psychlops/core/device/hid.cs
diff --git a/dev3/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs
similarity index 100%
rename from dev3/psychlops/core/graphic/canvas.cs
rename to dev4/psychlops/core/graphic/canvas.cs
diff --git a/dev3/psychlops/core/graphic/font.cs b/dev4/psychlops/core/graphic/font.cs
similarity index 100%
rename from dev3/psychlops/core/graphic/font.cs
rename to dev4/psychlops/core/graphic/font.cs
diff --git a/dev3/psychlops/core/graphic/image.cs b/dev4/psychlops/core/graphic/image.cs
similarity index 100%
rename from dev3/psychlops/core/graphic/image.cs
rename to dev4/psychlops/core/graphic/image.cs
diff --git a/dev3/psychlops/core/graphic/module.cs b/dev4/psychlops/core/graphic/module.cs
similarity index 100%
rename from dev3/psychlops/core/graphic/module.cs
rename to dev4/psychlops/core/graphic/module.cs
diff --git a/dev3/psychlops/core/graphic/shape.cs b/dev4/psychlops/core/graphic/shape.cs
similarity index 100%
rename from dev3/psychlops/core/graphic/shape.cs
rename to dev4/psychlops/core/graphic/shape.cs
diff --git a/dev3/psychlops/core/math/interval.cs b/dev4/psychlops/core/math/interval.cs
similarity index 100%
rename from dev3/psychlops/core/math/interval.cs
rename to dev4/psychlops/core/math/interval.cs
diff --git a/dev3/psychlops/core/math/matrix.cs b/dev4/psychlops/core/math/matrix.cs
similarity index 100%
rename from dev3/psychlops/core/math/matrix.cs
rename to dev4/psychlops/core/math/matrix.cs
diff --git a/dev3/psychlops/core/math/util.cs b/dev4/psychlops/core/math/util.cs
similarity index 100%
rename from dev3/psychlops/core/math/util.cs
rename to dev4/psychlops/core/math/util.cs
diff --git a/dev3/psychlops/extention/media/svg.cs b/dev4/psychlops/extention/media/svg.cs
similarity index 100%
rename from dev3/psychlops/extention/media/svg.cs
rename to dev4/psychlops/extention/media/svg.cs
diff --git a/dev3/psychlops/extention/standard/figures.cs b/dev4/psychlops/extention/standard/figures.cs
similarity index 100%
rename from dev3/psychlops/extention/standard/figures.cs
rename to dev4/psychlops/extention/standard/figures.cs
diff --git a/dev3/psychlops/extention/standard/widget.cs b/dev4/psychlops/extention/standard/widget.cs
similarity index 100%
rename from dev3/psychlops/extention/standard/widget.cs
rename to dev4/psychlops/extention/standard/widget.cs
diff --git a/dev3/psychlops/psychlops.cs b/dev4/psychlops/psychlops.cs
similarity index 100%
rename from dev3/psychlops/psychlops.cs
rename to dev4/psychlops/psychlops.cs
diff --git a/test3/App.xaml b/test4/App.xaml
similarity index 100%
rename from test3/App.xaml
rename to test4/App.xaml
diff --git a/test3/App.xaml.cs b/test4/App.xaml.cs
similarity index 100%
rename from test3/App.xaml.cs
rename to test4/App.xaml.cs
diff --git a/test3/MainPage.xaml b/test4/MainPage.xaml
similarity index 100%
rename from test3/MainPage.xaml
rename to test4/MainPage.xaml
diff --git a/test3/MainPage.xaml.cs b/test4/MainPage.xaml.cs
similarity index 100%
rename from test3/MainPage.xaml.cs
rename to test4/MainPage.xaml.cs
diff --git a/test3/Properties/AppManifest.xml b/test4/Properties/AppManifest.xml
similarity index 100%
rename from test3/Properties/AppManifest.xml
rename to test4/Properties/AppManifest.xml
diff --git a/test3/Properties/AssemblyInfo.cs b/test4/Properties/AssemblyInfo.cs
similarity index 100%
rename from test3/Properties/AssemblyInfo.cs
rename to test4/Properties/AssemblyInfo.cs
diff --git a/test3/PsychlopsMain.cs b/test4/PsychlopsMain.cs
similarity index 100%
rename from test3/PsychlopsMain.cs
rename to test4/PsychlopsMain.cs
diff --git a/test3/PsychlopsSilverlight3test.csproj b/test4/PsychlopsSilverlight3test.csproj
similarity index 81%
rename from test3/PsychlopsSilverlight3test.csproj
rename to test4/PsychlopsSilverlight3test.csproj
index 60fa96a..225203d 100644
--- a/test3/PsychlopsSilverlight3test.csproj
+++ b/test4/PsychlopsSilverlight3test.csproj
@@ -1,16 +1,20 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{23080448-E8EF-4766-9ACE-4448C61931DB}</ProjectGuid>
+    <ProjectGuid>{46CA4F41-B3F5-43E0-9BC7-DDD7EBF3C1E4}</ProjectGuid>
     <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PsychlopsSilverlight3test</RootNamespace>
     <AssemblyName>PsychlopsSilverlight3test</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
     <SilverlightApplication>true</SilverlightApplication>
     <SupportedCultures>ja</SupportedCultures>
     <XapOutputs>true</XapOutputs>
@@ -27,6 +31,13 @@
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
     <LinkedServerProject>
     </LinkedServerProject>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,10 +87,14 @@
     <ApplicationDefinition Include="App.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Page Include="MainPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:MarkupCompilePass1</Generator>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
@@ -88,7 +103,7 @@
   <ItemGroup>
     <Content Include="TestPage.html" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.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">