[Wixedit-commits] wixedit/src WixFiles.cs,1.25,1.26
Project moved to Github: https://github.com/WixEdit/WixEdit
Brought to you by:
jaykee
From: Jasper K. <ja...@us...> - 2006-12-14 17:40:29
|
Update of /cvsroot/wixedit/wixedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13047/src Modified Files: WixFiles.cs Log Message: Fixing bunch of errors. - Starting with WiX 3 compatibility. Index: WixFiles.cs =================================================================== RCS file: /cvsroot/wixedit/wixedit/src/WixFiles.cs,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** WixFiles.cs 24 May 2006 16:03:59 -0000 1.25 --- WixFiles.cs 14 Dec 2006 17:40:25 -0000 1.26 *************** *** 49,53 **** static XmlNamespaceManager xsdNsmgr; ! public static string WixNamespaceUri = "http://schemas.microsoft.com/wix/2003/01/wi"; private string customLightArgumentsWarning; --- 49,67 ---- static XmlNamespaceManager xsdNsmgr; ! ! public static string WixNamespaceUri { ! get { ! if (WixEditSettings.Instance.IsUsingWix3()) { ! return WixNamespaceUri_V3; ! } else if (WixEditSettings.Instance.IsUsingWix2()) { ! return WixNamespaceUri_V2; ! } else { ! return WixNamespaceUri_Default; ! } ! } ! } ! public static string WixNamespaceUri_Default = WixNamespaceUri_V2; ! public static string WixNamespaceUri_V2 = "http://schemas.microsoft.com/wix/2003/01/wi"; ! public static string WixNamespaceUri_V3 = "http://schemas.microsoft.com/wix/2006/wi"; private string customLightArgumentsWarning; *************** *** 164,167 **** --- 178,183 ---- xsdNsmgr.AddNamespace("xs", "http://www.w3.org/2001/XMLSchema"); xsdNsmgr.AddNamespace("xse", "http://schemas.microsoft.com/wix/2005/XmlSchemaExtension"); + + } |