merge

xcd

2020-07-06 0f71990dc60af6e96c9f4c2f2095ca6711e2c870

 src/Bro.M071.Process.Model/Bro.M071.Model.csproj

@@ -109,9 +109,10 @@
    <Compile Include="BaseModel.cs" />
    <Compile Include="DBModel.cs" />
    <Compile Include="Migrations\Configuration.cs" />
    <Compile Include="Model\ManualDetectionRecords.cs" />
    <Compile Include="Model\EventTimeRecords.cs" />
    <Compile Include="Model\OperationRecords.cs" />
    <Compile Include="Model\KeyUnitData.cs" />
    <Compile Include="Model\MeasurementUnitResult.cs" />
    <Compile Include="Model\ProductionMeasurementRecords.cs" />
    <Compile Include="Model\MeasurementAndKeyDataRelation.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
@@ -121,7 +122,12 @@
    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup>
    <ProjectReference Include="..\Bro.Common.Model\Bro.Common.Model.csproj">
      <Project>{1A3CBFE7-3F78-42C3-95C5-10360450DBEA}</Project>
      <Name>Bro.Common.Model</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>