[nant-commits] CVS: nant/src/NAnt.VSNet Project.cs,1.66,1.67

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

Update of /cvsroot/nant/nant/src/NAnt.VSNet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7237

Modified Files:
	Project.cs 
Log Message:
use IsWebProject properties instead of instance field, fix issue with web projects (that use webdav)

Index: Project.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.VSNet/Project.cs,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Project.cs	6 Sep 2004 02:18:59 -0000	1.66
--- Project.cs	23 Sep 2004 18:08:20 -0000	1.67
***************
*** 63,66 ****
--- 63,81 ----
          #endregion Public Instance Properties
  
+         #region Private Instance Properties
+ 
+         /// <summary>
+         /// Gets a value indicating if this is a web project.
+         /// </summary>
+         /// <value>
+         /// <see langword="true" /> if this is a web project; otherwise,
+         /// <see langword="false" />.
+         /// </value>
+         private bool IsWebProject {
+             get { return ProjectFactory.IsUrl(_projectPath); }
+         }
+ 
+         #endregion Private Instance Properties
+ 
          #region Override implementation of ProjectBase
  
***************
*** 132,136 ****
  
              _projectPath = projectPath;
!             if (!_isWebProject) {
                  _projectDirectory = new FileInfo(projectPath).Directory;
              } else {
--- 147,152 ----
  
              _projectPath = projectPath;
! 
!             if (!IsWebProject) {
                  _projectDirectory = new FileInfo(projectPath).Directory;
              } else {
***************
*** 152,161 ****
              _projectSettings = new ProjectSettings(doc.DocumentElement, (XmlElement) doc.SelectSingleNode("//Build/Settings"), this);
  
!             _isWebProject = ProjectFactory.IsUrl(projectPath);
!             _webProjectBaseUrl = string.Empty;
! 
!             XmlNodeList nlConfigurations, nlReferences, nlFiles, nlImports;
! 
!             nlConfigurations = doc.SelectNodes("//Config");
              foreach (XmlElement elemConfig in nlConfigurations) {
                  ConfigurationSettings cs = new ConfigurationSettings(this, elemConfig, OutputDir);
--- 168,172 ----
              _projectSettings = new ProjectSettings(doc.DocumentElement, (XmlElement) doc.SelectSingleNode("//Build/Settings"), this);
  
!             XmlNodeList nlConfigurations = doc.SelectNodes("//Config");
              foreach (XmlElement elemConfig in nlConfigurations) {
                  ConfigurationSettings cs = new ConfigurationSettings(this, elemConfig, OutputDir);
***************
*** 163,167 ****
              }
  
!             nlReferences = doc.SelectNodes("//References/Reference");
              foreach (XmlElement elemReference in nlReferences) {
                  Reference reference = new Reference(sln, _projectSettings, elemReference, GacCache, ReferencesResolver, this, OutputDir);
--- 174,178 ----
              }
  
!             XmlNodeList nlReferences = doc.SelectNodes("//References/Reference");
              foreach (XmlElement elemReference in nlReferences) {
                  Reference reference = new Reference(sln, _projectSettings, elemReference, GacCache, ReferencesResolver, this, OutputDir);
***************
*** 170,174 ****
  
              if (_projectSettings.Type == ProjectType.VBNet) {
!                 nlImports = doc.SelectNodes("//Imports/Import");
                  foreach (XmlElement elemReference in nlImports) {
                      _imports += elemReference.Attributes["Namespace"].Value.ToString(CultureInfo.InvariantCulture) + ",";
--- 181,185 ----
  
              if (_projectSettings.Type == ProjectType.VBNet) {
!                 XmlNodeList nlImports = doc.SelectNodes("//Imports/Import");
                  foreach (XmlElement elemReference in nlImports) {
                      _imports += elemReference.Attributes["Namespace"].Value.ToString(CultureInfo.InvariantCulture) + ",";
***************
*** 179,183 ****
              }
  
!             nlFiles = doc.SelectNodes("//Files/Include/File");
              foreach (XmlElement elemFile in nlFiles) {
                  string buildAction = elemFile.Attributes["BuildAction"].Value;
--- 190,194 ----
              }
  
!             XmlNodeList nlFiles = doc.SelectNodes("//Files/Include/File");
              foreach (XmlElement elemFile in nlFiles) {
                  string buildAction = elemFile.Attributes["BuildAction"].Value;
***************
*** 192,196 ****
                  }
  
!                 if (_isWebProject) {
                      WebDavClient wdc = new WebDavClient(new Uri(_webProjectBaseUrl));
                      wdc.DownloadFile(sourceFile, elemFile.Attributes["RelPath"].Value);
--- 203,207 ----
                  }
  
!                 if (IsWebProject) {
                      WebDavClient wdc = new WebDavClient(new Uri(_webProjectBaseUrl));
                      wdc.DownloadFile(sourceFile, elemFile.Attributes["RelPath"].Value);
***************
*** 529,533 ****
  
                      // copy primary project output (and related files)
!                     if (_isWebProject) {
                          Hashtable primaryOutputFiles = Reference.GetRelatedFiles(
                              cs.OutputPath);
--- 540,544 ----
  
                      // copy primary project output (and related files)
!                     if (IsWebProject) {
                          Hashtable primaryOutputFiles = Reference.GetRelatedFiles(
                              cs.OutputPath);
***************
*** 550,554 ****
                      foreach (DictionaryEntry de in ExtraOutputFiles) {
                          FileInfo sourceFile = new FileInfo((string) de.Key);
!                         if (_isWebProject) {
                              WebDavClient wdc = new WebDavClient(new Uri(_webProjectBaseUrl));
                              wdc.UploadFile(sourceFile.FullName, Path.Combine(cs.RelativeOutputDir, 
--- 561,565 ----
                      foreach (DictionaryEntry de in ExtraOutputFiles) {
                          FileInfo sourceFile = new FileInfo((string) de.Key);
!                         if (IsWebProject) {
                              WebDavClient wdc = new WebDavClient(new Uri(_webProjectBaseUrl));
                              wdc.UploadFile(sourceFile.FullName, Path.Combine(cs.RelativeOutputDir, 
***************
*** 574,578 ****
                      foreach (DictionaryEntry de in cs.ExtraOutputFiles) {
                          FileInfo sourceFile = new FileInfo((string) de.Key);
!                         if (_isWebProject) {
                              WebDavClient wdc = new WebDavClient(new Uri(_webProjectBaseUrl));
                              wdc.UploadFile(sourceFile.FullName, cs.RelativeOutputDir.Replace(@"\", "/") 
--- 585,589 ----
                      foreach (DictionaryEntry de in cs.ExtraOutputFiles) {
                          FileInfo sourceFile = new FileInfo((string) de.Key);
!                         if (IsWebProject) {
                              WebDavClient wdc = new WebDavClient(new Uri(_webProjectBaseUrl));
                              wdc.UploadFile(sourceFile.FullName, cs.RelativeOutputDir.Replace(@"\", "/") 
***************
*** 887,891 ****
  
          private string _imports;
-         private bool _isWebProject;
          private string _projectPath;
          private DirectoryInfo _projectDirectory;
--- 898,901 ----