Ver1.32のインストーラ用の値を更新, WiX 3.11 + Win10環境でビルドできるよう設定

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..bb12ecd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+*.bat text eol=crlf encoding=cp932

diff --git a/Installer/Wptscs.en-us.wxl b/Installer/Wptscs.en-us.wxl
index f48239a..57d72e5 100644 (file)
--- a/Installer/Wptscs.en-us.wxl
+++ b/Installer/Wptscs.en-us.wxl
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="en-us" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="ProductName" Overridable="yes">Translation Support for Wikipedia Ver1.31</String>
+  <String Id="ProductName" Overridable="yes">Translation Support for Wikipedia Ver1.32</String>
   <String Id="LanguageCode" Overridable="yes">1033</String>
   <String Id="CodepageCode" Overridable="yes">1252</String>
   <String Id="Culture" Overridable="yes">en-us</String>
   <String Id="Manufacturer" Overridable="yes">honeplus</String>
   <String Id="PackageKeywords" Overridable="yes">Installer</String>
-  <String Id="PackageDescription" Overridable="yes">Translation Support for Wikipedia Ver1.31 Installer</String>
+  <String Id="PackageDescription" Overridable="yes">Translation Support for Wikipedia Ver1.32 Installer</String>
   <String Id="ExeShortcutName" Overridable="yes">Translation Support for Wikipedia</String>
   <String Id="AppUrlInfoAbout" Overridable="yes">https://osdn.net/projects/wptscs/</String>
   <String Id="NoDowngradeMsg" Overridable="yes">A later version of [ProductName] is already installed.</String>
-  <String Id="NetFrameworkMsg" Overridable="yes">This setup requires the .NET Framework 4.0 client profile installed.</String>
 </WixLocalization>

diff --git a/Installer/Wptscs.ja-jp.wxl b/Installer/Wptscs.ja-jp.wxl
index ab4d199..83278a6 100644 (file)
--- a/Installer/Wptscs.ja-jp.wxl
+++ b/Installer/Wptscs.ja-jp.wxl
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WixLocalization Culture="ja-jp" Codepage="932" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  <String Id="ProductName" Overridable="yes">Wikipedia 翻訳支援ツール Ver1.31</String>
+  <String Id="ProductName" Overridable="yes">Wikipedia 翻訳支援ツール Ver1.32</String>
   <String Id="LanguageCode" Overridable="yes">1041</String>
   <String Id="CodepageCode" Overridable="yes">932</String>
   <String Id="Culture" Overridable="yes">ja-jp</String>
   <String Id="Manufacturer" Overridable="yes">honeplus</String>
   <String Id="PackageKeywords" Overridable="yes">インストーラ</String>
-  <String Id="PackageDescription" Overridable="yes">Wikipedia 翻訳支援ツール Ver1.31 インストーラ</String>
+  <String Id="PackageDescription" Overridable="yes">Wikipedia 翻訳支援ツール Ver1.32 インストーラ</String>
   <String Id="ExeShortcutName" Overridable="yes">Wikipedia 翻訳支援ツール</String>
   <String Id="AppUrlInfoAbout" Overridable="yes">https://ja.osdn.net/projects/wptscs/</String>
   <String Id="NoDowngradeMsg" Overridable="yes">[ProductName] の新しいバージョンが既にインストールされています。</String>
-  <String Id="NetFrameworkMsg" Overridable="yes">このセットアップを実行するためには、.NET Framework 4.0 Client Profile がインストールされている必要があります。</String>
 </WixLocalization>

diff --git a/Installer/Wptscs.wxs b/Installer/Wptscs.wxs
index d790f73..9537fd4 100644 (file)
--- a/Installer/Wptscs.wxs
+++ b/Installer/Wptscs.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?define ProductVersion="1.3.1" ?>
-  <?define ProductGUID="{7446ECCE-2E69-449B-9EA9-F84724122026}" ?>
+  <?define ProductVersion="1.3.2" ?>
+  <?define ProductGUID="{C8286B4C-8F7D-4063-AA07-462DF9EA716D}" ?>
   <?define ProductUpgradeCode="{8A17447B-F484-4b42-98C4-317216CCEB78}" ?>
   <?define MainExecutableGUID="{3F07C4BD-A267-4E3D-B1A5-4F5F36ABC681}" ?>
   <?define ResourceJAGUID="{A3DB3F56-B8EF-42ca-8891-26378B9A5DBE}" ?>
@@ -97,10 +97,5 @@
       <Custom Action="NoDowngrade" After="FindRelatedProducts">NEWERFOUND</Custom>
       <RemoveExistingProducts After="InstallInitialize" />
     </InstallExecuteSequence>
-
-    <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
-    <Condition Message="!(loc.NetFrameworkMsg)">
-      <![CDATA[Installed OR NETFRAMEWORK40CLIENT]]>
-    </Condition>
   </Product>
 </Wix>

diff --git a/Installer/buildMsi.bat b/Installer/buildMsi.bat
index fbdec02..0705da5 100644 (file)
--- a/Installer/buildMsi.bat
+++ b/Installer/buildMsi.bat
@@ -10,10 +10,10 @@ rem
 setlocal
 
 rem WiX\82È\82ç\82Ñ\82ÉWindows SDK\83C\83\93\83X\83g\81[\83\8b\83t\83H\83\8b\83_
-set WIX=%ProgramFiles(x86)%\WiX Toolset v3.8
-set WINSDK=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A
-set WINKIT=%ProgramFiles(x86)%\Windows Kits\8.1
-set PATH=%WIX%\bin;%WINSDK%\Bin;%WINKIT%\bin\x86;%PATH%
+rem \81¦ WiX\82âSDK\82Ì\83o\81[\83W\83\87\83\93\82ª\95Ï\82í\82Á\82½\8dÛ\82Í\81A\83p\83X\82ð\8f\91\82«\8a·\82¦\82Ä\82­\82¾\82³\82¢\81B
+set WIX_BIN=%ProgramFiles(x86)%\WiX Toolset v3.11\bin
+set WINKIT_BIN=%ProgramFiles(x86)%\Windows Kits\10\bin\10.0.17134.0\x86
+set PATH=%WIX_BIN%;%WINKIT_BIN%;%PATH%
 
 rem WiX\83r\83\8b\83h\83t\83@\83C\83\8b\81i\88È\89º\81A\83t\83@\83C\83\8b\96¼\82Í\82±\82Ì\83o\83b\83`\82©\82ç\82Ì\91\8a\91Î\83p\83X\81j
 set WXS_FILE=Wptscs.wxs