Skip to content

Commit

Permalink
Revert "[xbuild] Define VisualStudioVersion, since F# projects can de…
Browse files Browse the repository at this point in the history
…pend on it"

This reverts commit 0a425af.

Taking this out of 3.2.8 as per Don's comment:
28163fd#commitcomment-5195420
  • Loading branch information
Alex Rønne Petersen committed Feb 19, 2014
1 parent 21ba005 commit 52ebfc6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
5 changes: 0 additions & 5 deletions mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
Expand Up @@ -21,11 +21,6 @@
<ProjectDir Condition="'$(ProjectDir)' == ''">$(MSBuildProjectDirectory)\</ProjectDir>
</PropertyGroup>

<!-- MSBuild defines this even outside of VS, and F# projects depend on it -->
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
</PropertyGroup>

<PropertyGroup>
<AssemblyName Condition="'$(AssemblyName)' == ''">$(MSBuildProjectName)</AssemblyName>
<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
Expand Down
5 changes: 0 additions & 5 deletions mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
Expand Up @@ -21,11 +21,6 @@
<ProjectDir Condition="'$(ProjectDir)' == ''">$(MSBuildProjectDirectory)\</ProjectDir>
</PropertyGroup>

<!-- MSBuild defines this even outside of VS, and F# projects depend on it -->
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
</PropertyGroup>

<PropertyGroup>
<AssemblyName Condition="'$(AssemblyName)' == ''">$(MSBuildProjectName)</AssemblyName>
<OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
Expand Down

0 comments on commit 52ebfc6

Please sign in to comment.