diff --git a/build/Compile.targets b/build/Compile.targets index 2010fa6b3..5d956a799 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -22,32 +22,6 @@ Configuration="$(Configuration)" ProjectPath="$(RootProject)" /> - - - - - - u=rw,g=r,o=r - - - - - u=rwx,g=rx,o=rx - - - - - u=rwx,g=rx,o=rx - - - - - diff --git a/build_projects/dotnet-cli-build/Chmod.cs b/build_projects/dotnet-cli-build/Chmod.cs index 736c60c34..1d87e93c7 100644 --- a/build_projects/dotnet-cli-build/Chmod.cs +++ b/build_projects/dotnet-cli-build/Chmod.cs @@ -9,27 +9,13 @@ namespace Microsoft.DotNet.Cli.Build public class Chmod : ToolTask { [Required] - public string File { get; set; } + public string Glob { get; set; } [Required] public string Mode { get; set; } public bool Recursive { get; set; } - protected override bool ValidateParameters() - { - base.ValidateParameters(); - - if (!System.IO.File.Exists(File)) - { - Log.LogError($"File '{File} does not exist."); - - return false; - } - - return true; - } - protected override string ToolName { get { return "chmod"; } @@ -47,12 +33,12 @@ namespace Microsoft.DotNet.Cli.Build protected override string GenerateCommandLineCommands() { - return $"{GetRecursive()} {GetMode()} {GetFilePath()}"; + return $"{GetRecursive()} {GetMode()} {GetGlob()}"; } - private string GetFilePath() + private string GetGlob() { - return File; + return Glob; } private string GetMode() diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 5044398c5..1dfdc3a2a 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -144,8 +144,8 @@ + Glob="$(CrossgenPath)" + Mode="u+x" /> + + + + +