Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -1062,6 +1062,7 @@ namespace OTSIncAReportApp
             openFileDialog.Multiselect = false;
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
+                this.Cursor = Cursors.WaitCursor;
                 string strFilePath = System.IO.Path.GetDirectoryName(openFileDialog.FileName);
 
                 System.IO.DirectoryInfo folder = new System.IO.DirectoryInfo(strFilePath);
@@ -1073,6 +1074,7 @@ namespace OTSIncAReportApp
                         this.m_RstWindow.AddSampleResult(file.FullName);
                     }
                 }
+                this.Cursor = Cursors.Default;
                 return true;
             }
 

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -263,6 +263,9 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto">
       <HintPath>..\OpenDll\WordApiDll\BouncyCastle.Crypto.dll</HintPath>
@@ -1697,7 +1700,11 @@
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>If $(Configuration) == Debug (
+echo debug donot copy files
+) else (
+ xcopy /E /I /Y "$(SolutionDir)Bin\x64\Debug\Config" "$(TargetDir)Config"
+xcopy /E /I /Y "$(SolutionDir)Bin\x64\Debug\Resources" "$(TargetDir)Resources" 
+)</PostBuildEvent>
   </PropertyGroup>
 </Project>