3 to 4 3/3

diff --git a/dev4/PsychlopsSilverlight4.csproj b/dev4/PsychlopsSilverlight4.csproj
index 5e69ddd..f515dac 100644 (file)
--- a/dev4/PsychlopsSilverlight4.csproj
+++ b/dev4/PsychlopsSilverlight4.csproj
@@ -12,9 +12,9 @@
     <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>\r
     <OutputType>Library</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>PsychlopsSilverlight3</RootNamespace>\r
-    <AssemblyName>PsychlopsSilverlight3</AssemblyName>\r
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>\r
+    <RootNamespace>PsychlopsSilverlight4</RootNamespace>\r
+    <AssemblyName>PsychlopsSilverlight4</AssemblyName>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
     <SilverlightApplication>false</SilverlightApplication>\r
     <ValidateXaml>true</ValidateXaml>\r
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>\r
@@ -25,6 +25,7 @@
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
     <OldToolsVersion>3.5</OldToolsVersion>\r
+    <TargetFrameworkProfile />\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r

diff --git a/test4/App.xaml b/test4/App.xaml
index 203356e..f82402d 100644 (file)
--- a/test4/App.xaml
+++ b/test4/App.xaml
@@ -1,6 +1,6 @@
 <Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" \r
-             x:Class="PsychlopsSilverlight3test.App"\r
+             x:Class="PsychlopsSilverlight4test.App"\r
              >\r
     <Application.Resources>\r
         \r

diff --git a/test4/App.xaml.cs b/test4/App.xaml.cs
index 51613a1..e091cde 100644 (file)
--- a/test4/App.xaml.cs
+++ b/test4/App.xaml.cs
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;\r
 using System.Windows.Shapes;\r
 \r
-namespace PsychlopsSilverlight3test\r
+namespace PsychlopsSilverlight4test\r
 {\r
        public partial class App : Application\r
        {\r

diff --git a/test4/MainPage.xaml b/test4/MainPage.xaml
index 11b3532..da67b32 100644 (file)
--- a/test4/MainPage.xaml
+++ b/test4/MainPage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="PsychlopsSilverlight3test.MainPage"\r
+<UserControl x:Class="PsychlopsSilverlight4test.MainPage"\r
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" \r
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" \r

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index 7aa4b92..036c20d 100644 (file)
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -1,6 +1,6 @@
 using Psychlops;\r
 \r
-namespace PsychlopsSilverlight3test\r
+namespace PsychlopsSilverlight4test\r
 {\r
        public partial class MainPage : System.Windows.Controls.UserControl\r
        {\r

diff --git a/test4/Properties/AssemblyInfo.cs b/test4/Properties/AssemblyInfo.cs
index 074953b..82192e3 100644 (file)
--- a/test4/Properties/AssemblyInfo.cs
+++ b/test4/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。\r
 // アセンブリに関連付けられている情報を変更するには、\r
 // これらの属性値を変更してください。\r
-[assembly: AssemblyTitle("PsychlopsSilverlight3test")]\r
+[assembly: AssemblyTitle("PsychlopsSilverlight4test")]\r
 [assembly: AssemblyDescription("")]\r
 [assembly: AssemblyConfiguration("")]\r
 [assembly: AssemblyCompany("")]\r
-[assembly: AssemblyProduct("PsychlopsSilverlight3test")]\r
+[assembly: AssemblyProduct("PsychlopsSilverlight4test")]\r
 [assembly: AssemblyCopyright("Copyright ©  2010")]\r
 [assembly: AssemblyTrademark("")]\r
 [assembly: AssemblyCulture("")]\r

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 058e332..742db80 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -25,7 +25,7 @@ namespace Psychlops
 }\r
 \r
 \r
-namespace PsychlopsSilverlight3test\r
+namespace PsychlopsSilverlight4test\r
 {\r
 \r
        public class PsychlopsMain\r

diff --git a/test4/PsychlopsSilverlight4test.csproj b/test4/PsychlopsSilverlight4test.csproj
index 225203d..53da68d 100644 (file)
--- a/test4/PsychlopsSilverlight4test.csproj
+++ b/test4/PsychlopsSilverlight4test.csproj
@@ -12,9 +12,9 @@
     <ProjectTypeGuids>{A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>\r
     <OutputType>Library</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>PsychlopsSilverlight3test</RootNamespace>\r
-    <AssemblyName>PsychlopsSilverlight3test</AssemblyName>\r
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>\r
+    <RootNamespace>PsychlopsSilverlight4test</RootNamespace>\r
+    <AssemblyName>PsychlopsSilverlight4test</AssemblyName>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
     <SilverlightApplication>true</SilverlightApplication>\r
     <SupportedCultures>ja</SupportedCultures>\r
     <XapOutputs>true</XapOutputs>\r
@@ -38,6 +38,7 @@
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
     <OldToolsVersion>3.5</OldToolsVersion>\r
+    <TargetFrameworkProfile />\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
@@ -61,9 +62,8 @@
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <Reference Include="PsychlopsSilverlight3, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\dev3\Bin\Debug\PsychlopsSilverlight3.dll</HintPath>\r
+    <Reference Include="PsychlopsSilverlight4">\r
+      <HintPath>..\dev4\Bin\Debug\PsychlopsSilverlight4.dll</HintPath>\r
     </Reference>\r
     <Reference Include="System.Windows" />\r
     <Reference Include="mscorlib" />\r