@@ -129,7 +129,7 @@ class Msbuild extends ConventionTask {
129129 // Try to resolve/parse, but catch ALL errors and check if they're old project format errors
130130 try {
131131 if (projectParsed == null && parseProject) {
132- resolveProject()
132+ resolveProject()
133133 }
134134 } catch (OldProjectFormatException e) {
135135 // Old project format detected - skip parsing
@@ -185,7 +185,7 @@ class Msbuild extends ConventionTask {
185185 }
186186 return msg. toString()
187187 }
188-
188+
189189 @Internal
190190 ProjectFileParser getMainProject () {
191191 if (resolveProject()) {
@@ -286,17 +286,17 @@ class Msbuild extends ConventionTask {
286286 if (isSolutionBuild()) {
287287 def rootSolutionFile = getRootedSolutionFile()
288288 try {
289- def result = parseProjectFile(rootSolutionFile)
290- allProjects = result. collectEntries { [it. key, new ProjectFileParser (msbuild : this , eval : it. value)] }
291- def projectName = getProjectName()
292- if (projectName == null || projectName. isEmpty()) {
289+ def result = parseProjectFile(rootSolutionFile)
290+ allProjects = result. collectEntries { [it. key, new ProjectFileParser (msbuild : this , eval : it. value)] }
291+ def projectName = getProjectName()
292+ if (projectName == null || projectName. isEmpty()) {
293+ parseProject = false
294+ } else {
295+ projectParsed = allProjects[projectName]
296+ if (projectParsed == null ) {
293297 parseProject = false
294- } else {
295- projectParsed = allProjects[projectName]
296- if (projectParsed == null ) {
297- parseProject = false
298- logger. warn " Project ${ projectName} not found in solution"
299- }
298+ logger. warn " Project ${ projectName} not found in solution"
299+ }
300300 }
301301 } catch (OldProjectFormatException e) {
302302 // Old project format - skip parsing
@@ -338,11 +338,11 @@ class Msbuild extends ConventionTask {
338338 } else if (isProjectBuild()) {
339339 def rootProjectFile = getRootedProjectFile()
340340 try {
341- def result = parseProjectFile(rootProjectFile)
342- allProjects = result. collectEntries {[it. key, new ProjectFileParser (msbuild : this , eval : it. value)]}
343- projectParsed = allProjects. values(). first()
344- if (! projectParsed) {
345- logger. warn " Parsed project ${ rootProjectFile} is null (not a solution / project build)"
341+ def result = parseProjectFile(rootProjectFile)
342+ allProjects = result. collectEntries {[it. key, new ProjectFileParser (msbuild : this , eval : it. value)]}
343+ projectParsed = allProjects. values(). first()
344+ if (! projectParsed) {
345+ logger. warn " Parsed project ${ rootProjectFile} is null (not a solution / project build)"
346346 }
347347 } catch (OldProjectFormatException e) {
348348 // Old project format - skip parsing
0 commit comments