1. clamav-devel
  2. Commit a8b2b3356c5e8e40abc19d4c44e2066a01e21193
Browse code

Correction to Windows vdproj installers Round 2.

Micah Snyder authored on 2018/03/13 04:33:18
Showing 2 changed files
win32/Setup-x64/Setup-x64.vdproj
History View file @ a8b2b33
... ... 
@@ -177,7 +177,7 @@
177 177 
         "DisplayName" = "8:Debug"
178 178 
         "IsDebugOnly" = "11:TRUE"
179 179 
         "IsReleaseOnly" = "11:FALSE"
180 
-        "OutputFilename" = "8:Debug\\ClamAV-0.100.0-rc-x64.msi"
180 
+        "OutputFilename" = "8:Debug\\ClamAV-0.100.0-x64.msi"
181 181 
         "PackageFilesAs" = "3:2"
182 182 
         "PackageFileSize" = "3:-2147483648"
183 183 
         "CabType" = "3:1"
... ... 
@@ -201,11 +201,6 @@
201 201 
                     "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)"
202 202 
                     "ProductCode" = "8:Microsoft.Visual.C++.14.0.x64"
203 203 
                     }
204 
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5"
205 
-                    {
206 
-                    "Name" = "8:Windows Installer 4.5"
207 
-                    "ProductCode" = "8:Microsoft.Windows.Installer.4.5"
208 
-                    }
209 204 
                 }
210 205 
             }
211 206 
         }
... ... 
@@ -214,7 +209,7 @@
214 214 
         "DisplayName" = "8:Release"
215 215 
         "IsDebugOnly" = "11:FALSE"
216 216 
         "IsReleaseOnly" = "11:TRUE"
217 
-        "OutputFilename" = "8:Release\\ClamAV-0.100.0-rc-x64.msi"
217 
+        "OutputFilename" = "8:Release\\ClamAV-0.100.0-x64.msi"
218 218 
         "PackageFilesAs" = "3:2"
219 219 
         "PackageFileSize" = "3:-2147483648"
220 220 
         "CabType" = "3:1"
... ... 
@@ -233,11 +228,6 @@
233 233 
             "ComponentsUrl" = "8:"
234 234 
                 "Items"
235 235 
                 {
236 
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5"
237 
-                    {
238 
-                    "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
239 
-                    "ProductCode" = "8:.NETFramework,Version=v4.5"
240 
-                    }
241 236 
                     "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x64"
242 237 
                     {
243 238 
                     "Name" = "8:Visual C++ \"14\" Runtime Libraries (x64)"
... ... 
@@ -633,7 +623,7 @@
633 633 
         "Manufacturer" = "8:Cisco Systems, Inc"
634 634 
         "ARPHELPTELEPHONE" = "8:"
635 635 
         "ARPHELPLINK" = "8:http://www.clamav.net"
636 
-        "Title" = "8:Setup-x86"
636 
+        "Title" = "8:Setup-x64"
637 637 
         "Subject" = "8:"
638 638 
         "ARPCONTACT" = "8:Cisco Systems, Inc"
639 639 
         "Keywords" = "8:"
win32/Setup-x86/Setup-x86.vdproj
History View file @ a8b2b33
... ... 
@@ -213,7 +213,7 @@
213 213 
         "DisplayName" = "8:Debug"
214 214 
         "IsDebugOnly" = "11:TRUE"
215 215 
         "IsReleaseOnly" = "11:FALSE"
216 
-        "OutputFilename" = "8:Debug\\Setup-x86.msi"
216 
+        "OutputFilename" = "8:Debug\\ClamAV-0.100.0-x86.msi"
217 217 
         "PackageFilesAs" = "3:2"
218 218 
         "PackageFileSize" = "3:-2147483648"
219 219 
         "CabType" = "3:1"
... ... 
@@ -232,10 +232,10 @@
232 232 
             "ComponentsUrl" = "8:"
233 233 
                 "Items"
234 234 
                 {
235 
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5"
235 
+                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
236 236 
                     {
237 
-                    "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
238 
-                    "ProductCode" = "8:.NETFramework,Version=v4.5"
237 
+                    "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"
238 
+                    "ProductCode" = "8:Microsoft.Visual.C++.14.0.x86"
239 239 
                     }
240 240 
                 }
241 241 
             }
... ... 
@@ -245,7 +245,7 @@
245 245 
         "DisplayName" = "8:Release"
246 246 
         "IsDebugOnly" = "11:FALSE"
247 247 
         "IsReleaseOnly" = "11:TRUE"
248 
-        "OutputFilename" = "8:Release\\Setup-x86.msi"
248 
+        "OutputFilename" = "8:Release\\ClamAV-0.100.0-x86.msi"
249 249 
         "PackageFilesAs" = "3:2"
250 250 
         "PackageFileSize" = "3:-2147483648"
251 251 
         "CabType" = "3:1"
... ... 
@@ -264,11 +264,6 @@
264 264 
             "ComponentsUrl" = "8:"
265 265 
                 "Items"
266 266 
                 {
267 
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5"
268 
-                    {
269 
-                    "Name" = "8:Microsoft .NET Framework 4.5 (x86 and x64)"
270 
-                    "ProductCode" = "8:.NETFramework,Version=v4.5"
271 
-                    }
272 267 
                     "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Visual.C++.14.0.x86"
273 268 
                     {
274 269 
                     "Name" = "8:Visual C++ \"14\" Runtime Libraries (x86)"