Merge pull request #5 from juchong/watchdog

Updated resources
analogdevicesinc · Nov 22, 2019 · 2cc22be · 2cc22be
2 parents 5cc568e + 922d780
commit 2cc22be
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/FX3-ExampleGui.vbproj b/FX3-ExampleGui.vbproj
@@ -88,6 +88,10 @@
     <Reference Include="CyUSB">
       <HintPath>Resources\CyUSB.dll</HintPath>
     </Reference>
+    <Reference Include="FX3Api, Version=2.1.6.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Resources\FX3Api.dll</HintPath>
+    </Reference>
     <Reference Include="FX3USB, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Resources\FX3USB.dll</HintPath>
@@ -386,12 +390,6 @@
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\iSensor-FX3-API\FX3Api.vbproj">
-      <Project>{a553cac3-91bb-4ed1-914b-f55f1468b0c6}</Project>
-      <Name>FX3Api</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>XCOPY /y "$(TargetDir)*" "T:\~Lab_SW_Tools\iSensor-FX3-Gui\iSensor-FX3-Gui-Build"</PostBuildEvent>

diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
@@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
 <Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("2.1.5.1")>
+<Assembly: AssemblyFileVersion("2.1.6.0")>
diff --git a/Resources/FX3Api.dll b/Resources/FX3Api.dll
diff --git a/Resources/FX3Api.xml b/Resources/FX3Api.xml
diff --git a/Resources/FX3USB.dll b/Resources/FX3USB.dll
diff --git a/Resources/StreamDataLogger.dll b/Resources/StreamDataLogger.dll