diff options
| author | Jo Shields <jo.shields@xamarin.com> | 2014-12-15 19:59:48 +0300 |
|---|---|---|
| committer | Jo Shields <jo.shields@xamarin.com> | 2014-12-15 19:59:48 +0300 |
| commit | 70d3c7a23a4cc3f82117db57d75398aa29a88672 (patch) | |
| tree | 9acb0d5f59a651c8f1f23462a1319ecc3e656e4e /mcs/class/Microsoft.Build | |
| parent | d1a5f1d53a91aab26f454d31388741be26578cd9 (diff) | |
Use net_4_5 libraries for xbuild tests, regardless of target.
This works around failures caused by tests asking for other frameworks (like 4.0) on Mono 4.0, which only has 4.5
Diffstat (limited to 'mcs/class/Microsoft.Build')
3 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml index 879fdf42d0d..79b73d66e45 100644 --- a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml +++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v2.0/RedistList/FrameworkList.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 2.0" TargetFrameworkDirectory="..\..\..\..\..\lib\net_2_0"> +<FileList Name=".NET Framework 2.0" TargetFrameworkDirectory="..\..\..\..\..\lib\net_4_5"> </FileList> diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml index 6f4b7b97973..dab4ced6ae5 100644 --- a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml +++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v3.5/RedistList/FrameworkList.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 3.5" TargetFrameworkDirectory="..\..\..\..\..\lib\net_2_0" IncludeFramework="v3.0"> +<FileList Name=".NET Framework 3.5" TargetFrameworkDirectory="..\..\..\..\..\lib\net_4_5"> </FileList> diff --git a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml index 9899af1dada..e373f1e968d 100644 --- a/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml +++ b/mcs/class/Microsoft.Build/xbuild-testing/.NETFramework/v4.0/RedistList/FrameworkList.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<FileList Name=".NET Framework 4" TargetFrameworkDirectory="..\..\..\..\..\lib\net_4_0"> +<FileList Name=".NET Framework 4" TargetFrameworkDirectory="..\..\..\..\..\lib\net_4_5"> </FileList> |