Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/ikvm-fork.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfrijters <jfrijters>2004-06-28 13:46:18 +0400
committerjfrijters <jfrijters>2004-06-28 13:46:18 +0400
commit0409aadf0accd88896e7f773c191e302d76daa24 (patch)
tree65b089d286813e2e2b71bb9095a369fc3a9e8de7
parent8b0fd3c401871d827c58e1b5fad661551df71838 (diff)
*** empty log message ***
-rw-r--r--awt/AssemblyInfo.cs2
-rw-r--r--ikvm/AssemblyInfo.cs2
-rw-r--r--ikvmc/AssemblyInfo.cs2
-rw-r--r--ikvmstub/AssemblyInfo.cs2
-rw-r--r--jni/clr-win32/AssemblyInfo.cpp4
-rw-r--r--jni/mono/JNI.cs3
-rw-r--r--runtime/AssemblyInfo.cs4
-rw-r--r--runtime/vm.cs4
8 files changed, 13 insertions, 10 deletions
diff --git a/awt/AssemblyInfo.cs b/awt/AssemblyInfo.cs
index a3092daa..df7c9924 100644
--- a/awt/AssemblyInfo.cs
+++ b/awt/AssemblyInfo.cs
@@ -26,7 +26,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.8.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
diff --git a/ikvm/AssemblyInfo.cs b/ikvm/AssemblyInfo.cs
index a2033b15..c3b4ba0b 100644
--- a/ikvm/AssemblyInfo.cs
+++ b/ikvm/AssemblyInfo.cs
@@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.8.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
diff --git a/ikvmc/AssemblyInfo.cs b/ikvmc/AssemblyInfo.cs
index a2033b15..c3b4ba0b 100644
--- a/ikvmc/AssemblyInfo.cs
+++ b/ikvmc/AssemblyInfo.cs
@@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.8.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
diff --git a/ikvmstub/AssemblyInfo.cs b/ikvmstub/AssemblyInfo.cs
index a2033b15..c3b4ba0b 100644
--- a/ikvmstub/AssemblyInfo.cs
+++ b/ikvmstub/AssemblyInfo.cs
@@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.8.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
diff --git a/jni/clr-win32/AssemblyInfo.cpp b/jni/clr-win32/AssemblyInfo.cpp
index f9bc1ce1..c6e84929 100644
--- a/jni/clr-win32/AssemblyInfo.cpp
+++ b/jni/clr-win32/AssemblyInfo.cpp
@@ -51,7 +51,7 @@ using namespace System::Runtime::CompilerServices;
// You can specify all the value or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly:AssemblyVersionAttribute("0.7.*")];
+[assembly:AssemblyVersionAttribute("0.8.0.0")];
//
// In order to sign your assembly you must specify a key to use. Refer to the
@@ -76,6 +76,6 @@ using namespace System::Runtime::CompilerServices;
// documentation for more information on this.
//
[assembly:AssemblyDelaySignAttribute(false)];
-[assembly:AssemblyKeyFileAttribute("")];
+//[assembly: AssemblyKeyFile("c:\\ikvm-key\\ikvm.snk")];
[assembly:AssemblyKeyNameAttribute("")];
diff --git a/jni/mono/JNI.cs b/jni/mono/JNI.cs
index a13555af..97d02457 100644
--- a/jni/mono/JNI.cs
+++ b/jni/mono/JNI.cs
@@ -14,6 +14,9 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
+[assembly:AssemblyVersionAttribute("0.8.0.0")]
+//[assembly:AssemblyKeyFile("c:\\ikvm-key\\ikvm.snk")]
+
public class VM
{
public static Exception UnsatisfiedLinkError (string msg) {
diff --git a/runtime/AssemblyInfo.cs b/runtime/AssemblyInfo.cs
index 7287ba53..8dac8b8e 100644
--- a/runtime/AssemblyInfo.cs
+++ b/runtime/AssemblyInfo.cs
@@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.8.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@@ -77,5 +77,5 @@ using System.Runtime.CompilerServices;
// documentation for more information on this.
//
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+//[assembly: AssemblyKeyFile("c:\\ikvm-key\\ikvm.snk")]
[assembly: AssemblyKeyName("")]
diff --git a/runtime/vm.cs b/runtime/vm.cs
index 19f0f4d0..b39e3686 100644
--- a/runtime/vm.cs
+++ b/runtime/vm.cs
@@ -126,12 +126,12 @@ public class JVM
if(IsUnix)
{
Tracer.Info(Tracer.Runtime, "Loading JNI provider: IKVM.JNI.Mono");
- provider = Assembly.Load("IKVM.JNI.Mono").GetType("JNI", true);
+ provider = Assembly.LoadWithPartialName("IKVM.JNI.Mono").GetType("JNI", true);
}
else
{
Tracer.Info(Tracer.Runtime, "Loading JNI provider: IKVM.JNI.CLR-Win32");
- provider = Assembly.Load("IKVM.JNI.CLR-Win32").GetType("JNI", true);
+ provider = Assembly.LoadWithPartialName("IKVM.JNI.CLR-Win32").GetType("JNI", true);
}
}
jniProvider = (IJniProvider)Activator.CreateInstance(provider);