OSDN Git Service
(root)
/
psychlops
/
silverlight.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e05ab8e
)
3 to 4
author
unknown
<hskwk@.(none)>
Mon, 21 Jun 2010 04:29:00 +0000
(13:29 +0900)
committer
unknown
<hskwk@.(none)>
Mon, 21 Jun 2010 04:29:00 +0000
(13:29 +0900)
31 files changed:
dev4/Properties/AssemblyInfo.cs
[moved from
dev3/Properties/AssemblyInfo.cs
with 100% similarity]
patch
|
blob
|
history
dev4/PsychlopsSilverlight3.csproj
[moved from
dev3/PsychlopsSilverlight3.csproj
with 83% similarity]
patch
|
blob
|
history
dev4/WriteableBitmapEx/License.txt
[moved from
dev3/WriteableBitmapEx/License.txt
with 100% similarity]
patch
|
blob
|
history
dev4/WriteableBitmapEx/Readme.txt
[moved from
dev3/WriteableBitmapEx/Readme.txt
with 100% similarity]
patch
|
blob
|
history
dev4/WriteableBitmapEx/WriteableBitmapEx.XML
[moved from
dev3/WriteableBitmapEx/WriteableBitmapEx.XML
with 100% similarity]
patch
|
blob
|
history
dev4/WriteableBitmapEx/WriteableBitmapEx.dll
[moved from
dev3/WriteableBitmapEx/WriteableBitmapEx.dll
with 100% similarity]
patch
|
blob
|
history
dev4/WriteableBitmapEx/WriteableBitmapEx.pdb
[moved from
dev3/WriteableBitmapEx/WriteableBitmapEx.pdb
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/app/app.cs
[moved from
dev3/psychlops/core/app/app.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/app/misc.cs
[moved from
dev3/psychlops/core/app/misc.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/device/clock.cs
[moved from
dev3/psychlops/core/device/clock.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/device/hid.cs
[moved from
dev3/psychlops/core/device/hid.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/graphic/canvas.cs
[moved from
dev3/psychlops/core/graphic/canvas.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/graphic/font.cs
[moved from
dev3/psychlops/core/graphic/font.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/graphic/image.cs
[moved from
dev3/psychlops/core/graphic/image.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/graphic/module.cs
[moved from
dev3/psychlops/core/graphic/module.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/graphic/shape.cs
[moved from
dev3/psychlops/core/graphic/shape.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/math/interval.cs
[moved from
dev3/psychlops/core/math/interval.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/math/matrix.cs
[moved from
dev3/psychlops/core/math/matrix.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/core/math/util.cs
[moved from
dev3/psychlops/core/math/util.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/extention/media/svg.cs
[moved from
dev3/psychlops/extention/media/svg.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/extention/standard/figures.cs
[moved from
dev3/psychlops/extention/standard/figures.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/extention/standard/widget.cs
[moved from
dev3/psychlops/extention/standard/widget.cs
with 100% similarity]
patch
|
blob
|
history
dev4/psychlops/psychlops.cs
[moved from
dev3/psychlops/psychlops.cs
with 100% similarity]
patch
|
blob
|
history
test4/App.xaml
[moved from
test3/App.xaml
with 100% similarity]
patch
|
blob
|
history
test4/App.xaml.cs
[moved from
test3/App.xaml.cs
with 100% similarity]
patch
|
blob
|
history
test4/MainPage.xaml
[moved from
test3/MainPage.xaml
with 100% similarity]
patch
|
blob
|
history
test4/MainPage.xaml.cs
[moved from
test3/MainPage.xaml.cs
with 100% similarity]
patch
|
blob
|
history
test4/Properties/AppManifest.xml
[moved from
test3/Properties/AppManifest.xml
with 100% similarity]
patch
|
blob
|
history
test4/Properties/AssemblyInfo.cs
[moved from
test3/Properties/AssemblyInfo.cs
with 100% similarity]
patch
|
blob
|
history
test4/PsychlopsMain.cs
[moved from
test3/PsychlopsMain.cs
with 100% similarity]
patch
|
blob
|
history
test4/PsychlopsSilverlight3test.csproj
[moved from
test3/PsychlopsSilverlight3test.csproj
with 81% similarity]
patch
|
blob
|
history
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
(file)
--- 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">
\r
+<?xml version="1.0" encoding="utf-8"?>
\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
\r
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
\r
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
\r
+ </PropertyGroup>
\r
<PropertyGroup>
\r
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
\r
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
\r
<PropertyGroup>
\r
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
\r
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
\r
@@
-10,10
+14,17
@@
<AppDesignerFolder>Properties</AppDesignerFolder>
\r
<RootNamespace>PsychlopsSilverlight3</RootNamespace>
\r
<AssemblyName>PsychlopsSilverlight3</AssemblyName>
\r
<AppDesignerFolder>Properties</AppDesignerFolder>
\r
<RootNamespace>PsychlopsSilverlight3</RootNamespace>
\r
<AssemblyName>PsychlopsSilverlight3</AssemblyName>
\r
- <TargetFrameworkVersion>v3.
5
</TargetFrameworkVersion>
\r
+ <TargetFrameworkVersion>v3.
0
</TargetFrameworkVersion>
\r
<SilverlightApplication>false</SilverlightApplication>
\r
<ValidateXaml>true</ValidateXaml>
\r
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
\r
<SilverlightApplication>false</SilverlightApplication>
\r
<ValidateXaml>true</ValidateXaml>
\r
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
\r
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
\r
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
\r
+ <FileUpgradeFlags>
\r
+ </FileUpgradeFlags>
\r
+ <UpgradeBackupLocation>
\r
+ </UpgradeBackupLocation>
\r
+ <OldToolsVersion>3.5</OldToolsVersion>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
\r
<DebugSymbols>true</DebugSymbols>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
\r
<DebugSymbols>true</DebugSymbols>
\r
@@
-68,7
+79,7
@@
<Compile Include="psychlops\psychlops.cs" />
\r
<Compile Include="psychlops\core\graphic\shape.cs" />
\r
</ItemGroup>
\r
<Compile Include="psychlops\psychlops.cs" />
\r
<Compile Include="psychlops\core\graphic\shape.cs" />
\r
</ItemGroup>
\r
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\
v3.0
\Microsoft.Silverlight.CSharp.targets" />
\r
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\
$(SilverlightVersion)
\Microsoft.Silverlight.CSharp.targets" />
\r
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
\r
Other similar extension points exist, see Microsoft.Common.targets.
\r
<Target Name="BeforeBuild">
\r
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
\r
Other similar extension points exist, see Microsoft.Common.targets.
\r
<Target Name="BeforeBuild">
\r
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
(file)
--- 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">
\r
+<?xml version="1.0" encoding="utf-8"?>
\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
\r
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
\r
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
\r
+ </PropertyGroup>
\r
<PropertyGroup>
\r
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
\r
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
\r
<ProductVersion>9.0.30729</ProductVersion>
\r
<SchemaVersion>2.0</SchemaVersion>
\r
<PropertyGroup>
\r
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
\r
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
\r
<ProductVersion>9.0.30729</ProductVersion>
\r
<SchemaVersion>2.0</SchemaVersion>
\r
- <ProjectGuid>{
23080448-E8EF-4766-9ACE-4448C61931DB
}</ProjectGuid>
\r
+ <ProjectGuid>{
46CA4F41-B3F5-43E0-9BC7-DDD7EBF3C1E4
}</ProjectGuid>
\r
<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
<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.
5
</TargetFrameworkVersion>
\r
+ <TargetFrameworkVersion>v3.
0
</TargetFrameworkVersion>
\r
<SilverlightApplication>true</SilverlightApplication>
\r
<SupportedCultures>ja</SupportedCultures>
\r
<XapOutputs>true</XapOutputs>
\r
<SilverlightApplication>true</SilverlightApplication>
\r
<SupportedCultures>ja</SupportedCultures>
\r
<XapOutputs>true</XapOutputs>
\r
@@
-27,6
+31,13
@@
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
\r
<LinkedServerProject>
\r
</LinkedServerProject>
\r
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
\r
<LinkedServerProject>
\r
</LinkedServerProject>
\r
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
\r
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
\r
+ <FileUpgradeFlags>
\r
+ </FileUpgradeFlags>
\r
+ <UpgradeBackupLocation>
\r
+ </UpgradeBackupLocation>
\r
+ <OldToolsVersion>3.5</OldToolsVersion>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
\r
<DebugSymbols>true</DebugSymbols>
\r
</PropertyGroup>
\r
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
\r
<DebugSymbols>true</DebugSymbols>
\r
@@
-76,10
+87,14
@@
<ApplicationDefinition Include="App.xaml">
\r
<SubType>Designer</SubType>
\r
<Generator>MSBuild:MarkupCompilePass1</Generator>
\r
<ApplicationDefinition Include="App.xaml">
\r
<SubType>Designer</SubType>
\r
<Generator>MSBuild:MarkupCompilePass1</Generator>
\r
+ <Generator>MSBuild:Compile</Generator>
\r
+ <SubType>Designer</SubType>
\r
</ApplicationDefinition>
\r
<Page Include="MainPage.xaml">
\r
<SubType>Designer</SubType>
\r
<Generator>MSBuild:MarkupCompilePass1</Generator>
\r
</ApplicationDefinition>
\r
<Page Include="MainPage.xaml">
\r
<SubType>Designer</SubType>
\r
<Generator>MSBuild:MarkupCompilePass1</Generator>
\r
+ <Generator>MSBuild:Compile</Generator>
\r
+ <SubType>Designer</SubType>
\r
</Page>
\r
</ItemGroup>
\r
<ItemGroup>
\r
</Page>
\r
</ItemGroup>
\r
<ItemGroup>
\r
@@
-88,7
+103,7
@@
<ItemGroup>
\r
<Content Include="TestPage.html" />
\r
</ItemGroup>
\r
<ItemGroup>
\r
<Content Include="TestPage.html" />
\r
</ItemGroup>
\r
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\
v3.0
\Microsoft.Silverlight.CSharp.targets" />
\r
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\
$(SilverlightVersion)
\Microsoft.Silverlight.CSharp.targets" />
\r
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
\r
Other similar extension points exist, see Microsoft.Common.targets.
\r
<Target Name="BeforeBuild">
\r
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
\r
Other similar extension points exist, see Microsoft.Common.targets.
\r
<Target Name="BeforeBuild">
\r