Author: rolf
Date: 2007-05-10 07:39:51 -0400 (Thu, 10 May 2007)
New Revision: 77121

Added:
   trunk/mono-basic/vbruntime/Test/bin/nunit-console1.exe.config
   trunk/mono-basic/vbruntime/Test/bin/nunit-console2.exe.config
Modified:
   trunk/mono-basic/vbruntime/Make.cmd
   trunk/mono-basic/vbruntime/Microsoft.VisualBasic/
Log:
Added nunit-console.exe.config files for both 1.0 and 2.0 profile.
svn prop updates.



Modified: trunk/mono-basic/vbruntime/Make.cmd
===================================================================
--- trunk/mono-basic/vbruntime/Make.cmd 2007-05-10 11:35:51 UTC (rev 77120)
+++ trunk/mono-basic/vbruntime/Make.cmd 2007-05-10 11:39:51 UTC (rev 77121)
@@ -1,10 +1,21 @@
-SET BASEDIR=%~dp0..\
-SETLOCAL
 
-CALL %BASEDIR%tools\win-make\Make.cmd
-IF ERRORLEVEL 1 GOTO ENDFILE
-%BASEDIR%tools\win-make\win-make.exe %*
-goto ENDFILE
+IF "%FXVERSION%"=="" (SET FXVERSION=%1)
 
-:ENDFILE
-ENDLOCAL
+CALL InitPaths.cmd
+ECHO ON
+IF NOT "%ERRORLEVEL%"=="0" GOTO EOF
+
+
+pushd .
+
+SET RSPFILE=1
+IF "%FXVERSION%"=="2" (SET RSPFILE=2)
+IF "%FXVERSION%"=="2_0" (SET RSPFILE=2)
+
+CD Microsoft.VisualBasic
+%VBC% @vbruntime%RSPFILE%.rsp @Microsoft.VisualBasic.dll.sources.win 
%EXTRA_VBRUNTIME_FLAGS%
+IF NOT "%ERRORLEVEL%"=="0" SET COMPILATIONERROR="%ERRORLEVEL%"
+popd
+
+
+:EOF
\ No newline at end of file


Property changes on: trunk/mono-basic/vbruntime/Microsoft.VisualBasic
___________________________________________________________________
Name: svn:ignore
   - obj
bin
Microsoft.VisualBasic.dll.sources
Microsoft.VisualBasic.dll
*.mdb
*.mds
*.pidb
*.pdb
*.xml
*.usertasks
*.userprefs

   + obj
bin
Microsoft.VisualBasic.dll.sources
Microsoft.VisualBasic.dll
*.mdb
*.mds
*.pidb
*.pdb
*.xml
*.usertasks
*.userprefs
*.user



Added: trunk/mono-basic/vbruntime/Test/bin/nunit-console1.exe.config
===================================================================
--- trunk/mono-basic/vbruntime/Test/bin/nunit-console1.exe.config       
2007-05-10 11:35:51 UTC (rev 77120)
+++ trunk/mono-basic/vbruntime/Test/bin/nunit-console1.exe.config       
2007-05-10 11:39:51 UTC (rev 77121)
@@ -0,0 +1,96 @@
+<?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>
+  
+    <!-- 
+     The startup section may be used to specify the runtime versions 
+     supported in the order that they will be used if more than one
+     is present. As supplied, this section is commented out, which
+     causes nunit-console to use the version of the framework with
+     which it was built.
+        
+        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="v2.0.50215" />
+         <supportedRuntime version="v2.0.40607" />-->
+         <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="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
+  -->
+</configuration>
\ No newline at end of file


Property changes on: 
trunk/mono-basic/vbruntime/Test/bin/nunit-console1.exe.config
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/mono-basic/vbruntime/Test/bin/nunit-console2.exe.config
===================================================================
--- trunk/mono-basic/vbruntime/Test/bin/nunit-console2.exe.config       
2007-05-10 11:35:51 UTC (rev 77120)
+++ trunk/mono-basic/vbruntime/Test/bin/nunit-console2.exe.config       
2007-05-10 11:39:51 UTC (rev 77121)
@@ -0,0 +1,96 @@
+<?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>
+  
+    <!-- 
+     The startup section may be used to specify the runtime versions 
+     supported in the order that they will be used if more than one
+     is present. As supplied, this section is commented out, which
+     causes nunit-console to use the version of the framework with
+     which it was built.
+        
+        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="v2.0.50215" />
+         <supportedRuntime version="v2.0.40607" />
+         <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="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
+  -->
+</configuration>
\ No newline at end of file


Property changes on: 
trunk/mono-basic/vbruntime/Test/bin/nunit-console2.exe.config
___________________________________________________________________
Name: svn:executable
   + *

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to