This should fix #76928. This fix incorporates ideas from a patch

osted on that bugreport.
* Makefile [net_2_0 profile]: Don't build nunit-console.exe.  Copy
the executable from the 'default' profile, and use a slightly
customized nunit-console.exe.config.
* nunit-console.exe.net_2_0.config: New config file for the
net_2_0 profile.  Alter the list of 'supportedRuntime's to prefer
the 2.0 runtime.

svn path=/trunk/mcs/; revision=55295

diff --cc mcs/nunit20/nunit-console/ChangeLog
index a4da4e4d6a1334d7a11da75d7e03c9c907b6546b,a4da4e4d6a1334d7a11da75d7e03c9c907b6546b..c2237b95d7df6ca1a7d163a1fd1101ff5bb927b3
--- 1/mcs/nunit20/nunit-console/ChangeLog
--- 2/mcs/nunit20/nunit-console/ChangeLog
+++ b/mcs/nunit20/nunit-console/ChangeLog
@@@ -1,3 -1,3 +1,14 @@@
++2006-01-10  Raja R Harinath  <rharinath@novell.com>
++
++      This should fix #76928.  This fix incorporates ideas from a patch
++      posted on that bugreport.
++      * Makefile [net_2_0 profile]: Don't build nunit-console.exe.  Copy
++      the executable from the 'default' profile, and use a slightly
++      customized nunit-console.exe.config.
++      * nunit-console.exe.net_2_0.config: New config file for the
++      net_2_0 profile.  Alter the list of 'supportedRuntime's to prefer
++      the 2.0 runtime.
++
  2005-11-05  Kornél Pál  <kornelpal@hotmail.com>
  
        * nunit-console.exe.config: Updated runtime version to v2.0.50727 (2.0 RTM).

diff --cc mcs/nunit20/nunit-console/Makefile
index 0a33bca390afe330f964c27e8be887de7a204a8b,0a33bca390afe330f964c27e8be887de7a204a8b..ca08be0309d84b7454fa53c763371a1bf8a27a3d
--- 1/mcs/nunit20/nunit-console/Makefile
--- 2/mcs/nunit20/nunit-console/Makefile
+++ b/mcs/nunit20/nunit-console/Makefile
@@@ -6,4 -6,4 +6,37 @@@ PROGRAM = $(topdir)/class/lib/$(PROFILE
  LOCAL_MCS_FLAGS = /r:nunit.framework.dll /r:nunit.util.dll /r:nunit.core.dll
  DISTFILES = app.config App.ico nunit-console.csproj
  
++ifeq (1.0, $(FRAMEWORK_VERSION))
++
  include ../../build/executable.make
++
++else
++
++base_prog = nunit-console.exe
++$(PROGRAM): $(topdir)/class/lib/default/$(base_prog)
++      cp $< $@
++      -cp -f $<.mdb $@.mdb
++
++$(PROGRAM).config: $(base_prog).$(PROFILE).config
++      cp $< $@
++
++all-local: $(PROGRAM) $(PROGRAM).config
++clean-local:
++      rm -f $(PROGRAM) $(PROGRAM).config $(PROGRAM:.exe=.mdb) $(PROGRAM:.exe=.pdb)
++
++test-local run-test-local run-test-ondotnet-local: all-local
++
++ifndef PROGRAM_INSTALL_DIR
++PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
++endif
++
++install-local: all-local
++      $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
++      $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
++      test ! -f $(PROGRAM).mdb || $(INSTALL_BIN) $(PROGRAM).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)
++      $(INSTALL_DATA) $(PROGRAM).config $(DESTDIR)$(PROGRAM_INSTALL_DIR)
++
++uninstall-local:
++      -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).config
++
++endif

diff --cc mcs/nunit20/nunit-console/nunit-console.exe.config
index 777966b1f69e3a39fe74079d3581dd125441c6ff,777966b1f69e3a39fe74079d3581dd125441c6ff..777966b1f69e3a39fe74079d3581dd125441c6ff
mode 100755,100755..100644
--- 1/mcs/nunit20/nunit-console/nunit-console.exe.config
--- 2/mcs/nunit20/nunit-console/nunit-console.exe.config
+++ b/mcs/nunit20/nunit-console/nunit-console.exe.config

diff --cc mcs/nunit20/nunit-console/nunit-console.exe.net_2_0.config
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d613fcbcd5b5e3c19f9f9e5dbc620bc0c3ec82f6
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mcs/nunit20/nunit-console/nunit-console.exe.net_2_0.config
@@@ -1,0 -1,0 +1,92 @@@
++<?xml version="1.0" encoding="Windows-1252"?>
++<configuration>
++    <!--
++     Application settings for NUnit-console.exe. Do NOT put settings
++       for use by your tests here.
++      -->
++  <appSettings>
++
++      <!--    Specify the location to be used by .NET for the cache -->
++    <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
++  
++  </appSettings>
++  
++    <!-- 
++     These statements specify the runtime versions supported
++     in the order that they will be used if more than one
++     is present. You can change the order of these if you like
++     or remove any that do not apply.
++       
++       Since .NET 1.0 does not recognize the <supportedRuntime> elements,
++       a <requiredRuntime> element is used in case it is the only version
++       of the framework that is installed.
++    -->
++  <startup>
++
++        <supportedRuntime version="v2.0.50727" />
++        <supportedRuntime version="v1.1.4322" />
++        <supportedRuntime version="v1.0.3705" />
++      
++        <requiredRuntime version="v1.0.3705" />
++
++  </startup>
++
++   <!--
++    The following <runtime> section allows running nunit under 
++    .NET 1.0 by redirecting assemblies. The appliesTo attribute
++    causes the section to be ignored except under .NET 1.0version 1
++    on a machine with only the .NET version 1.0 runtime installed.
++    If application and its tests were built for .NET 1.1 you will
++    also need to redirect system assemblies in the test config file.
++   -->
++  
++ <runtime>
++    
++    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
++                      appliesTo="v1.0.3705">
++
++      <dependentAssembly> 
++        <assemblyIdentity name="System" 
++                          publicKeyToken="b77a5c561934e089" 
++                          culture=""/>
++        <bindingRedirect  oldVersion="1.0.5000.0" 
++                          newVersion="1.0.3300.0"/>
++      </dependentAssembly>
++
++      <dependentAssembly> 
++        <assemblyIdentity name="System.Data" 
++                          publicKeyToken="b77a5c561934e089" 
++                          culture=""/>
++        <bindingRedirect  oldVersion="1.0.5000.0" 
++                          newVersion="1.0.3300.0"/>
++      </dependentAssembly>
++
++      <dependentAssembly> 
++        <assemblyIdentity name="System.Drawing" 
++                          publicKeyToken="b03f5f7f11d50a3a" 
++                          culture=""/>
++        <bindingRedirect  oldVersion="1.0.5000.0" 
++                          newVersion="1.0.3300.0"/>
++      </dependentAssembly>
++
++      <dependentAssembly> 
++        <assemblyIdentity name="System.Windows.Forms" 
++                          publicKeyToken="b77a5c561934e089" 
++                          culture=""/>
++        <bindingRedirect  oldVersion="1.0.5000.0" 
++                          newVersion="1.0.3300.0"/>
++      </dependentAssembly>
++
++      <dependentAssembly> 
++        <assemblyIdentity name="System.Xml" 
++                          publicKeyToken="b77a5c561934e089" 
++                          culture=""/>
++        <bindingRedirect  oldVersion="1.0.5000.0" 
++                          newVersion="1.0.3300.0"/>
++      </dependentAssembly>
++
++    </assemblyBinding>
++
++  </runtime>
++  
++</configuration>