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

xcd

2020-07-14 12200ec69e33881649974f31f270750ba6b15e1d

 src/Bro.Process/Bro.Process.csproj

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