Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-02 df455987cd863eb5531c34533d63ed8f4f15230c

 src/Bro.Process/Bro.Process.csproj

@@ -128,9 +128,7 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
    <None Include="Setting.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <None Include="Setting.json" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Forms\Calibration\FrmCalibration_9P.resx">