checkpoint

brianlloyd · brianlloyd · commit f5249197a3e7 · 2006-04-19T01:54:42.000Z
diff --git a/pythonnet/pythonnet.build b/pythonnet/pythonnet.build
@@ -9,7 +9,8 @@
     <echo message="Building ${project.name}-${project.version}"/>
   </target>
 
-  <target name="build-2.0">
+  <target name="build-2.0" depends="runtime, console, testdll, clrmodule,
+                                    oldmodule">
     <property name="project.version" value="2.0.0"/>
     <echo message="Building ${project.name}-${project.version}"/>
   </target>
@@ -20,7 +21,7 @@
 
 
   <target name="console" depends="runtime" >
-    <csc target="exe" output="python.exe" >
+    <csc target="exe" output="./python.exe" >
       <references>
         <include name="python.runtime.dll" />
       </references>
@@ -54,15 +55,15 @@
       <sources>
         <include name="src/runtime/oldmodule.il" />
       </sources>
-    </csc>
+    </ilasm>
   </target>
 
   <target name="clrmodule">
     <ilasm target="dll" output="clr.dll">
       <sources>
         <include name="src/runtime/clrmodule.il" />
       </sources>
-    </csc>
+    </ilasm>
   </target>
 
 
diff --git a/pythonnet/src/runtime/assemblymanager.cs b/pythonnet/src/runtime/assemblymanager.cs
@@ -184,9 +184,9 @@ static string FindAssembly(string name) {
 	public static Assembly LoadAssembly(string name) {
 	    Assembly assembly = null;
 	    try {
-#pragma warning disable 618
+
 		assembly = Assembly.LoadWithPartialName(name);
-#pragma warning restore 618
+
 	    }
 	    catch {
 	    }

Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,9 @@ static string FindAssembly(string name) {`
`184`	`184`	`public static Assembly LoadAssembly(string name) {`
`185`	`185`	`Assembly assembly = null;`
`186`	`186`	`try {`
`187`		`-#pragma warning disable 618`
	`187`	`+`
`188`	`188`	`assembly = Assembly.LoadWithPartialName(name);`
`189`		`-#pragma warning restore 618`
	`189`	`+`
`190`	`190`	`}`
`191`	`191`	`catch {`
`192`	`192`	`}`