diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 64f654f..73a2127 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index deef7b8..151fd61 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 9bdbb0d..a213861 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index 91c4c12..b9a8c1d 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -39,12 +39,6 @@ } "Entry" { - "MsmKey" = "8:_A2E1D22A258149598421CC2E67C3E0B5" - "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A3417E9C9F294832AE49B5BDAF95E373" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -57,14 +51,14 @@ } "Entry" { - "MsmKey" = "8:_CB0B86840CFC4FC5A160775BF6BAFFE1" - "OwnerKey" = "8:_A2E1D22A258149598421CC2E67C3E0B5" + "MsmKey" = "8:_D1C39E656EFE4081A0B12E3E0B039A48" + "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD" + "MsmKey" = "8:_DAAACD51691948DDAF8A1F635CE74FD7" + "OwnerKey" = "8:_D1C39E656EFE4081A0B12E3E0B039A48" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -73,6 +67,12 @@ "OwnerKey" = "8:_7746D2D347F0423FB46FA2300F6158A4" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BFEA9BAA0DBF4332913A71EDE89FC3CD" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -81,7 +81,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\MasterEditorTWLSetup.msi" + "OutputFilename" = "8:..\\..\\..\\bin\\MasterEditorTWLSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -118,7 +118,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\MasterEditorTWLSetup.msi" + "OutputFilename" = "8:..\\..\\..\\bin\\MasterEditorTWLSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -262,9 +262,14 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.2.3274.18505, Culture=ja, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:MasterEditorTWL.resources, Version=1.3.3300.27400, Culture=ja, processorArchitecture=MSIL" "ScatterAssemblies" { + "_BFEA9BAA0DBF4332913A71EDE89FC3CD" + { + "Name" = "8:MasterEditorTWL.resources.dll" + "Attributes" = "3:512" + } } "SourcePath" = "8:..\\Release\\ja\\MasterEditorTWL.resources.dll" "TargetName" = "8:" @@ -374,7 +379,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MasterEditorTWL" "ProductCode" = "8:{B12B5AFF-26D1-47B5-85B6-1E2A7B5106F5}" - "PackageCode" = "8:{C04E7F56-844A-4469-81DE-F373BA012903}" + "PackageCode" = "8:{B5B2BB09-AD1A-47DE-B067-897C72BB682C}" "UpgradeCode" = "8:{CE22C209-7AE1-4F58-8F6B-6D044BA2A118}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" @@ -903,7 +908,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A2E1D22A258149598421CC2E67C3E0B5" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D1C39E656EFE4081A0B12E3E0B039A48" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -917,7 +922,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_CB0B86840CFC4FC5A160775BF6BAFFE1" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DAAACD51691948DDAF8A1F635CE74FD7" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" diff --git a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.ncb index e15b7df..df40e6b 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.suo index dc2e5df..9c74427 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 21dc1e7..65d316c 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj index 051f99e..b987710 100644 --- a/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj +++ b/build/tools/MasterEditor/MasterEditorTWL_System/MasterEditorTWL/MasterEditorTWLSetup/MasterEditorTWLSetup.vdproj @@ -51,34 +51,10 @@ } "Entry" { - "MsmKey" = "8:_A20C763E12AD4F8D89AA75614EC512AE" - "OwnerKey" = "8:_E9F819CC64B74E98BE875DF9E02D9A4C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D6C5E0BD8D77477AB78D18A49CC6380F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } - "Entry" - { - "MsmKey" = "8:_E9F819CC64B74E98BE875DF9E02D9A4C" - "OwnerKey" = "8:_8FC46C7CA4D3460BB25CA43B27466C00" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8FC46C7CA4D3460BB25CA43B27466C00" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D6C5E0BD8D77477AB78D18A49CC6380F" - "MsmSig" = "8:_UNDEFINED" - } } "Configurations" { @@ -97,13 +73,21 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\MasterEditorTWLSetup.msi" + "OutputFilename" = "8:..\\..\\..\\..\\bin\\MasterEditorTWL_SystemSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -908,34 +892,6 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A20C763E12AD4F8D89AA75614EC512AE" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_crt_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E9F819CC64B74E98BE875DF9E02D9A4C" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" {