Merge pull request #2 from wbicode/2.0.0

updated to tika release 2.0.0
wbicode · Aug 9, 2021 · d593e3d · d593e3d
2 parents cf4823b + 43c8802
commit d593e3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/TikaServiceInstaller/Product.wxs b/TikaServiceInstaller/Product.wxs
@@ -10,7 +10,8 @@
   <!-- 1.0.1-1.1.0: {81069BBB-47A8-46D8-9C30-880536ABE299} -> for tika.server 1.20 -->
   <!-- 1.1.1-onwards: {36BF5421-A13A-49D3-9E9D-A87450D32935} -> for tika.server 1.21 -->
   <!-- 1.26.0: {d7a7983f-8c31-4883-86a9-16e114182601} -> for tika.server 1.26-->
-  <Product Id="{d7a7983f-8c31-4883-86a9-16e114182601}"
+  <!-- 2.0.0: {3cb5c81e-f913-11eb-9a03-0242ac130003} -> for tika.server 2.2.0-->
+  <Product Id="{3cb5c81e-f913-11eb-9a03-0242ac130003}"
            Name="$(var.ProductName)"
            Language="1033"
            Version="$(var.BuildVersion)"
@@ -223,4 +224,4 @@
     <CustomAction Id="UninstallTSProcrun" BinaryKey="WixCA" DllEntry="$(var.WixQuietExec)" Impersonate="no" Execute="deferred" Return="check" />
     <SetProperty Id="UninstallTSProcrun" Value="&quot;[INSTALLFOLDER]install/[PREVIOUS_PRUNSRV_NAME]&quot; //DS//[PREVIOUS_SERVICE_NAME]" Sequence="execute" Before="UninstallTSProcrun" />
   </Fragment>
-</Wix>
+</Wix>
diff --git a/TikaServiceInstaller/TikaServiceInstaller.wixproj b/TikaServiceInstaller/TikaServiceInstaller.wixproj
@@ -93,10 +93,10 @@
     <PropertyGroup>
       <DefineConstants>BasePath=$(ProjectDir)\TikaServiceDownload;BuildVersion=$(BuildVersion);BuildVersionExact=$(BuildVersionExact)</DefineConstants>
     </PropertyGroup>
-    <DownloadFile SourceUrl="https://github.com/wbicode/TikaService/releases/download/1.26.0/TikaService-1.26.0.zip" DestinationFolder="$(MSBuildProjectDirectory)" Condition="!Exists('TikaService-1.26.0.zip')">
+    <DownloadFile SourceUrl="https://github.com/wbicode/TikaService/releases/download/2.0.0/TikaService-2.0.0.zip" DestinationFolder="$(MSBuildProjectDirectory)" Condition="!Exists('TikaService-2.0.0.zip')">
       <Output TaskParameter="DownloadedFile" ItemName="Content" />
     </DownloadFile>
-    <Unzip SourceFiles="$(ProjectDir)/TikaService-1.26.0.zip" DestinationFolder="$(ProjectDir)/TikaServiceDownload" OverwriteReadOnlyFiles="true" ContinueOnError="true" />
+    <Unzip SourceFiles="$(ProjectDir)/TikaService-2.0.0.zip" DestinationFolder="$(ProjectDir)/TikaServiceDownload" OverwriteReadOnlyFiles="true" ContinueOnError="true" />
     <!-- harvest file components from publish folder-->
     <HeatDirectory OutputFile="ComponentsGenerated.wxs" Transforms="neverOverwriteConfigs.xslt" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="PublishedComponents" SuppressCom="true" Directory="$(ProjectDir)\TikaServiceDownload" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" />
   </Target>
@@ -105,4 +105,4 @@
   <PropertyGroup>
     <PostBuildEvent>RD /S /Q "$(ProjectDir)TikaServiceDownload\</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>