Align Tasks.targets code snippets with IronPython

Author: BCSharp

eng/Tasks.targets

@@ -10,40 +10,55 @@
       <Using Namespace="System.IO.Compression" />
       <Code Type="Fragment" Language="cs">
         <![CDATA[
-        string cwd = null;
-        try {
-          var di = new DirectoryInfo(WorkingDirectory);
-          if (!di.Exists) {
-            Log.LogError(string.Format("{0} doesn't exist", WorkingDirectory));
-            return false;
-          }
-          cwd = Environment.CurrentDirectory;
-          Environment.CurrentDirectory = di.FullName;
+            string cwd = null;
+            try {
+                var di = new DirectoryInfo(WorkingDirectory);
+                if (!di.Exists) {
+                    Log.LogError(string.Format("{0} doesn't exist", WorkingDirectory));
+                    return (Success = false);
+                }
+                cwd = Environment.CurrentDirectory;
+                Environment.CurrentDirectory = di.FullName;
+                //                     rw-r--r--   file       BSD
+                const int regAttr = (0b110100100 + 0x8000) << 16;
+                //                     rwxr-xr-x   file       BSD
+                const int exeAttr = (0b111101101 + 0x8000) << 16;
+                var propExternalAttributes = typeof(ZipArchiveEntry).GetProperty("ExternalAttributes");
 
-          using (Stream zipStream = new FileStream(Path.GetFullPath(ZipFileName), FileMode.Create, FileAccess.Write))
-          using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create)) {
-            foreach (ITaskItem fileItem in Files) {
-              var filename = fileItem.ItemSpec;
-              FileInfo fi = new FileInfo(filename);
-              if (!fi.FullName.StartsWith(di.FullName)) {
-                Log.LogError(string.Format("{0} not in {1}", filename, WorkingDirectory));
-                return false;
-              }
-              var archivename = fi.FullName.Substring(di.FullName.Length).TrimStart(new char [] { '\\', '/' });
-              using (Stream fileStream = new FileStream(fi.FullName, FileMode.Open, FileAccess.Read))
-              using (Stream fileStreamInZip = archive.CreateEntry(archivename).Open())
-                fileStream.CopyTo(fileStreamInZip);
+                using Stream zipStream = new FileStream(Path.GetFullPath(ZipFileName), FileMode.Create, FileAccess.Write);
+                using ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create);
+
+                foreach (ITaskItem fileItem in Files) {
+                    string evaluatedInclude = fileItem.ItemSpec;
+                    var fi = new FileInfo(evaluatedInclude);
+                    if (!fi.FullName.StartsWith(di.FullName)) {
+                        Log.LogError(string.Format("{0} not in {1}", evaluatedInclude, WorkingDirectory));
+                        return (Success = false);
+                    }
+                    string filename = fileItem.GetMetadata("Link");
+                    if (string.IsNullOrEmpty(filename)) {
+                        filename = fi.FullName;
+                    }
+                    var archivename = fi.FullName.Substring(di.FullName.Length).Replace('\\', '/').TrimStart(new char [] { '/' });
+                    bool isExe = archivename.EndsWith(".ps1") || archivename.EndsWith(".sh");
+
+                    ZipArchiveEntry entry = archive.CreateEntry(archivename);
+                    using Stream fileStreamInZip = entry.Open();
+                    using Stream fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read);
+
+                    fileStream.CopyTo(fileStreamInZip);
+                    //entry.ExternalAttributes = isExe ? exeAttr : regAttr;
+                    propExternalAttributes.SetValue(entry, isExe ? exeAttr : regAttr);
+                }
+                Success = true;
+            } catch (Exception ex) {
+                Success = false;
+                Log.LogErrorFromException(ex);
+            } finally {
+                if (cwd != null) {
+                    Environment.CurrentDirectory = cwd;
+                }
             }
-          }
-          return true;
-        } catch (Exception ex) {
-          Log.LogErrorFromException(ex);
-          return false;
-        } finally {
-          if (cwd != null) {
-            Environment.CurrentDirectory = cwd;
-          }
-        }
         ]]>
       </Code>
     </Task>
@@ -59,20 +74,20 @@
       <Using Namespace="System.Text.RegularExpressions" />
       <Code Type="Fragment" Language="cs">
         <![CDATA[
-        try {
-          System.Text.RegularExpressions.Regex replaceRegex = new System.Text.RegularExpressions.Regex(Expression);
-          foreach(ITaskItem item in Files) {
-            string fileName = item.ItemSpec;
-            Log.LogMessage(string.Format("Updating File \"{0}\".", fileName));
-            string buffer = File.ReadAllText(fileName);
-            buffer = replaceRegex.Replace(buffer, Replacement);
-            File.WriteAllText(fileName, buffer);
-          }
-        } catch(Exception ex) {
-          Log.LogErrorFromException(ex);
-          return false;
-        }
-        return true;
+            try {
+                System.Text.RegularExpressions.Regex replaceRegex = new System.Text.RegularExpressions.Regex(Expression);
+                foreach (ITaskItem item in Files) {
+                    string fileName = item.ItemSpec;
+                    Log.LogMessage(string.Format("Updating File \"{0}\".", fileName));
+                    string buffer = File.ReadAllText(fileName);
+                    buffer = replaceRegex.Replace(buffer, Replacement);
+                    File.WriteAllText(fileName, buffer);
+                }
+                Success = true;
+            } catch (Exception ex) {
+                Success = false;
+                Log.LogErrorFromException(ex);
+            }
         ]]>
       </Code>
     </Task>