[genproj] Fix THISDIR location in a few projects, so genproj can generate MSBuild...

diff --git a/mcs/mcs/mcs-net_4_x.csproj b/mcs/mcs/mcs-net_4_x.csproj
index 49e7b1cfedba8deb12356cb3dd684b43354a641a..1a8011adf371f8e78b443dd96781549b7cf573d5 100644 (file)
--- a/mcs/mcs/mcs-net_4_x.csproj
+++ b/mcs/mcs/mcs-net_4_x.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>\r
     <NoWarn>1699</NoWarn>\r
     <OutputPath>bin\Debug\mcs-net_4_x</OutputPath>\r
-    <IntermediateOutputPath>obj-bin\Debug\mcs-net_4_x</IntermediateOutputPath>\r
+    <IntermediateOutputPath>obj-mcs-net_4_x</IntermediateOutputPath>\r
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>\r
     <NoStdLib>True</NoStdLib>\r
     \r

diff --git a/mcs/nunit24/NUnitFramework/framework/Makefile b/mcs/nunit24/NUnitFramework/framework/Makefile
index 43076d8c8553ae0954ad041a6b77b9286e9ae6b1..a8c8440f46581782164f887171fa3958dae94df5 100644 (file)
--- a/mcs/nunit24/NUnitFramework/framework/Makefile
+++ b/mcs/nunit24/NUnitFramework/framework/Makefile
@@ -1,4 +1,4 @@
-thisdir = nunit24/NUnit.Framework/framework
+thisdir = nunit24/NUnitFramework/framework
 SUBDIRS = 
 include ../../../build/rules.make
 

diff --git a/mcs/tools/mdbrebase/Makefile b/mcs/tools/mdbrebase/Makefile
index e0f6fe81956c8d31dcc2fda6fd1dabbec4db5658..cbe723d27175429e8d405da624e479f10cbb65d4 100644 (file)
--- a/mcs/tools/mdbrebase/Makefile
+++ b/mcs/tools/mdbrebase/Makefile
@@ -1,4 +1,4 @@
-thisdir = tools/mdb-rebase
+thisdir = tools/mdbrebase
 SUBDIRS =
 include ../../build/rules.make
 

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 4f7343b9fe8e1a3fb213d56329e2f1b364f49cfd..7f2dd66da85b2102349dc2fc68a5a29a662f1cea 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -1043,8 +1043,14 @@ public class Driver {
                        // The next ones are to make debugging easier for now
                        if (profile == "basic")
                                continue;
+
+                       // For now -- problem is, our resolver currently only considers the assembly name, and we ahve
+                       // conflicing 2.0 and 2.4 versions so for now, we just skip the nunit20 versions
+                       if (dir.Contains ("nunit20"))
+                               continue;
+                       
 #if true
-                       if (profile != "net_4_x" || library.Contains ("tests"))
+                       if (profile != "net_4_x" || library.Contains ("tests")) 
                                continue;
 #endif
                        //Console.WriteLine ("Going to handle {0}", library);

diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 6999bdb4a403b8ee6bef2fafbe94d81847c1b31b..2297beba0c4b48d71c26c040c2029edf15d88101 100644 (file)
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -3810,7 +3810,7 @@
       <profile>net_4_x</profile>
       <response>System.Net.Http.WebRequestHandler.dll.sources</response>
     </project>
-    <project dir="nunit24/NUnit.Framework/framework" library="NUnit.Framework-net_4_x">
+    <project dir="nunit24/NUnitFramework/framework" library="NUnit.Framework-net_4_x">
       <boot>false</boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -r:./../../../class/lib/net_4_x/mscorlib.dll -debug -optimize /noconfig /d:StronglyNamedAssembly -warn:1 /publicsign -r:./../../../class/lib/net_4_x/System.Xml.dll -r:./../../../class/lib/net_4_x/System.dll</flags>
       <output>nunit.framework.dll</output>
@@ -4380,7 +4380,7 @@
       <profile>net_4_x</profile>
       <response>cccheck.exe.sources</response>
     </project>
-    <project dir="tools/mdb-rebase" library="mdbrebase-net_4_x">
+    <project dir="tools/mdbrebase" library="mdbrebase-net_4_x">
       <boot></boot>
       <flags>/codepage:65001 -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll -debug -optimize /noconfig -r:System -r:Mono.CompilerServices.SymbolWriter</flags>
       <output>mdbrebase.exe</output>