Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortherzok <marius.ungureanu@xamarin.com>2019-07-21 12:57:02 +0300
committertherzok <marius.ungureanu@xamarin.com>2019-07-21 12:58:32 +0300
commit8ba57c8b55493f51396ca9c253abea7c88904da5 (patch)
treeb1ffd619dee4c2020d86dc4700d4efdf0a61ef40
parent27ea3e602cf0eea663143453a9559419b0a0a64d (diff)
[Core] Small cleanups in DefaultMSBuildEngine
Unroll LINQ in a loop code, use lambda instead of delegate notation and remove an unused method
-rw-r--r--main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs16
1 files changed, 6 insertions, 10 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs
index 1c14ad2329..1d488525cf 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/DefaultMSBuildEngine.cs
@@ -519,7 +519,10 @@ namespace MonoDevelop.Projects.MSBuild
{
var exclude = ExcludeToRegex (remove);
do {
- foreach (var globInclude in project.GlobIncludes.Where (g => g.Item.Name == item.Name)) {
+ foreach (var globInclude in project.GlobIncludes) {
+ if (globInclude.Item.Name != item.Name)
+ continue;
+
if (globInclude.RemoveRegex != null)
exclude = globInclude.RemoveRegex + "|" + exclude;
globInclude.RemoveRegex = new Regex (exclude);
@@ -867,10 +870,8 @@ namespace MonoDevelop.Projects.MSBuild
static IEnumerable<string> GetIncludesForWildcardFilePath (MSBuildProject project, string path, Regex directoryExcludeRegex = null)
{
var subpath = SplitWildcardFilePath (path);
-
- WildcardExpansionFunc<string> func = delegate (string file, string include, string recursiveDir) {
- return include;
- };
+
+ WildcardExpansionFunc<string> func = (file, include, recursiveDir) => include;
return ExpandWildcardFilePath (project, project.BaseDirectory, FilePath.Null, false, subpath.AsSpan (), func, directoryExcludeRegex);
}
@@ -1033,11 +1034,6 @@ namespace MonoDevelop.Projects.MSBuild
}
}
- MSBuildItemEvaluated Evaluate (ProjectInfo project, MSBuildEvaluationContext context, MSBuildItem item)
- {
- return CreateEvaluatedItem (context, project, project.Project, item, context.EvaluateString (item.Include));
- }
-
IReadOnlyList<ProjectInfo> GetImportedProjects (ProjectInfo project, MSBuildImport import)
{
List<ProjectInfo> prefProjects;