diff options
| author | Jo Shields <jo.shields@xamarin.com> | 2015-12-15 10:47:24 +0000 |
|---|---|---|
| committer | Jo Shields <jo.shields@xamarin.com> | 2015-12-15 10:47:24 +0000 |
| commit | 33805d763029c046831fa2d3d8071a8494689acd (patch) | |
| tree | 192aec42c1af560f940dd7468af808cccfd024fa | |
| parent | 0ebec34044023c4ad28ae146111573ead4c78aa0 (diff) | |
| parent | db6d214406c9c9f01d6fbeb0fb6a60f5e5d43893 (diff) | |
| download | mono-33805d763029c046831fa2d3d8071a8494689acd.tar.gz | |
Merge branch 'master-patches/xbuild_4.5_by_default'
| -rw-r--r-- | mcs/tools/xbuild/data/12.0/Microsoft.Common.targets | 2 | ||||
| -rw-r--r-- | mcs/tools/xbuild/data/14.0/Microsoft.Common.targets | 2 | ||||
| -rw-r--r-- | mcs/tools/xbuild/data/4.0/Microsoft.Common.targets | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets index fdf43ccd48..e3084c9c88 100644 --- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets @@ -33,7 +33,7 @@ <WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel> <TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier> - <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion> <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == '' and '$(TargetFrameworkProfile)' != ''">$(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion),Profile=$(TargetFrameworkProfile)</TargetFrameworkMoniker> <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == ''">$(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker> diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets index d420c09366..ed58612452 100644 --- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets @@ -33,7 +33,7 @@ <WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel> <TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier> - <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion> <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == '' and '$(TargetFrameworkProfile)' != ''">$(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion),Profile=$(TargetFrameworkProfile)</TargetFrameworkMoniker> <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == ''">$(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker> diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets index 832b54fbef..395eb3f6a0 100644 --- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets @@ -33,7 +33,7 @@ <WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel> <TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier> - <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion> <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == '' and '$(TargetFrameworkProfile)' != ''">$(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion),Profile=$(TargetFrameworkProfile)</TargetFrameworkMoniker> <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == ''">$(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker> |