diff --git a/XP.Installer/README.md b/XP.Installer/README.md index 7bce4f0f..e20db6f5 100644 --- a/XP.Installer/README.md +++ b/XP.Installer/README.md @@ -108,7 +108,7 @@ Bootstrapper(BundleInstaller.exe) ### 产品文件清单 -`ReleaseFilesRoot.wxs` 定义 `APPLICATIONFOLDER\ReleaseFiles` 目录,`ReleaseFiles.generated.wxs` 根据 `D:\XplorePlane\ReleaseFiles` 生成产品文件和子目录清单。换机器或换版本时,应先准备新的 `ReleaseFiles` 发布目录,再重新生成该文件。 +`ReleaseFilesRoot.wxs` 定义应用安装根目录,`ReleaseFiles.generated.wxs` 根据 `D:\XplorePlane\ReleaseFiles` 生成产品文件和子目录清单;发布文件最终直接安装到 `APPLICATIONFOLDER`。换机器或换版本时,应先准备新的 `ReleaseFiles` 发布目录,再重新生成该文件。 可以使用 `Setup\Scripts\Generate-ReleaseFilesWxs.ps1` 自动生成文件清单: diff --git a/XP.Installer/Setup/BundleInstaller/ReleaseFiles.generated.wxs b/XP.Installer/Setup/BundleInstaller/ReleaseFiles.generated.wxs index 5cc8a38a..8307b63b 100644 --- a/XP.Installer/Setup/BundleInstaller/ReleaseFiles.generated.wxs +++ b/XP.Installer/Setup/BundleInstaller/ReleaseFiles.generated.wxs @@ -1,7 +1,7 @@ - + - + @@ -16,508 +16,508 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/XP.Installer/Setup/BundleInstaller/ReleaseFilesRoot.wxs b/XP.Installer/Setup/BundleInstaller/ReleaseFilesRoot.wxs index 8d703977..448b756c 100644 --- a/XP.Installer/Setup/BundleInstaller/ReleaseFilesRoot.wxs +++ b/XP.Installer/Setup/BundleInstaller/ReleaseFilesRoot.wxs @@ -6,7 +6,6 @@ - diff --git a/XP.Installer/Setup/BundleInstaller/Setup.wxs b/XP.Installer/Setup/BundleInstaller/Setup.wxs index dfd5d396..b10c9a29 100644 --- a/XP.Installer/Setup/BundleInstaller/Setup.wxs +++ b/XP.Installer/Setup/BundleInstaller/Setup.wxs @@ -1048,12 +1048,12 @@ - + - + diff --git a/XP.Installer/Setup/Scripts/Generate-ReleaseFilesWxs.ps1 b/XP.Installer/Setup/Scripts/Generate-ReleaseFilesWxs.ps1 index 4c461de0..e25e1181 100644 --- a/XP.Installer/Setup/Scripts/Generate-ReleaseFilesWxs.ps1 +++ b/XP.Installer/Setup/Scripts/Generate-ReleaseFilesWxs.ps1 @@ -37,7 +37,7 @@ New-Item -ItemType Directory -Path $outputDirectory -Force | Out-Null $heatArguments = @( 'dir', $ReleaseFilesRoot, '-cg', 'ReleaseFilesComponents', - '-dr', 'RELEASEFILES', + '-dr', 'APPLICATIONFOLDER', '-ag', '-srd', '-sreg',