diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2007-08-02 20:07:51 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2007-08-02 20:07:51 +0400 |
| commit | f3a6f7831726ef47e0ee662bd273d51c3a9e1b06 (patch) | |
| tree | 506f297d537d2fe321cbd736273758736cb696cf | |
| parent | ac2d5754ecbfd13d9a90a8c0d4bb42dd79e15b90 (diff) | |
Backport an AspNetAddIn fix.monodevelop-0.15
svn path=/branches/monodevelop/0.15/; revision=83298
| -rw-r--r-- | Extras/AspNetAddIn/ChangeLog | 6 | ||||
| -rw-r--r-- | Extras/AspNetAddIn/Project/AspNetAppProject.cs | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Extras/AspNetAddIn/ChangeLog b/Extras/AspNetAddIn/ChangeLog index 77bb06f195..f25b1582d0 100644 --- a/Extras/AspNetAddIn/ChangeLog +++ b/Extras/AspNetAddIn/ChangeLog @@ -1,3 +1,9 @@ +2007-08-01 Michael Hutchinson <m.j.hutchinson@gmail.com> + + * AspNetAppProject.cs: Fix the IDeployable implementation. The target + directory names should be handled by an ASP.NET-specific + IDirectoryResolver, not the GetDeployFiles method. + 2007-07-25 Lluis Sanchez Gual <lluis@novell.com> * AspNetAddIn.mdp: Updated. diff --git a/Extras/AspNetAddIn/Project/AspNetAppProject.cs b/Extras/AspNetAddIn/Project/AspNetAppProject.cs index 8173afe285..94cb117aff 100644 --- a/Extras/AspNetAddIn/Project/AspNetAppProject.cs +++ b/Extras/AspNetAddIn/Project/AspNetAppProject.cs @@ -145,18 +145,19 @@ namespace AspNetAddIn DeployFileCollection files = new DeployFileCollection (); //add files that are marked to 'deploy' + //ASP.NET files etc all go relative to the application root foreach (ProjectFile pf in ProjectFiles) if (pf.BuildAction == BuildAction.FileCopy) - files.Add (new DeployFile (pf)); + files.Add (new DeployFile (this, pf.FilePath, pf.RelativePath, TargetDirectory.ProgramFilesRoot)); //add referenced libraries foreach (string refFile in GetReferenceDeployFiles (false)) - files.Add (new DeployFile (this, refFile, Path.Combine ("bin", Path.GetFileName (refFile)), TargetDirectory.ProgramFiles)); + files.Add (new DeployFile (this, refFile, Path.GetFileName (refFile), TargetDirectory.ProgramFiles)); //add the compiled output file string outputFile = this.GetOutputFileName (); if (!string.IsNullOrEmpty (outputFile)) - files.Add (new DeployFile (this, outputFile, Path.Combine ("bin", Path.GetFileName (outputFile)), TargetDirectory.ProgramFiles)); + files.Add (new DeployFile (this, outputFile, Path.GetFileName (outputFile), TargetDirectory.ProgramFiles)); return files; } |