Skip to content

Instantly share code, notes, and snippets.

@directhex

directhex/gist:1b3ce2e37207aedd9e84

Created December 15, 2014 16:54
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save directhex/1b3ce2e37207aedd9e84 to your computer and use it in GitHub Desktop.
Save directhex/1b3ce2e37207aedd9e84 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.mak
diff --git a/mcs/class/Microsoft.Build/Makefile b/mcs/class/Microsoft.Build/Makefile
index 279a814..df521a8 100644
--- a/mcs/class/Microsoft.Build/Makefile
+++ b/mcs/class/Microsoft.Build/Makefile
@@ -35,5 +35,4 @@ BUILT_SOURCES = $(EXPR_PARSER).cs
include ../../build/library.make
-XBUILD_FRAMEWORK_FOLDERS_PATH=xbuild-testing
include $(XBUILD_DIR)/xbuild_test.make
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 879fdf4..79b73d6 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 6f4b7b9..dab4ced 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 9899af1..e373f1e 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>
diff --git a/mcs/tools/xbuild/xbuild_test.make b/mcs/tools/xbuild/xbuild_test.make
index 5c96389..60ce6eb 100644
--- a/mcs/tools/xbuild/xbuild_test.make
+++ b/mcs/tools/xbuild/xbuild_test.make
@@ -4,6 +4,7 @@ XBUILD_PROFILE_DIR=$(topdir)/class/lib/$(PROFILE)
# makes xbuild look in the class/lib/$PROFILE build directories for targets etc
export TESTING_MONO=a
export MSBuildExtensionsPath=$(XBUILD_DATA_DIR)
+export XBUILD_FRAMEWORK_FOLDERS_PATH= $(topdir)/class/Microsoft.Build/xbuild-testing
ifeq (4.0, $(FRAMEWORK_VERSION))
NO_TEST=true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment