diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets b/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets index d7b0dbd..c57447f 100644 --- a/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets +++ b/src/MSBuild.SDK.SystemWeb/Sdk/Sdk.targets @@ -7,23 +7,83 @@ false - + + + + + + + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets + + + + <_SystemWebVSDir Condition="'$(ProgramW6432)' != ''">$(ProgramW6432)\Microsoft Visual Studio + <_SystemWebVSDir Condition="!Exists('$(_SystemWebVSDir)') and '$(MSBuildProgramFiles32)' != ''">$(MSBuildProgramFiles32)\Microsoft Visual Studio + + + <_SystemWebVSYear Condition="Exists('$(_SystemWebVSDir)')">$([System.IO.Directory]::GetDirectories('$(_SystemWebVSDir)')) + <_SystemWebVSYear Condition="$(_SystemWebVSYear.Contains(';'))">$(_SystemWebVSYear.Substring(0, $(_SystemWebVSYear.IndexOf(';')))) + + + <_SystemWebVSEdition Condition="'$(_SystemWebVSYear)' != '' and Exists('$(_SystemWebVSYear)')">$([System.IO.Directory]::GetDirectories('$(_SystemWebVSYear)')) + <_SystemWebVSEdition Condition="$(_SystemWebVSEdition.Contains(';'))">$(_SystemWebVSEdition.Substring(0, $(_SystemWebVSEdition.IndexOf(';')))) + + <_SystemWebVSCandidate Condition="'$(_SystemWebVSEdition)' != ''">$(_SystemWebVSEdition)\MSBuild\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets + $(_SystemWebVSCandidate) + + + + + + + - + + + + + +