Merge branch 'master' of http://49.233.21.66/liulongfei/VIZ.TVP.CBA

VIZ.TVP.CBA.UnitTest/VIZ.TVP.CBA.UnitTest.csproj

@@ -38,6 +38,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>

VIZ.TVP.CBA.WpfTest/VIZ.TVP.CBA.WpfTest.csproj

@@ -34,6 +34,26 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />

VIZ.TVP.CBA.sln

@@ -47,7 +47,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.TVP.CBA.UnitTest", "VIZ
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.TVP.CBA.WpfTest", "VIZ.TVP.CBA.WpfTest\VIZ.TVP.CBA.WpfTest.csproj", "{A045BE85-98F9-458C-BE0D-05D92019B508}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "85CBA", "85CBA", "{FB580B2F-98B5-47B0-8C2B-E633BE0768F8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "85-CBA", "85-CBA", "{FB580B2F-98B5-47B0-8C2B-E633BE0768F8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.MIGU.CBA", "VIZ.MIGU.CBA\VIZ.MIGU.CBA.csproj", "{144670CB-6396-488C-A76D-2E03A3B69E78}"
 EndProject
@@ -99,8 +99,8 @@ Global
 		{06B80C09-343D-4BB2-AEB1-61CFBFBF5CAD}.Release|x64.Build.0 = Release|x64
 		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.Build.0 = Debug|Any CPU
+		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.ActiveCfg = Debug|x64
+		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.Build.0 = Debug|x64
 		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Release|x64.ActiveCfg = Release|Any CPU
@@ -147,16 +147,16 @@ Global
 		{47CF6FB0-E37D-4EF1-AFC7-03DB2BCA8892}.Release|x64.Build.0 = Release|x64
 		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|x64.Build.0 = Debug|Any CPU
+		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|x64.ActiveCfg = Debug|x64
+		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Debug|x64.Build.0 = Debug|x64
 		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|x64.ActiveCfg = Release|Any CPU
 		{FFF7E65A-CCFB-4E99-AD15-3F769E1BD566}.Release|x64.Build.0 = Release|Any CPU
 		{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.Build.0 = Debug|Any CPU
+		{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.ActiveCfg = Debug|x64
+		{A045BE85-98F9-458C-BE0D-05D92019B508}.Debug|x64.Build.0 = Debug|x64
 		{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A045BE85-98F9-458C-BE0D-05D92019B508}.Release|x64.ActiveCfg = Release|Any CPU