From: Gert D. <dri...@us...> - 2004-07-03 08:44:17
|
Update of /cvsroot/nant/nant/src/NAnt.DotNet/Types In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2044 Modified Files: ResourceFileSet.cs Log Message: fixed regression that caused build failure when there there were no resx files or no non-resx files in the resource fileset Index: ResourceFileSet.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.DotNet/Types/ResourceFileSet.cs,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ResourceFileSet.cs 28 Jun 2004 18:28:54 -0000 1.19 --- ResourceFileSet.cs 3 Jul 2004 08:44:07 -0000 1.20 *************** *** 79,84 **** retFileSet.Includes.Clear(); retFileSet.Excludes.Clear(); - retFileSet.DirectoryNames.Clear(); retFileSet.AsIs.Clear(); foreach (string file in FileNames) { if (Path.GetExtension(file).ToLower(CultureInfo.InvariantCulture) == ".resx" ) { --- 79,84 ---- retFileSet.Includes.Clear(); retFileSet.Excludes.Clear(); retFileSet.AsIs.Clear(); + retFileSet.FailOnEmpty = false; foreach (string file in FileNames) { if (Path.GetExtension(file).ToLower(CultureInfo.InvariantCulture) == ".resx" ) { *************** *** 103,108 **** retFileSet.Includes.Clear(); retFileSet.Excludes.Clear(); - retFileSet.DirectoryNames.Clear(); retFileSet.AsIs.Clear(); foreach (string file in FileNames) { if (Path.GetExtension(file).ToLower(CultureInfo.InvariantCulture) != ".resx" ) { --- 103,108 ---- retFileSet.Includes.Clear(); retFileSet.Excludes.Clear(); retFileSet.AsIs.Clear(); + retFileSet.FailOnEmpty = false; foreach (string file in FileNames) { if (Path.GetExtension(file).ToLower(CultureInfo.InvariantCulture) != ".resx" ) { *************** *** 142,146 **** /// </summary> /// <param name="fileName">The full path and name of the file as returned from <see cref="FileSet.FileNames" />.</param> ! /// <returns>The manifest resource name to be sent to the compiler.</returns> public string GetManifestResourceName(string fileName) { StringBuilder prefix = new StringBuilder(Prefix); --- 142,148 ---- /// </summary> /// <param name="fileName">The full path and name of the file as returned from <see cref="FileSet.FileNames" />.</param> ! /// <returns> ! /// The manifest resource name to be sent to the compiler. ! /// </returns> public string GetManifestResourceName(string fileName) { StringBuilder prefix = new StringBuilder(Prefix); |