Updated the samples to 3.0.1 which corresponds to this dev version.

Note that until the hotfix is distributed on nuget you will need to manually build the nuget package (run build.bat).
charlesw · Dec 22, 2015 · 3ea136c · 3ea136c
1 parent ab4d506
commit 3ea136c
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 51 deletions.
diff --git a/Samples/Tesseract.ConsoleDemo/Tesseract.ConsoleDemo.csproj b/Samples/Tesseract.ConsoleDemo/Tesseract.ConsoleDemo.csproj
@@ -46,35 +46,19 @@
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <ProjectReference Include="..\..\src\Tesseract\Tesseract.csproj">
-      <Project>{DA780CA0-2606-4259-91C4-3F38C5C90592}</Project>
-      <Name>Tesseract</Name>
-	  <IlMerge>True</IlMerge>
-    </ProjectReference>
+    <Reference Include="Tesseract, Version=3.0.1.0, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
+      <HintPath>..\packages\Tesseract.3.0.1.0\lib\net40\Tesseract.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FormattedConsoleLogger.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\lib\TesseractOcr\x64\liblept171.dll">
-      <Link>x64\liblept171.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\src\lib\TesseractOcr\x64\libtesseract304.dll">
-      <Link>x64\libtesseract304.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\src\lib\TesseractOcr\x86\liblept171.dll">
-      <Link>x86\liblept171.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\src\lib\TesseractOcr\x86\libtesseract304.dll">
-      <Link>x86\libtesseract304.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="phototest.tif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -106,12 +90,19 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="x64\liblept171.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\libtesseract304.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\liblept171.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\libtesseract304.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="MergeAssemblies" AfterTargets="AfterBuild">
-    <CreateItem Include="@(ReferencePath)" Condition="'%(CopyLocal)'=='true' and '%(ReferencePath.IlMerge)'=='true'">
-      <Output TaskParameter="Include" ItemName="IlmergeAssemblies" />
-    </CreateItem>
-    <Message Text="MERGING: @(IlmergeAssemblies->'%(Filename)')" Importance="High" />
-    <Exec Command="&quot;$(SolutionDir)packages\ILMerge.2.14.1208\tools\Ilmerge.exe&quot; /lib:&quot;$(MSBuildBinPath)&quot; /targetplatform:v4 /out:&quot;@(MainAssembly)&quot; &quot;@(IntermediateAssembly)&quot; @(IlmergeAssemblies->'&quot;%(FullPath)&quot;', ' ')" />
-  </Target>
 </Project>
diff --git a/Samples/Tesseract.ConsoleDemo/packages.config b/Samples/Tesseract.ConsoleDemo/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ILMerge" version="2.14.1208" targetFramework="net40" />
-  <package id="Tesseract" version="2.3.0.0" targetFramework="net40" />
+  <package id="Tesseract" version="3.0.1.0" targetFramework="net40" />
 </packages>
diff --git a/Samples/Tesseract.ConsoleDemo/x64/liblept171.dll b/Samples/Tesseract.ConsoleDemo/x64/liblept171.dll
diff --git a/Samples/Tesseract.ConsoleDemo/x64/libtesseract304.dll b/Samples/Tesseract.ConsoleDemo/x64/libtesseract304.dll
diff --git a/Samples/Tesseract.ConsoleDemo/x86/liblept171.dll b/Samples/Tesseract.ConsoleDemo/x86/liblept171.dll
diff --git a/Samples/Tesseract.ConsoleDemo/x86/libtesseract304.dll b/Samples/Tesseract.ConsoleDemo/x86/libtesseract304.dll
diff --git a/Samples/Tesseract.WebDemo/Tesseract.WebDemo.csproj b/Samples/Tesseract.WebDemo/Tesseract.WebDemo.csproj
@@ -28,6 +28,7 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -69,10 +70,10 @@
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <ProjectReference Include="..\..\src\Tesseract\Tesseract.csproj">
-      <Project>{DA780CA0-2606-4259-91C4-3F38C5C90592}</Project>
-      <Name>Tesseract</Name>
-    </ProjectReference>
+    <Reference Include="Tesseract, Version=3.0.1.0, Culture=neutral, PublicKeyToken=ebeb3d86bef60cbe, processorArchitecture=MSIL">
+      <HintPath>..\packages\Tesseract.3.0.1.0\lib\net40\Tesseract.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -85,22 +86,18 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\lib\TesseractOcr\x64\liblept171.dll">
-      <Link>x64\liblept171.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\src\lib\TesseractOcr\x64\libtesseract304.dll">
-      <Link>x64\libtesseract304.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\src\lib\TesseractOcr\x86\liblept171.dll">
-      <Link>x86\liblept171.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\src\lib\TesseractOcr\x86\libtesseract304.dll">
-      <Link>x86\libtesseract304.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <Content Include="x64\liblept171.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\libtesseract304.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\liblept171.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\libtesseract304.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\bootstrap-theme.css" />
     <None Include="Content\bootstrap-theme.min.css" />
     <None Include="Content\bootstrap.css" />

diff --git a/Samples/Tesseract.WebDemo/packages.config b/Samples/Tesseract.WebDemo/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="bootstrap" version="3.0.3" targetFramework="net451" />
   <package id="jQuery" version="1.9.1" targetFramework="net451" />
-  <package id="Tesseract" version="2.3.0.0" targetFramework="net40" />
+  <package id="Tesseract" version="3.0.1.0" targetFramework="net40" />
   <package id="Twitter.Bootstrap" version="3.0.1.1" targetFramework="net451" />
 </packages>
diff --git a/Samples/Tesseract.WebDemo/x64/liblept171.dll b/Samples/Tesseract.WebDemo/x64/liblept171.dll
diff --git a/Samples/Tesseract.WebDemo/x64/libtesseract304.dll b/Samples/Tesseract.WebDemo/x64/libtesseract304.dll
diff --git a/Samples/Tesseract.WebDemo/x86/liblept171.dll b/Samples/Tesseract.WebDemo/x86/liblept171.dll
diff --git a/Samples/Tesseract.WebDemo/x86/libtesseract304.dll b/Samples/Tesseract.WebDemo/x86/libtesseract304.dll