diff options
| author | Marek Safar <marek.safar@gmail.com> | 2015-12-16 14:13:07 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2015-12-16 14:13:07 +0300 |
| commit | 9dc34141e190d9b5521ca3be8e52335b0521d0ae (patch) | |
| tree | 2d448de7c3d0b2a28ce5f0d1a83d7107b7a95b8b /mcs | |
| parent | d75e8ea37e1147f3af93aabfe95c99e64af7efdb (diff) | |
| parent | fb76fe4ed44d0ae2eaed23d151066e4c3ed6968e (diff) | |
Merge pull request #2345 from akoeplinger/xbuild14
Bump xbuild script to 14.0 and a few other fixes
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/tools/xbuild/data/12.0/Microsoft.Common.targets | 4 | ||||
| -rw-r--r-- | mcs/tools/xbuild/data/14.0/Microsoft.Common.targets | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets index e478140691b..d6f012b3b9f 100644 --- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets @@ -147,7 +147,7 @@ Condition="'$(TargetFrameworkIdentifier)' == '' or '$(TargetFrameworkIdentifier)' == '.NETFramework'" DependsOnTargets="$(GetFrameworkPathsDependsOn)"> <GetFrameworkPath> - <Output Condition="'$(TargetFrameworkVersion)' == 'v4.5' and '$(TargetFrameworkVersion)' == 'v4.5.1'" + <Output Condition="'$(TargetFrameworkVersion)' == 'v4.5' or '$(TargetFrameworkVersion)' == 'v4.5.1' or '$(TargetFrameworkVersion)' == 'v4.5.2'" TaskParameter="FrameworkVersion45Path" ItemName="_CombinedTargetFrameworkDirectoriesItem"/> <Output Condition="'$(TargetFrameworkVersion)' == 'v4.0'" @@ -168,7 +168,7 @@ </CreateProperty> <Warning Text="TargetFrameworkVersion '$(TargetFrameworkVersion)' not supported by this toolset (ToolsVersion: $(MSBuildToolsVersion))." - Condition="'$(TargetFrameworkVersion)' != 'v4.5.1' and '$(TargetFrameworkVersion)' != 'v4.5' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/> + Condition="'$(TargetFrameworkVersion)' != 'v4.5.2' and '$(TargetFrameworkVersion)' != 'v4.5.1' and '$(TargetFrameworkVersion)' != 'v4.5' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/> </Target> <PropertyGroup> diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets index 5ce879ae236..5e90fd09ce0 100644 --- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets @@ -132,7 +132,7 @@ Condition="'$(TargetFrameworkIdentifier)' == '' or '$(TargetFrameworkIdentifier)' == '.NETFramework'" DependsOnTargets="$(GetFrameworkPathsDependsOn)"> <GetFrameworkPath> - <Output Condition="'$(TargetFrameworkVersion)' == 'v4.5' and '$(TargetFrameworkVersion)' == 'v4.5.1'" + <Output Condition="'$(TargetFrameworkVersion)' == 'v4.5' or '$(TargetFrameworkVersion)' == 'v4.5.1' or '$(TargetFrameworkVersion)' == 'v4.5.2' or '$(TargetFrameworkVersion)' == 'v4.6' or '$(TargetFrameworkVersion)' == 'v4.6.1'" TaskParameter="FrameworkVersion45Path" ItemName="_CombinedTargetFrameworkDirectoriesItem"/> <Output Condition="'$(TargetFrameworkVersion)' == 'v4.0'" @@ -153,7 +153,7 @@ </CreateProperty> <Warning Text="TargetFrameworkVersion '$(TargetFrameworkVersion)' not supported by this toolset (ToolsVersion: $(MSBuildToolsVersion))." - Condition="'$(TargetFrameworkVersion)' != 'v4.5.1' and '$(TargetFrameworkVersion)' != 'v4.5' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/> + Condition="'$(TargetFrameworkVersion)' != 'v4.6.1' and '$(TargetFrameworkVersion)' != 'v4.6' and '$(TargetFrameworkVersion)' != 'v4.5.2' and '$(TargetFrameworkVersion)' != 'v4.5.1' and '$(TargetFrameworkVersion)' != 'v4.5' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/> </Target> <PropertyGroup> |