From f3a6f7831726ef47e0ee662bd273d51c3a9e1b06 Mon Sep 17 00:00:00 2001 From: Michael Hutchinson Date: Thu, 2 Aug 2007 16:07:51 +0000 Subject: Backport an AspNetAddIn fix. svn path=/branches/monodevelop/0.15/; revision=83298 --- Extras/AspNetAddIn/ChangeLog | 6 ++++++ 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 + + * 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 * 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; } -- cgit v1.2.3