Merge pull request #53 from KevM/tika-1-13

Update Tika to 1.13

Contributing.md

@@ -0,0 +1,26 @@
+# Contributing
+
+We love it when people help us out.
+
+## Having a problem?
+
+Search in the [Issues](https://github.com/KevM/tikaondotnet/issues?utf8=✓&q=is%3Aissue%20)
+as your problem may be a common one. If don't find your problem. Do [create an
+issue](https://github.com/KevM/tikaondotnet/issues/new). Contributors here will
+chime in when they can.
+
+## Getting Started
+
+Check out the [ReadMe](https://github.com/KevM/tikaondotnet). It should have
+everything you need to get started.
+
+### The Usual
+
+Did a new version of Tika come out and you want to get the Nuget updated? This is
+very common so check out the ReadMe on [Updating Tika](https://github.com/KevM/tikaondotnet#updating-tika).
+After you've got the new version building, [create a pull request](https://help.github.com/articles/using-pull-requests/).
+Once it is merged a [Nuget will be published](https://www.nuget.org/packages/TikaOnDotNet/).
+
+## How can I help? 
+
+This project typically [has a few up for grabs issues](https://github.com/KevM/tikaondotnet/issues?q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs).

Readme.md

@@ -10,9 +10,14 @@ This project is a simple wrapper around the very excellent and robust
 
 ## Building
 
+The build automation expects the source to [reside within a Git repo](https://github.com/KevM/tikaondotnet/issues/52) so the first step is to clone the repo [using Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
+
+```git clone https://github.com/KevM/tikaondotnet.git```
+
 This project uses [FAKE](http://fsharp.github.io/FAKE/) for build automation and
 [Paket](https://fsprojects.github.io/Paket/) for managing dependencies.
 
+
 **Note:** Your first build should be from the command line to get the assembly version file created.
 
 `./build.cmd`

Release-Notes.md

@@ -1,3 +1,7 @@
+## 1.13
+
+- Updated Tika dependency to 1.13.
+
 ## 1.12.2
 
 - Breaking Change: Renamed the namespace and assembly name of TikaOnDotNet to match the Nuget id (was `tika-app`). This should only affect the resulting filename of the assembly. All Tika code is namespaced with a Java style (com.apache.{yadda yadda}).

paket.dependencies

@@ -3,7 +3,6 @@ source https://www.nuget.org/api/v2
 nuget FAKE
 
 nuget FSharp.Management
-nuget FubuCore ~> 1.4
 nuget NUnit ~> 2
 nuget NUnit.Runners ~> 2
 nuget FluentAssertions
@@ -13,4 +12,4 @@ nuget IKVM 8.1.5717
 http http://www.frijters.net/ikvmbin-8.1.5717.0.zip
 
 //Tika release Jar URL
-http http://www-us.apache.org/dist/tika/tika-app-1.12.jar
+http http://www-us.apache.org/dist/tika/tika-app-1.13.jar

src/TikaOnDotNet.Tests/TikaOnDotNet.Tests.csproj

@@ -85,6 +85,10 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <UsingTask TaskName="CopyRuntimeDependencies" AssemblyFile="..\..\.paket\paket.exe" />
+  <Target Name="AfterBuild" Condition="Exists('..\..\.paket\paket.exe')">
+    <CopyRuntimeDependencies OutputPath="$(OutDir)" TargetFramework="$(TargetFrameworkIdentifier) - $(TargetFrameworkVersion)" ProjectsWithRuntimeLibs="System.Diagnostics.Contracts;System.Linq.Expressions;System.Reflection.TypeExtensions;System.Threading" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -116,34 +120,6 @@
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
-      <ItemGroup>
-        <Reference Include="FluentAssertions.Core">
-          <HintPath>..\..\packages\FluentAssertions\lib\net40\FluentAssertions.Core.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="FluentAssertions">
-          <HintPath>..\..\packages\FluentAssertions\lib\net40\FluentAssertions.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
-      <ItemGroup>
-        <Reference Include="FluentAssertions.Core">
-          <HintPath>..\..\packages\FluentAssertions\lib\net45\FluentAssertions.Core.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="FluentAssertions">
-          <HintPath>..\..\packages\FluentAssertions\lib\net45\FluentAssertions.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
     <When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
       <ItemGroup>
         <Reference Include="FluentAssertions.Core">
@@ -246,14 +222,35 @@
         </Reference>
       </ItemGroup>
     </When>
+    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0'))">
+      <ItemGroup>
+        <Reference Include="FluentAssertions.Core">
+          <HintPath>..\..\packages\FluentAssertions\lib\net40\FluentAssertions.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="FluentAssertions">
+          <HintPath>..\..\packages\FluentAssertions\lib\net40\FluentAssertions.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5')) Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2'))">
+      <ItemGroup>
+        <Reference Include="FluentAssertions.Core">
+          <HintPath>..\..\packages\FluentAssertions\lib\net45\FluentAssertions.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="FluentAssertions">
+          <HintPath>..\..\packages\FluentAssertions\lib\net45\FluentAssertions.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
   </Choose>
-  <ItemGroup>
-    <Reference Include="FubuCore">
-      <HintPath>..\..\packages\FubuCore\lib\FubuCore.dll</HintPath>
-      <Private>True</Private>
-      <Paket>True</Paket>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="IKVM.AWT.WinForms">
       <HintPath>..\..\packages\IKVM\lib\IKVM.AWT.WinForms.dll</HintPath>

src/TikaOnDotNet.Tests/paket.references

@@ -1,4 +1,3 @@
-FubuCore
 NUnit
 FluentAssertions
 IKVM

src/TikaOnDotnet.TextExtractor/TikaOnDotnet.TextExtraction.csproj

@@ -61,6 +61,10 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <None Include="paket.references" />
+    <None Include="paket.template" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="IKVM.AWT.WinForms">
       <HintPath>..\..\packages\IKVM\lib\IKVM.AWT.WinForms.dll</HintPath>
@@ -203,8 +207,4 @@
       <Paket>True</Paket>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="paket.references" />
-    <None Include="paket.template" />
-  </ItemGroup>
 </Project>