Merge branch 'EDS' of http://192.168.1.123:10080/SDD1/HOZ into EDS

MeasureThread/MeasureThread.csproj

@@ -75,8 +75,13 @@
   <ItemGroup>
     <Compile Include="IMath.cs" />
     <Compile Include="Measure.cs" />
+    <Compile Include="Helpers\NewFunMethod.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ThreadStatus.cs" />
+    <Compile Include="UserControls\Control_XRayTable.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UserControls\Control_XRayTable.designer.cs" />
     <Compile Include="XmlRpcClient.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -109,6 +114,10 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="UserControls\Control_XRayTable.resx" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

SmartSEMControl/SmartSEMControl.csproj

@@ -67,6 +67,17 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="APILib">
+      <Guid>{71BD42C1-EBD3-11D0-AB3A-444553540000}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>