Fix VC++ builds and sync up installers.

[thirdparty/cups.git] / vcnet / ipptool-installer.vdproj

diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj
index 45f9084a29a7ef825a98a1928cba9bb3db121b6b..89cf278b393c0cc714b1695a17568ec66c3076d5 100644 (file)
--- a/vcnet/ipptool-installer.vdproj
+++ b/vcnet/ipptool-installer.vdproj
@@ -27,12 +27,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_1E4B2A9BD6A44926B719E0D7E8FC0952"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -81,6 +75,18 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
+        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
+        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -123,20 +129,14 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
+        "MsmKey" = "8:_962EDAE5C1924E75B67815861062D102"\r
+        "OwnerKey" = "8:_53657E2E11814303B218D8DF1CED7298"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9FBF78D7B89EEA843380D5F10E1954D7"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_AB0BD66B57BF4C41BE53BCE573C254BC"\r
-        "OwnerKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
+        "MsmKey" = "8:_A63C5C4108AB4B588878482B26876DC5"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -255,24 +255,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
-        "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
-        "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13"\r
-        "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_F22F5380A6E14A43A15A452C7C6F6C07"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -414,26 +396,6 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE"\r
-            {\r
-            "SourcePath" = "8:zlibwapi.dll"\r
-            "TargetName" = "8:zlibwapi.dll"\r
-            "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
-            "Condition" = "8:"\r
-            "Transitive" = "11:FALSE"\r
-            "Vital" = "11:TRUE"\r
-            "ReadOnly" = "11:FALSE"\r
-            "Hidden" = "11:FALSE"\r
-            "System" = "11:FALSE"\r
-            "Permanent" = "11:FALSE"\r
-            "SharedLegacy" = "11:FALSE"\r
-            "PackageAs" = "3:1"\r
-            "Register" = "3:1"\r
-            "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:TRUE"\r
-            "IsolateTo" = "8:"\r
-            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E4B2A9BD6A44926B719E0D7E8FC0952"\r
             {\r
             "SourcePath" = "8:..\\test\\get-printer-attributes.test"\r
@@ -734,32 +696,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A63C5C4108AB4B588878482B26876DC5"\r
             {\r
-            "SourcePath" = "8:CRYPT32.dll"\r
-            "TargetName" = "8:CRYPT32.dll"\r
+            "SourcePath" = "8:..\\test\\validate-job.test"\r
+            "TargetName" = "8:validate-job.test"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
-            "Condition" = "8:"\r
-            "Transitive" = "11:FALSE"\r
-            "Vital" = "11:TRUE"\r
-            "ReadOnly" = "11:FALSE"\r
-            "Hidden" = "11:FALSE"\r
-            "System" = "11:FALSE"\r
-            "Permanent" = "11:FALSE"\r
-            "SharedLegacy" = "11:FALSE"\r
-            "PackageAs" = "3:1"\r
-            "Register" = "3:1"\r
-            "Exclude" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
-            "IsolateTo" = "8:"\r
-            }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FBF78D7B89EEA843380D5F10E1954D7"\r
-            {\r
-            "SourcePath" = "8:Secur32.dll"\r
-            "TargetName" = "8:Secur32.dll"\r
-            "Tag" = "8:"\r
-            "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D"\r
+            "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -770,8 +712,8 @@
             "SharedLegacy" = "11:FALSE"\r
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
-            "Exclude" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF057921D20E4520A3C6420F0729A744"\r
@@ -1193,7 +1135,7 @@
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:ipptool for Windows"\r
         "ProductCode" = "8:{BADD3454-4180-4519-B1CA-5C255DAB0047}"\r
-        "PackageCode" = "8:{3C801C7B-F294-47ED-9146-D35C6B48C3B9}"\r
+        "PackageCode" = "8:{96C55675-F0E6-405C-B8EF-F1BFF11F94A5}"\r
         "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}"\r
         "RestartWWWService" = "11:FALSE"\r
         "RemovePreviousVersions" = "11:TRUE"\r
@@ -1758,11 +1700,11 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AB0BD66B57BF4C41BE53BCE573C254BC"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_53657E2E11814303B218D8DF1CED7298"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
+            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
@@ -1772,11 +1714,11 @@
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F208E348BAE54EDEA200755E5C149F13"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_962EDAE5C1924E75B67815861062D102"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"\r
+            "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r