##// END OF EJS Templates
minor fixes for vs2012
cin -
r155:037df317f126 v2
parent child
Show More
@@ -1,109 +1,114
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <PropertyGroup>
4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 6 <ProductVersion>8.0.30703</ProductVersion>
7 7 <SchemaVersion>2.0</SchemaVersion>
8 8 <ProjectGuid>{2F31E405-E267-4195-A05D-574093C21209}</ProjectGuid>
9 9 <OutputType>Library</OutputType>
10 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 11 <RootNamespace>Implab.Fx.Test</RootNamespace>
12 12 <AssemblyName>Implab.Fx.Test</AssemblyName>
13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14 14 <FileAlignment>512</FileAlignment>
15 15 <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16 <TargetFrameworkProfile />
16 17 </PropertyGroup>
17 18 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18 19 <DebugSymbols>true</DebugSymbols>
19 20 <DebugType>full</DebugType>
20 21 <Optimize>false</Optimize>
21 22 <OutputPath>bin\Debug\</OutputPath>
22 23 <DefineConstants>DEBUG;TRACE</DefineConstants>
23 24 <ErrorReport>prompt</ErrorReport>
24 25 <WarningLevel>4</WarningLevel>
26 <Prefer32Bit>false</Prefer32Bit>
25 27 </PropertyGroup>
26 28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 29 <DebugType>pdbonly</DebugType>
28 30 <Optimize>true</Optimize>
29 31 <OutputPath>bin\Release\</OutputPath>
30 32 <DefineConstants>TRACE</DefineConstants>
31 33 <ErrorReport>prompt</ErrorReport>
32 34 <WarningLevel>4</WarningLevel>
35 <Prefer32Bit>false</Prefer32Bit>
33 36 </PropertyGroup>
34 37 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.5|AnyCPU' ">
35 38 <DebugSymbols>true</DebugSymbols>
36 39 <DebugType>full</DebugType>
37 40 <Optimize>false</Optimize>
38 41 <OutputPath>bin\Debug\</OutputPath>
39 42 <DefineConstants>DEBUG;TRACE</DefineConstants>
40 43 <ErrorReport>prompt</ErrorReport>
41 44 <WarningLevel>4</WarningLevel>
45 <Prefer32Bit>false</Prefer32Bit>
42 46 </PropertyGroup>
43 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 4.5|AnyCPU' ">
44 48 <DebugType>pdbonly</DebugType>
45 49 <Optimize>true</Optimize>
46 50 <OutputPath>bin\Release\</OutputPath>
47 51 <DefineConstants>TRACE</DefineConstants>
48 52 <ErrorReport>prompt</ErrorReport>
49 53 <WarningLevel>4</WarningLevel>
54 <Prefer32Bit>false</Prefer32Bit>
50 55 </PropertyGroup>
51 56 <ItemGroup>
52 57 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
53 58 <Reference Include="System" />
54 59 <Reference Include="System.Core">
55 60 <RequiredTargetFramework>3.5</RequiredTargetFramework>
56 61 </Reference>
57 62 <Reference Include="System.Data" />
58 63 <Reference Include="System.Drawing" />
59 64 <Reference Include="System.Windows.Forms" />
60 65 <Reference Include="System.Xml" />
61 66 <Reference Include="WindowsBase" />
62 67 </ItemGroup>
63 68 <ItemGroup>
64 69 <Compile Include="Properties\AssemblyInfo.cs" />
65 70 <Compile Include="OverlayTest.cs" />
66 71 <Compile Include="Sample\MainForm.cs">
67 72 <SubType>Form</SubType>
68 73 </Compile>
69 74 <Compile Include="Sample\MainForm.Designer.cs">
70 75 <DependentUpon>MainForm.cs</DependentUpon>
71 76 </Compile>
72 77 <Compile Include="Sample\OverlayForm.cs">
73 78 <SubType>Form</SubType>
74 79 </Compile>
75 80 <Compile Include="Sample\OverlayForm.Designer.cs">
76 81 <DependentUpon>OverlayForm.cs</DependentUpon>
77 82 </Compile>
78 83 </ItemGroup>
79 84 <ItemGroup>
80 85 <EmbeddedResource Include="Sample\MainForm.resx">
81 86 <DependentUpon>MainForm.cs</DependentUpon>
82 87 <LogicalName>
83 88 </LogicalName>
84 89 </EmbeddedResource>
85 90 <EmbeddedResource Include="Sample\OverlayForm.resx">
86 91 <DependentUpon>OverlayForm.cs</DependentUpon>
87 92 <LogicalName>
88 93 </LogicalName>
89 94 </EmbeddedResource>
90 95 </ItemGroup>
91 96 <ItemGroup>
92 97 <ProjectReference Include="..\Implab.Fx\Implab.Fx.csproj">
93 98 <Project>{06E706F8-6881-43EB-927E-FFC503AF6ABC}</Project>
94 99 <Name>Implab.Fx</Name>
95 100 </ProjectReference>
96 101 <ProjectReference Include="..\Implab\Implab.csproj">
97 102 <Project>{F550F1F8-8746-4AD0-9614-855F4C4B7F05}</Project>
98 103 <Name>Implab</Name>
99 104 </ProjectReference>
100 105 </ItemGroup>
101 106 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
102 107 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
103 108 Other similar extension points exist, see Microsoft.Common.targets.
104 109 <Target Name="BeforeBuild">
105 110 </Target>
106 111 <Target Name="AfterBuild">
107 112 </Target>
108 113 -->
109 114 </Project> No newline at end of file
@@ -1,38 +1,38
1 1 using System.Windows.Forms;
2 2 using Implab.Fx.Test.Sample;
3 3 using Implab.Fx;
4 4
5 5 #if MONO
6 6
7 7 using NUnit.Framework;
8 8 using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
9 9 using TestMethod = NUnit.Framework.TestAttribute;
10 10
11 11 #else
12 12
13 13 using Microsoft.VisualStudio.TestTools.UnitTesting;
14 14
15 15 #endif
16 16
17 17 namespace Implab.Fx.Test
18 18 {
19 19 [TestClass]
20 20 public class OverlayTest
21 21 {
22 22 [TestMethod]
23 23 public void TestMethod1()
24 24 {
25 25 var mainForm = new MainForm();
26 26
27 27 mainForm.ButtonEvent += (sender, args) =>
28 28 {
29 29 var overlay = new OverlayForm();
30 mainForm.OverlayFadeIn(overlay).Then(
30 mainForm.OverlayFadeIn(overlay).On(
31 31 o => o.ButtonEvent += (s2, args2) => o.CloseFadeOut()
32 32 );
33 33 };
34 34
35 35 Application.Run(mainForm);
36 36 }
37 37 }
38 38 }
@@ -1,83 +1,88
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <PropertyGroup>
4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 6 <ProductVersion>8.0.30703</ProductVersion>
7 7 <SchemaVersion>2.0</SchemaVersion>
8 8 <ProjectGuid>{06E706F8-6881-43EB-927E-FFC503AF6ABC}</ProjectGuid>
9 9 <OutputType>Library</OutputType>
10 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 11 <RootNamespace>Implab.Fx</RootNamespace>
12 12 <AssemblyName>Implab.Fx</AssemblyName>
13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14 14 <FileAlignment>512</FileAlignment>
15 15 <ReleaseVersion>0.2</ReleaseVersion>
16 <TargetFrameworkProfile />
16 17 </PropertyGroup>
17 18 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18 19 <DebugSymbols>true</DebugSymbols>
19 20 <DebugType>full</DebugType>
20 21 <Optimize>false</Optimize>
21 22 <OutputPath>bin\Debug\</OutputPath>
22 23 <DefineConstants>DEBUG;TRACE</DefineConstants>
23 24 <ErrorReport>prompt</ErrorReport>
24 25 <WarningLevel>4</WarningLevel>
26 <Prefer32Bit>false</Prefer32Bit>
25 27 </PropertyGroup>
26 28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 29 <DebugType>pdbonly</DebugType>
28 30 <Optimize>true</Optimize>
29 31 <OutputPath>bin\Release\</OutputPath>
30 32 <DefineConstants>TRACE</DefineConstants>
31 33 <ErrorReport>prompt</ErrorReport>
32 34 <WarningLevel>4</WarningLevel>
35 <Prefer32Bit>false</Prefer32Bit>
33 36 </PropertyGroup>
34 37 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.5|AnyCPU' ">
35 38 <DebugSymbols>true</DebugSymbols>
36 39 <DebugType>full</DebugType>
37 40 <Optimize>false</Optimize>
38 41 <OutputPath>bin\Debug\</OutputPath>
39 42 <DefineConstants>DEBUG;TRACE</DefineConstants>
40 43 <ErrorReport>prompt</ErrorReport>
41 44 <WarningLevel>4</WarningLevel>
45 <Prefer32Bit>false</Prefer32Bit>
42 46 </PropertyGroup>
43 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 4.5|AnyCPU' ">
44 48 <DebugType>pdbonly</DebugType>
45 49 <Optimize>true</Optimize>
46 50 <OutputPath>bin\Release\</OutputPath>
47 51 <DefineConstants>TRACE</DefineConstants>
48 52 <ErrorReport>prompt</ErrorReport>
49 53 <WarningLevel>4</WarningLevel>
54 <Prefer32Bit>false</Prefer32Bit>
50 55 </PropertyGroup>
51 56 <ItemGroup>
52 57 <Reference Include="System" />
53 58 <Reference Include="System.Core" />
54 59 <Reference Include="System.Drawing" />
55 60 <Reference Include="System.Windows.Forms" />
56 61 <Reference Include="System.Xml.Linq" />
57 62 <Reference Include="System.Data.DataSetExtensions" />
58 63 <Reference Include="Microsoft.CSharp" />
59 64 <Reference Include="System.Data" />
60 65 <Reference Include="System.Xml" />
61 66 </ItemGroup>
62 67 <ItemGroup>
63 68 <Compile Include="Animation.cs" />
64 69 <Compile Include="AnimationHelpers.cs" />
65 70 <Compile Include="PromiseHelpers.cs" />
66 71 <Compile Include="Properties\AssemblyInfo.cs" />
67 72 <Compile Include="ControlBoundPromise.cs" />
68 73 </ItemGroup>
69 74 <ItemGroup>
70 75 <ProjectReference Include="..\Implab\Implab.csproj">
71 <Project>{F550F1F8-8746-4AD0-9614-855F4C4B7F05}</Project>
76 <Project>{f550f1f8-8746-4ad0-9614-855f4c4b7f05}</Project>
72 77 <Name>Implab</Name>
73 78 </ProjectReference>
74 79 </ItemGroup>
75 80 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76 81 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
77 82 Other similar extension points exist, see Microsoft.Common.targets.
78 83 <Target Name="BeforeBuild">
79 84 </Target>
80 85 <Target Name="AfterBuild">
81 86 </Target>
82 87 -->
83 88 </Project> No newline at end of file
@@ -1,77 +1,82
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <PropertyGroup>
4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 6 <ProductVersion>8.0.30703</ProductVersion>
7 7 <SchemaVersion>2.0</SchemaVersion>
8 8 <ProjectGuid>{63F92C0C-61BF-48C0-A377-8D67C3C661D0}</ProjectGuid>
9 9 <OutputType>Library</OutputType>
10 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 11 <RootNamespace>Implab.Test</RootNamespace>
12 12 <AssemblyName>Implab.Test</AssemblyName>
13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14 14 <FileAlignment>512</FileAlignment>
15 15 <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16 <TargetFrameworkProfile />
16 17 </PropertyGroup>
17 18 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18 19 <DebugSymbols>true</DebugSymbols>
19 20 <DebugType>full</DebugType>
20 21 <Optimize>false</Optimize>
21 22 <OutputPath>bin\Debug\</OutputPath>
22 23 <DefineConstants>DEBUG;TRACE</DefineConstants>
23 24 <ErrorReport>prompt</ErrorReport>
24 25 <WarningLevel>4</WarningLevel>
26 <Prefer32Bit>false</Prefer32Bit>
25 27 </PropertyGroup>
26 28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 29 <DebugType>pdbonly</DebugType>
28 30 <Optimize>true</Optimize>
29 31 <OutputPath>bin\Release\</OutputPath>
30 32 <DefineConstants>TRACE</DefineConstants>
31 33 <ErrorReport>prompt</ErrorReport>
32 34 <WarningLevel>4</WarningLevel>
35 <Prefer32Bit>false</Prefer32Bit>
33 36 </PropertyGroup>
34 37 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.5|AnyCPU' ">
35 38 <DebugSymbols>true</DebugSymbols>
36 39 <DebugType>full</DebugType>
37 40 <Optimize>false</Optimize>
38 41 <OutputPath>bin\Debug\</OutputPath>
39 42 <DefineConstants>DEBUG;TRACE</DefineConstants>
40 43 <ErrorReport>prompt</ErrorReport>
41 44 <WarningLevel>4</WarningLevel>
45 <Prefer32Bit>false</Prefer32Bit>
42 46 </PropertyGroup>
43 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 4.5|AnyCPU' ">
44 48 <DebugType>pdbonly</DebugType>
45 49 <Optimize>true</Optimize>
46 50 <OutputPath>bin\Release\</OutputPath>
47 51 <DefineConstants>TRACE</DefineConstants>
48 52 <ErrorReport>prompt</ErrorReport>
49 53 <WarningLevel>4</WarningLevel>
54 <Prefer32Bit>false</Prefer32Bit>
50 55 </PropertyGroup>
51 56 <ItemGroup>
52 57 <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
53 58 <Reference Include="System" />
54 59 <Reference Include="System.Core">
55 60 <RequiredTargetFramework>3.5</RequiredTargetFramework>
56 61 </Reference>
57 62 </ItemGroup>
58 63 <ItemGroup>
59 64 <Compile Include="AsyncTests.cs" />
60 65 <Compile Include="PromiseHelper.cs" />
61 66 <Compile Include="Properties\AssemblyInfo.cs" />
62 67 </ItemGroup>
63 68 <ItemGroup>
64 69 <ProjectReference Include="..\Implab\Implab.csproj">
65 70 <Project>{99B95D0D-9CF9-4F70-8ADF-F4D0AA5CB0D9}</Project>
66 71 <Name>Implab</Name>
67 72 </ProjectReference>
68 73 </ItemGroup>
69 74 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
70 75 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
71 76 Other similar extension points exist, see Microsoft.Common.targets.
72 77 <Target Name="BeforeBuild">
73 78 </Target>
74 79 <Target Name="AfterBuild">
75 80 </Target>
76 81 -->
77 82 </Project> No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now