Merge branch 'release/1.1.0'

wbicode · May 28, 2019 · 997b5ed · 997b5ed
2 parents 9513d2e + 558576e
commit 997b5ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/TikaServiceInstaller/Product.wxs b/TikaServiceInstaller/Product.wxs
@@ -73,6 +73,7 @@
     <UIRef Id="InstallerUI" />
 
     <!-- Properties for TikaServiceDlg.wxs -->
+    <!-- they may get overwritten when upgrading or uninstalling inside PreviousProperties.wxs -->
     <Property Id="SERVICE_PORT" Value="9997" />
     <Property Id="SERVICE_HOST" Value="localhost" />
     <Property Id='SERVICE_NAME' Value='TikaService' />

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.0.4/TikaService-1.0.4.zip" DestinationFolder="$(MSBuildProjectDirectory)" Condition="!Exists('TikaService-1.0.4.zip')">
+    <DownloadFile SourceUrl="https://github.com/wbicode/TikaService/releases/download/1.1.0/TikaService-1.1.0.zip" DestinationFolder="$(MSBuildProjectDirectory)" Condition="!Exists('TikaService-1.1.0.zip')">
       <Output TaskParameter="DownloadedFile" ItemName="Content" />
     </DownloadFile>
-    <Unzip SourceFiles="$(ProjectDir)/TikaService-1.0.4.zip" DestinationFolder="$(ProjectDir)/TikaServiceDownload" OverwriteReadOnlyFiles="true" ContinueOnError="true" />
+    <Unzip SourceFiles="$(ProjectDir)/TikaService-1.1.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>