Set native EOL on all wxs, make and vcxproj files. Revert the ones which had become...

[shibboleth/sp.git] / msi / WiX / Patch.wxs

diff --git a/msi/WiX/Patch.wxs b/msi/WiX/Patch.wxs
index fa3e04d..279ba2a 100644 (file)
--- a/msi/WiX/Patch.wxs
+++ b/msi/WiX/Patch.wxs
@@ -1,57 +1,57 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <PatchCreation\r
-     Id='{1E09E74F-D547-464B-80B7-1FF63C496BAB}'\r
-     CleanWorkingFolder='yes'\r
-     OutputPath='patch.pcp'\r
-     WholeFilesOnly='yes'\r
-     >\r
-    \r
-    <!-- Information oput into the summary (Details) field -->\r
-    <PatchInformation \r
-       Description='This patch does something' \r
-       Comments='comments' \r
-       Manufacturer='Shibboleth Consortium'/>\r
-    \r
-    <!-- Recommended values for 'Classification' are\r
-         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. \r
-\r
-         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".\r
-      -->\r
-    <PatchMetadata\r
-       AllowRemoval='yes'\r
-       Description='This patch does something'\r
-       ManufacturerName='Shibboleth Consortium'\r
-       TargetProductName='Shibboleth SP Version'\r
-       MoreInfoURL='http://www.shibboleth.net/secadv/bla/bla'\r
-       Classification='Update' \r
-       DisplayName='Shibboleth Patch sevadv blabla'/> \r
-    \r
-    <!-- Note:\r
-         That SequenceStart must be greater than the last\r
-         sequence in the File table in the target package or the patch\r
-         will not install. -->\r
-\r
-    <Family DiskId='5000'\r
-            MediaSrcProp='Sample' \r
-            Name='Sample'\r
-            SequenceStart='5000'>\r
-      <UpgradeImage SourceFile='C:\My Downloads\shib\SPInst\patch\251\admin\ShibbolethSP-main-x64.msi' Id='SampleUpgrade'>\r
-        <TargetImage SourceFile='C:\My Downloads\shib\SPInst\patch\250\admin\ShibbolethSP-main-x64.msi' Order='2'      \r
-                     Id='SampleTarget' IgnoreMissingFiles='no' />\r
-      </UpgradeImage>\r
-    </Family>\r
-    \r
-    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will\r
-         supersede all previous patches in this patch family.  The\r
-         default value is 'no'. \r
-         \r
-         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
-      -->\r
-\r
-    <PatchSequence PatchFamily='SamplePatchFamily'\r
-                   Sequence='1.0.0.0'\r
-                   Supersede='no' />\r
-    \r
-  </PatchCreation>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <PatchCreation
+     Id='{1E09E74F-D547-464B-80B7-1FF63C496BAB}'
+     CleanWorkingFolder='yes'
+     OutputPath='patch.pcp'
+     WholeFilesOnly='yes'
+     >
+    
+    <!-- Information oput into the summary (Details) field -->
+    <PatchInformation 
+       Description='This patch does something' 
+       Comments='comments' 
+       Manufacturer='Shibboleth Consortium'/>
+    
+    <!-- Recommended values for 'Classification' are
+         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. 
+
+         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
+      -->
+    <PatchMetadata
+       AllowRemoval='yes'
+       Description='This patch does something'
+       ManufacturerName='Shibboleth Consortium'
+       TargetProductName='Shibboleth SP Version'
+       MoreInfoURL='http://www.shibboleth.net/secadv/bla/bla'
+       Classification='Update' 
+       DisplayName='Shibboleth Patch sevadv blabla'/> 
+    
+    <!-- Note:
+         That SequenceStart must be greater than the last
+         sequence in the File table in the target package or the patch
+         will not install. -->
+
+    <Family DiskId='5000'
+            MediaSrcProp='Sample' 
+            Name='Sample'
+            SequenceStart='5000'>
+      <UpgradeImage SourceFile='C:\My Downloads\shib\SPInst\patch\251\admin\ShibbolethSP-main-x64.msi' Id='SampleUpgrade'>
+        <TargetImage SourceFile='C:\My Downloads\shib\SPInst\patch\250\admin\ShibbolethSP-main-x64.msi' Order='2'      
+                     Id='SampleTarget' IgnoreMissingFiles='no' />
+      </UpgradeImage>
+    </Family>
+    
+    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will
+         supersede all previous patches in this patch family.  The
+         default value is 'no'. 
+         
+         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
+      -->
+
+    <PatchSequence PatchFamily='SamplePatchFamily'
+                   Sequence='1.0.0.0'
+                   Supersede='no' />
+    
+  </PatchCreation>
+</Wix>