Jelajahi Sumber

Testing in Shanghai

zhangjiaxin 4 tahun lalu
induk
melakukan
003e4de057

+ 9 - 0
DBManager/DBManager.csproj

@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>

+ 11 - 2
ExtenderControl/HOZExtender.csproj

@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -43,9 +52,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\bin\Debug\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="OINA.Extender, Version=4.2.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
+    <Reference Include="OINA.Extender, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\bin\Debug\OINA.Extender.dll</HintPath>
+      <HintPath>..\Extender\OINA.Extender.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 9 - 0
FileManager/FileManager.csproj

@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 21 - 2
HOZ.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1145
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31019.35
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitControl", "HOZProject\UnitControl.csproj", "{ABBA5E64-536B-4EA0-8305-490A48822C89}"
 EndProject
@@ -34,44 +34,63 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Release50|Any CPU = Release50|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{ABBA5E64-536B-4EA0-8305-490A48822C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABBA5E64-536B-4EA0-8305-490A48822C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ABBA5E64-536B-4EA0-8305-490A48822C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABBA5E64-536B-4EA0-8305-490A48822C89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABBA5E64-536B-4EA0-8305-490A48822C89}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{ABBA5E64-536B-4EA0-8305-490A48822C89}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{00319B6F-FAD0-46B5-B76B-7164DC5CA0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{00319B6F-FAD0-46B5-B76B-7164DC5CA0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00319B6F-FAD0-46B5-B76B-7164DC5CA0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00319B6F-FAD0-46B5-B76B-7164DC5CA0D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00319B6F-FAD0-46B5-B76B-7164DC5CA0D5}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{00319B6F-FAD0-46B5-B76B-7164DC5CA0D5}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{F5092F52-1FBD-4882-BB9C-399809D87779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5092F52-1FBD-4882-BB9C-399809D87779}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5092F52-1FBD-4882-BB9C-399809D87779}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5092F52-1FBD-4882-BB9C-399809D87779}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5092F52-1FBD-4882-BB9C-399809D87779}.Release50|Any CPU.ActiveCfg = Release50|Any CPU
+		{F5092F52-1FBD-4882-BB9C-399809D87779}.Release50|Any CPU.Build.0 = Release50|Any CPU
 		{7566397D-632B-4939-8EB6-9AC620EE44F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7566397D-632B-4939-8EB6-9AC620EE44F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7566397D-632B-4939-8EB6-9AC620EE44F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7566397D-632B-4939-8EB6-9AC620EE44F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7566397D-632B-4939-8EB6-9AC620EE44F3}.Release50|Any CPU.ActiveCfg = Release|Any CPU
+		{7566397D-632B-4939-8EB6-9AC620EE44F3}.Release50|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 10 - 0
HOZProject/UnitControl.csproj

@@ -48,6 +48,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 9 - 0
MeasureData/MeasureData.csproj

@@ -31,6 +31,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FileManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 9 - 0
MeasureThread/MeasureThread.csproj

@@ -35,6 +35,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CookComputing.XmlRpcV2">
       <HintPath>.\CookComputing.XmlRpcV2.dll</HintPath>

+ 8 - 2
OxfordTest/OxfordTest.csproj

@@ -30,11 +30,17 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release50\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup />
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
@@ -44,7 +50,7 @@
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\bin\Debug\NLog.dll</HintPath>
+      <HintPath>..\bin\Release50\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

+ 9 - 0
SmartSEMControl/SmartSEMControl.csproj

@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Interop.APILib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 9 - 0
WebManager/WebManager.csproj

@@ -34,6 +34,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release50|AnyCPU'">
+    <OutputPath>..\bin\Release50\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>