X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Tasks%2FMicrosoft.Build.Tasks%2FAL.cs;h=9b94e3798c13b3330d3314b811577d5fbfbf1aff;hb=3c2fd4f371846cec6c8e8e780bbff66614185c26;hp=1fc961b72dc1f56a4865b6a55bb1c583ef706087;hpb=ac60ecf03fef7535f5e30d147ca207e34ee32474;p=mono.git

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
index 1fc961b72dc..9b94e3798c1 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_2_0
 
 using System;
 using System.Diagnostics;
@@ -57,9 +56,15 @@ namespace Microsoft.Build.Tasks {
 				else
 					commandLine.AppendSwitch ("/delaysign-");
 			commandLine.AppendSwitchIfNotNull ("/description:", Description);
-			if (EmbedResources != null)
-				foreach (ITaskItem item in EmbedResources)
-					commandLine.AppendSwitchIfNotNull ("/embed:", item.ItemSpec);
+			if (EmbedResources != null) {
+				foreach (ITaskItem item in EmbedResources) {
+					string logical_name = item.GetMetadata ("LogicalName");
+					if (!string.IsNullOrEmpty (logical_name))
+						commandLine.AppendSwitchIfNotNull ("/embed:", string.Format ("{0},{1}", item.ItemSpec, logical_name));
+					else
+						commandLine.AppendSwitchIfNotNull ("/embed:", item.ItemSpec);
+				}
+			}
 			commandLine.AppendSwitchIfNotNull ("/evidence:", EvidenceFile);
 			commandLine.AppendSwitchIfNotNull ("/fileversion:", FileVersion);
 			commandLine.AppendSwitchIfNotNull ("/flags:", Flags);
@@ -261,4 +266,3 @@ namespace Microsoft.Build.Tasks {
 	}
 }
 
-#endif