[nant-commits] CVS: nant/src/NAnt.VSNet/Tasks SolutionTask.cs, 1.54, 1.55

[Gert D. <dri...@us...>]

Update of /cvsroot/nant/nant/src/NAnt.VSNet/Tasks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28892/Tasks

Modified Files:
	SolutionTask.cs 
Log Message:
Introduced support for the platform part of a solution configuration.
Refactoring to improve strong typing.

Index: SolutionTask.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.VSNet/Tasks/SolutionTask.cs,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** SolutionTask.cs	18 Feb 2007 03:50:28 -0000	1.54
--- SolutionTask.cs	9 Feb 2008 20:26:25 -0000	1.55
***************
*** 202,205 ****
--- 202,206 ----
              _projectFactory = ProjectFactory.Create(this);
              _solutionFactory = SolutionFactory.Create();
+             _configuration = new Configuration ();
          }
  
***************
*** 258,280 ****
          [StringValidator(AllowEmpty=false)]
          public string Configuration {
!             get { return _configuration; }
!             set { _configuration = StringUtils.ConvertEmptyToNull(value); }
          }
  
-         /*
          /// <summary>
!         /// Set of properties set at solution level. Builders for projects in solution may or may not use them.
          /// </summary>
!         /// <remarks>
!         /// <para>
!         /// TODO: some documentataion which properties could be defined here.
!         /// </para>
!         /// </remarks>
!         [BuildElementArray("property", ElementType = typeof(PropertyTask))]
!         public ArrayList CustomProperties
!         {
!             get { return _customproperties; }
          }
-         */
  
          /// <summary>
--- 259,282 ----
          [StringValidator(AllowEmpty=false)]
          public string Configuration {
!             get { return _configuration.Name; }
!             set { _configuration.Name = StringUtils.ConvertEmptyToNull(value); }
          }
  
          /// <summary>
!         /// The name of platform to build the solution for.
          /// </summary>
!         [TaskAttribute("platform", Required=false)]
!         [StringValidator(AllowEmpty=true)]
!         public string Platform {
!             get { return _configuration.Platform; }
!             set { _configuration.Platform = value; }
!         }
! 
!         /// <summary>
!         /// Gets the solution configuration to build.
!         /// </summary>
!         public Configuration SolutionConfig {
!             get { return _configuration; }
          }
  
          /// <summary>
***************
*** 355,359 ****
                          if (!_assemblyFolderList.Contains(folder)) {
                              _assemblyFolderList.Add(folder);
!                                 Log(Level.Debug, "Added \"{0}\" to AssemblyFolders.",
                                  folder);
                          }
--- 357,361 ----
                          if (!_assemblyFolderList.Contains(folder)) {
                              _assemblyFolderList.Add(folder);
!                             Log(Level.Debug, "Added \"{0}\" to AssemblyFolders.",
                                  folder);
                          }
***************
*** 452,456 ****
                              SolutionBase sln = SolutionFactory.LoadSolution(this, 
                                  tfc, gacCache, referencesResolver);
!                             if (!sln.Compile(Configuration)) {
                                  throw new BuildException("Project build failed.", Location);
                              }
--- 454,458 ----
                              SolutionBase sln = SolutionFactory.LoadSolution(this, 
                                  tfc, gacCache, referencesResolver);
!                             if (!sln.Compile(_configuration)) {
                                  throw new BuildException("Project build failed.", Location);
                              }
***************
*** 612,616 ****
  
          private FileInfo _solutionFile;
!         private string _configuration;
          private DirectoryInfo _outputDir;
          private FileSet _projects;
--- 614,618 ----
  
          private FileInfo _solutionFile;
!         private Configuration _configuration;
          private DirectoryInfo _outputDir;
          private FileSet _projects;
***************
*** 622,626 ****
          private bool _includeVSFolders = true;
          private bool _enableWebDav;
- //        private ArrayList _customproperties = new ArrayList();
          private readonly SolutionFactory _solutionFactory;
          private readonly ProjectFactory _projectFactory;
--- 624,627 ----