From 6950e9e475ea9653b4307211e0987c2c6323dbbc Mon Sep 17 00:00:00 2001 From: Roman Belkov Date: Wed, 15 Apr 2015 13:47:02 +0300 Subject: [PATCH] Dealed with 'Windows Installer 4.5 not included' warning --- .../DiskImager.Installer.vdproj | 109 +++++++++--------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/DiskImager.Installer/DiskImager.Installer.vdproj b/DiskImager.Installer/DiskImager.Installer.vdproj index 1a8d269..a889868 100644 --- a/DiskImager.Installer/DiskImager.Installer.vdproj +++ b/DiskImager.Installer/DiskImager.Installer.vdproj @@ -14,6 +14,12 @@ "BackwardsCompatibleGUIDGeneration" = "8:TRUE" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_2A202A8E898BF0213E650B636A646B65" + "OwnerKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" + "MsmSig" = "8:_UNDEFINED" + } "Entry" { "MsmKey" = "8:_4C9E153BB206498EB3F99948F60DD2E3" @@ -22,7 +28,7 @@ } "Entry" { - "MsmKey" = "8:_6E9AF8EC5D4F379F4D34C8099B9F1E44" + "MsmKey" = "8:_8798A45953E30B8F6063024DF55EE398" "OwnerKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" "MsmSig" = "8:_UNDEFINED" } @@ -34,12 +40,6 @@ } "Entry" { - "MsmKey" = "8:_B1090C5A5662721B31DE535DD9FE3833" - "OwnerKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_8FDF365DCE9B4F70A60EF2BB1651CCBF" "MsmSig" = "8:_UNDEFINED" @@ -47,13 +47,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B1090C5A5662721B31DE535DD9FE3833" + "OwnerKey" = "8:_2A202A8E898BF0213E650B636A646B65" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6E9AF8EC5D4F379F4D34C8099B9F1E44" + "OwnerKey" = "8:_8798A45953E30B8F6063024DF55EE398" "MsmSig" = "8:_UNDEFINED" } } @@ -81,19 +81,6 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client" - { - "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" - { - "Name" = "8:Windows Installer 3.1" - "ProductCode" = "8:Microsoft.Windows.Installer.3.1" - } - } } } "Release" @@ -120,15 +107,15 @@ "ComponentsUrl" = "8:" "Items" { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client" + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client,KB2468871" { - "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client" + "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64) and Update for .NET Framework 4 (KB2468871)" + "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client,KB2468871" } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5" { - "Name" = "8:Windows Installer 3.1" - "ProductCode" = "8:Microsoft.Windows.Installer.3.1" + "Name" = "8:Windows Installer 4.5" + "ProductCode" = "8:Microsoft.Windows.Installer.4.5" } } } @@ -161,6 +148,37 @@ } "File" { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A202A8E898BF0213E650B636A646B65" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:XZ.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" + "ScatterAssemblies" + { + "_2A202A8E898BF0213E650B636A646B65" + { + "Name" = "8:XZ.NET.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:XZ.NET.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_072AE4B10D3C471AA2B16D68E3691837" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4C9E153BB206498EB3F99948F60DD2E3" { "SourcePath" = "8:..\\XZ.NET\\liblzma.dll" @@ -181,39 +199,18 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6E9AF8EC5D4F379F4D34C8099B9F1E44" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:XZ.NET, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86" - "ScatterAssemblies" - { - } - "SourcePath" = "8:XZ.NET.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_072AE4B10D3C471AA2B16D68E3691837" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B1090C5A5662721B31DE535DD9FE3833" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8798A45953E30B8F6063024DF55EE398" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { + "_8798A45953E30B8F6063024DF55EE398" + { + "Name" = "8:ICSharpCode.SharpZipLib.dll" + "Attributes" = "3:512" + } } "SourcePath" = "8:ICSharpCode.SharpZipLib.dll" "TargetName" = "8:" @@ -290,7 +287,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Disk Imager" "ProductCode" = "8:{7F9C3BF0-DDA2-4251-A434-E62ED3837FDE}" - "PackageCode" = "8:{21926A01-EA17-49C3-9730-BDDAA5C33F40}" + "PackageCode" = "8:{4BF92D0C-3A03-49B7-A40D-BEA91F44E9BB}" "UpgradeCode" = "8:{A2F957D8-23F6-44DB-A22C-CCA8275E1FCE}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE"