mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-18 12:31:30 -10:00
Compare commits
41
Commits
bug19334
...
mono-3.12.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4cb3f77b4b | ||
|
|
cd424f9950 | ||
|
|
62a9629de2 | ||
|
|
87886507fe | ||
|
|
4781ab8f1c | ||
|
|
62352026f8 | ||
|
|
3e14a6c105 | ||
|
|
b3c94866b8 | ||
|
|
b8f5055f4e | ||
|
|
de2f33f7b2 | ||
|
|
7569e1a18d | ||
|
|
933e19bca3 | ||
|
|
501f5a9ed6 | ||
|
|
1538a59191 | ||
|
|
5892cd77a0 | ||
|
|
c82a2e5074 | ||
|
|
d778fb3631 | ||
|
|
a813491664 | ||
|
|
f0c92250f1 | ||
|
|
dc0ce1d96e | ||
|
|
76cd0085cc | ||
|
|
ef27535985 | ||
|
|
18666b6e21 | ||
|
|
3016bd7f31 | ||
|
|
9331fc979b | ||
|
|
4e94779847 | ||
|
|
12fd95f950 | ||
|
|
e1edabc081 | ||
|
|
3a4aeaa649 | ||
|
|
a067aa1cc7 | ||
|
|
2d61e91f57 | ||
|
|
cba1d4ffa1 | ||
|
|
eef579fa97 | ||
|
|
be40f3f97e | ||
|
|
40a3eb5354 | ||
|
|
1b35c8b74a | ||
|
|
b92d2bd239 | ||
|
|
00d88a51af | ||
|
|
aaa6f3c3fc | ||
|
|
b75fa2b333 | ||
|
|
84068e57b7 |
No files matched your search
@@ -69,6 +69,7 @@ config.status
|
||||
config.sub
|
||||
configure
|
||||
configure.scan
|
||||
cygconfig.h
|
||||
depcomp
|
||||
install-sh
|
||||
libtool
|
||||
|
||||
+13
-2
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [3.12.0],
|
||||
AC_INIT(mono, [3.12.1],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -2806,7 +2806,18 @@ if test "x$host" != "x$target"; then
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
;;
|
||||
;;
|
||||
aarch64*-linux-*)
|
||||
TARGET=ARM64;
|
||||
arch_target=arm64;
|
||||
AC_DEFINE(TARGET_ARM64, 1, [...])
|
||||
AC_DEFINE(TARGET_ANDROID, 1, [...])
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
;;
|
||||
aarch64-*)
|
||||
TARGET=ARM64
|
||||
;;
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
/* config.h. Generated by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include "cygconfig.h"
|
||||
#else
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
@@ -74,3 +78,4 @@
|
||||
#define VERSION "0.1"
|
||||
|
||||
#define HAVE_STRTOK_R 1
|
||||
#endif
|
||||
@@ -116,14 +116,14 @@ namespace Mono.Security.Protocol.Tls
|
||||
scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, false, true, 8, 8, 56, 8, 8);
|
||||
|
||||
// Supported exportable ciphers
|
||||
scs.Add((0x00 << 0x08) | 0x03, "TLS_RSA_EXPORT_WITH_RC4_40_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 5, 16, 40, 0, 0);
|
||||
scs.Add((0x00 << 0x08) | 0x06, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 16, 40, 8, 8);
|
||||
scs.Add((0x00 << 0x08) | 0x08, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 8, 40, 8, 8);
|
||||
scs.Add((0x00 << 0x08) | 0x60, "TLS_RSA_EXPORT_WITH_RC4_56_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
scs.Add((0x00 << 0x08) | 0x61, "TLS_RSA_EXPORT_WITH_RC2_CBC_56_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 7, 16, 56, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x03, "TLS_RSA_EXPORT_WITH_RC4_40_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 5, 16, 40, 0, 0);
|
||||
// scs.Add((0x00 << 0x08) | 0x06, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 16, 40, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x08, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 8, 40, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x60, "TLS_RSA_EXPORT_WITH_RC4_56_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
// scs.Add((0x00 << 0x08) | 0x61, "TLS_RSA_EXPORT_WITH_RC2_CBC_56_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 7, 16, 56, 8, 8);
|
||||
// 56 bits but we use 64 bits because of parity (DES is really 56 bits)
|
||||
scs.Add((0x00 << 0x08) | 0x62, "TLS_RSA_EXPORT_WITH_DES_CBC_56_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 8, 8, 64, 8, 8);
|
||||
scs.Add((0x00 << 0x08) | 0x64, "TLS_RSA_EXPORT_WITH_RC4_56_SHA", CipherAlgorithmType.Rc4, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
// scs.Add((0x00 << 0x08) | 0x62, "TLS_RSA_EXPORT_WITH_DES_CBC_56_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 8, 8, 64, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x64, "TLS_RSA_EXPORT_WITH_RC4_56_SHA", CipherAlgorithmType.Rc4, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
|
||||
// Default CipherSuite
|
||||
// scs.Add(0, "TLS_NULL_WITH_NULL_NULL", CipherAlgorithmType.None, HashAlgorithmType.None, ExchangeAlgorithmType.None, true, false, 0, 0, 0, 0, 0);
|
||||
@@ -195,14 +195,14 @@ namespace Mono.Security.Protocol.Tls
|
||||
scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, false, true, 8, 8, 56, 8, 8);
|
||||
|
||||
// Supported exportable ciphers
|
||||
scs.Add((0x00 << 0x08) | 0x03, "SSL_RSA_EXPORT_WITH_RC4_40_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 5, 16, 40, 0, 0);
|
||||
scs.Add((0x00 << 0x08) | 0x06, "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 16, 40, 8, 8);
|
||||
scs.Add((0x00 << 0x08) | 0x08, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 8, 40, 8, 8);
|
||||
scs.Add((0x00 << 0x08) | 0x60, "SSL_RSA_EXPORT_WITH_RC4_56_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
scs.Add((0x00 << 0x08) | 0x61, "SSL_RSA_EXPORT_WITH_RC2_CBC_56_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 7, 16, 56, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x03, "SSL_RSA_EXPORT_WITH_RC4_40_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 5, 16, 40, 0, 0);
|
||||
// scs.Add((0x00 << 0x08) | 0x06, "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 16, 40, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x08, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 5, 8, 40, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x60, "SSL_RSA_EXPORT_WITH_RC4_56_MD5", CipherAlgorithmType.Rc4, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
// scs.Add((0x00 << 0x08) | 0x61, "SSL_RSA_EXPORT_WITH_RC2_CBC_56_MD5", CipherAlgorithmType.Rc2, HashAlgorithmType.Md5, ExchangeAlgorithmType.RsaKeyX, true, true, 7, 16, 56, 8, 8);
|
||||
// 56 bits but we use 64 bits because of parity (DES is really 56 bits)
|
||||
scs.Add((0x00 << 0x08) | 0x62, "SSL_RSA_EXPORT_WITH_DES_CBC_56_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 8, 8, 64, 8, 8);
|
||||
scs.Add((0x00 << 0x08) | 0x64, "SSL_RSA_EXPORT_WITH_RC4_56_SHA", CipherAlgorithmType.Rc4, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
// scs.Add((0x00 << 0x08) | 0x62, "SSL_RSA_EXPORT_WITH_DES_CBC_56_SHA", CipherAlgorithmType.Des, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, true, 8, 8, 64, 8, 8);
|
||||
// scs.Add((0x00 << 0x08) | 0x64, "SSL_RSA_EXPORT_WITH_RC4_56_SHA", CipherAlgorithmType.Rc4, HashAlgorithmType.Sha1, ExchangeAlgorithmType.RsaKeyX, true, false, 7, 16, 56, 0, 0);
|
||||
|
||||
// Default CipherSuite
|
||||
// scs.Add(0, "SSL_NULL_WITH_NULL_NULL", CipherAlgorithmType.None, HashAlgorithmType.None, true, false, 0, 0, 0, 0, 0);
|
||||
|
||||
@@ -129,6 +129,7 @@ namespace Mono.Security.Protocol.Tls
|
||||
HandshakeType type, byte[] buffer)
|
||||
{
|
||||
ClientContext context = (ClientContext)this.context;
|
||||
var last = context.LastHandshakeMsg;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
@@ -148,23 +149,37 @@ namespace Mono.Security.Protocol.Tls
|
||||
return null;
|
||||
|
||||
case HandshakeType.ServerHello:
|
||||
if (last != HandshakeType.HelloRequest)
|
||||
break;
|
||||
return new TlsServerHello(this.context, buffer);
|
||||
|
||||
// Optional
|
||||
case HandshakeType.Certificate:
|
||||
if (last != HandshakeType.ServerHello)
|
||||
break;
|
||||
return new TlsServerCertificate(this.context, buffer);
|
||||
|
||||
case HandshakeType.ServerKeyExchange:
|
||||
return new TlsServerKeyExchange(this.context, buffer);
|
||||
|
||||
// Optional
|
||||
case HandshakeType.CertificateRequest:
|
||||
return new TlsServerCertificateRequest(this.context, buffer);
|
||||
if (last == HandshakeType.ServerKeyExchange || last == HandshakeType.Certificate)
|
||||
return new TlsServerCertificateRequest(this.context, buffer);
|
||||
break;
|
||||
|
||||
case HandshakeType.ServerHelloDone:
|
||||
return new TlsServerHelloDone(this.context, buffer);
|
||||
if (last == HandshakeType.CertificateRequest || last == HandshakeType.Certificate || last == HandshakeType.ServerHello)
|
||||
return new TlsServerHelloDone(this.context, buffer);
|
||||
break;
|
||||
|
||||
case HandshakeType.Finished:
|
||||
return new TlsServerFinished(this.context, buffer);
|
||||
|
||||
// depends if a full (ServerHelloDone) or an abbreviated handshake (ServerHello) is being done
|
||||
bool check = context.AbbreviatedHandshake ? (last == HandshakeType.ServerHello) : (last == HandshakeType.ServerHelloDone);
|
||||
// ChangeCipherSpecDone is not an handshake message (it's a content type) but still needs to be happens before finished
|
||||
if (check && context.ChangeCipherSpecDone) {
|
||||
context.ChangeCipherSpecDone = false;
|
||||
return new TlsServerFinished (this.context, buffer);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new TlsException(
|
||||
AlertDescription.UnexpectedMessage,
|
||||
@@ -172,6 +187,7 @@ namespace Mono.Security.Protocol.Tls
|
||||
"Unknown server handshake message received ({0})",
|
||||
type.ToString()));
|
||||
}
|
||||
throw new TlsException (AlertDescription.HandshakeFailiure, String.Format ("Protocol error, unexpected protocol transition from {0} to {1}", last, type));
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -122,6 +122,8 @@ namespace Mono.Security.Protocol.Tls
|
||||
set { this.protocolNegotiated = value; }
|
||||
}
|
||||
|
||||
public bool ChangeCipherSpecDone { get; set; }
|
||||
|
||||
public SecurityProtocolType SecurityProtocol
|
||||
{
|
||||
get
|
||||
|
||||
@@ -88,6 +88,8 @@ namespace Mono.Security.Protocol.Tls
|
||||
} else {
|
||||
ctx.StartSwitchingSecurityParameters (false);
|
||||
}
|
||||
|
||||
ctx.ChangeCipherSpecDone = true;
|
||||
}
|
||||
|
||||
public virtual HandshakeMessage GetMessage(HandshakeType type)
|
||||
@@ -348,9 +350,6 @@ namespace Mono.Security.Protocol.Tls
|
||||
// Try to read the Record Content Type
|
||||
int type = internalResult.InitialBuffer[0];
|
||||
|
||||
// Set last handshake message received to None
|
||||
this.context.LastHandshakeMsg = HandshakeType.ClientHello;
|
||||
|
||||
ContentType contentType = (ContentType)type;
|
||||
byte[] buffer = this.ReadRecordBuffer(type, record);
|
||||
if (buffer == null)
|
||||
@@ -458,9 +457,6 @@ namespace Mono.Security.Protocol.Tls
|
||||
// Try to read the Record Content Type
|
||||
int type = recordTypeBuffer[0];
|
||||
|
||||
// Set last handshake message received to None
|
||||
this.context.LastHandshakeMsg = HandshakeType.ClientHello;
|
||||
|
||||
ContentType contentType = (ContentType)type;
|
||||
byte[] buffer = this.ReadRecordBuffer(type, record);
|
||||
if (buffer == null)
|
||||
@@ -523,87 +519,11 @@ namespace Mono.Security.Protocol.Tls
|
||||
|
||||
private byte[] ReadRecordBuffer (int contentType, Stream record)
|
||||
{
|
||||
switch (contentType)
|
||||
{
|
||||
case 0x80:
|
||||
return this.ReadClientHelloV2(record);
|
||||
|
||||
default:
|
||||
if (!Enum.IsDefined(typeof(ContentType), (ContentType)contentType))
|
||||
{
|
||||
throw new TlsException(AlertDescription.DecodeError);
|
||||
}
|
||||
return this.ReadStandardRecordBuffer(record);
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] ReadClientHelloV2 (Stream record)
|
||||
{
|
||||
int msgLength = record.ReadByte ();
|
||||
// process further only if the whole record is available
|
||||
if (record.CanSeek && (msgLength + 1 > record.Length))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
byte[] message = new byte[msgLength];
|
||||
record.Read (message, 0, msgLength);
|
||||
|
||||
int msgType = message [0];
|
||||
if (msgType != 1)
|
||||
{
|
||||
throw new TlsException(AlertDescription.DecodeError);
|
||||
}
|
||||
int protocol = (message [1] << 8 | message [2]);
|
||||
int cipherSpecLength = (message [3] << 8 | message [4]);
|
||||
int sessionIdLength = (message [5] << 8 | message [6]);
|
||||
int challengeLength = (message [7] << 8 | message [8]);
|
||||
int length = (challengeLength > 32) ? 32 : challengeLength;
|
||||
|
||||
// Read CipherSpecs
|
||||
byte[] cipherSpecV2 = new byte[cipherSpecLength];
|
||||
Buffer.BlockCopy (message, 9, cipherSpecV2, 0, cipherSpecLength);
|
||||
|
||||
// Read session ID
|
||||
byte[] sessionId = new byte[sessionIdLength];
|
||||
Buffer.BlockCopy (message, 9 + cipherSpecLength, sessionId, 0, sessionIdLength);
|
||||
|
||||
// Read challenge ID
|
||||
byte[] challenge = new byte[challengeLength];
|
||||
Buffer.BlockCopy (message, 9 + cipherSpecLength + sessionIdLength, challenge, 0, challengeLength);
|
||||
|
||||
if (challengeLength < 16 || cipherSpecLength == 0 || (cipherSpecLength % 3) != 0)
|
||||
if (!Enum.IsDefined(typeof(ContentType), (ContentType)contentType))
|
||||
{
|
||||
throw new TlsException(AlertDescription.DecodeError);
|
||||
}
|
||||
|
||||
// Updated the Session ID
|
||||
if (sessionId.Length > 0)
|
||||
{
|
||||
this.context.SessionId = sessionId;
|
||||
}
|
||||
|
||||
// Update the protocol version
|
||||
this.Context.ChangeProtocol((short)protocol);
|
||||
|
||||
// Select the Cipher suite
|
||||
this.ProcessCipherSpecV2Buffer(this.Context.SecurityProtocol, cipherSpecV2);
|
||||
|
||||
// Updated the Client Random
|
||||
this.context.ClientRandom = new byte [32]; // Always 32
|
||||
// 1. if challenge is bigger than 32 bytes only use the last 32 bytes
|
||||
// 2. right justify (0) challenge in ClientRandom if less than 32
|
||||
Buffer.BlockCopy (challenge, challenge.Length - length, this.context.ClientRandom, 32 - length, length);
|
||||
|
||||
// Set
|
||||
this.context.LastHandshakeMsg = HandshakeType.ClientHello;
|
||||
this.context.ProtocolNegotiated = true;
|
||||
|
||||
return message;
|
||||
}
|
||||
|
||||
private byte[] ReadStandardRecordBuffer (Stream record)
|
||||
{
|
||||
byte[] header = new byte[4];
|
||||
if (record.Read (header, 0, 4) != 4)
|
||||
throw new TlsException ("buffer underrun");
|
||||
@@ -1031,96 +951,5 @@ namespace Mono.Security.Protocol.Tls
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region CipherSpecV2 processing
|
||||
|
||||
private void ProcessCipherSpecV2Buffer (SecurityProtocolType protocol, byte[] buffer)
|
||||
{
|
||||
TlsStream codes = new TlsStream(buffer);
|
||||
|
||||
string prefix = (protocol == SecurityProtocolType.Ssl3) ? "SSL_" : "TLS_";
|
||||
|
||||
while (codes.Position < codes.Length)
|
||||
{
|
||||
byte check = codes.ReadByte();
|
||||
|
||||
if (check == 0)
|
||||
{
|
||||
// SSL/TLS cipher spec
|
||||
short code = codes.ReadInt16();
|
||||
int index = this.Context.SupportedCiphers.IndexOf(code);
|
||||
if (index != -1)
|
||||
{
|
||||
this.Context.Negotiating.Cipher = this.Context.SupportedCiphers[index];
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
byte[] tmp = new byte[2];
|
||||
codes.Read(tmp, 0, tmp.Length);
|
||||
|
||||
int tmpCode = ((check & 0xff) << 16) | ((tmp[0] & 0xff) << 8) | (tmp[1] & 0xff);
|
||||
CipherSuite cipher = this.MapV2CipherCode(prefix, tmpCode);
|
||||
|
||||
if (cipher != null)
|
||||
{
|
||||
this.Context.Negotiating.Cipher = cipher;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (this.Context.Negotiating == null)
|
||||
{
|
||||
throw new TlsException(AlertDescription.InsuficientSecurity, "Insuficient Security");
|
||||
}
|
||||
}
|
||||
|
||||
private CipherSuite MapV2CipherCode(string prefix, int code)
|
||||
{
|
||||
try
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 65664:
|
||||
// TLS_RC4_128_WITH_MD5
|
||||
return this.Context.SupportedCiphers[prefix + "RSA_WITH_RC4_128_MD5"];
|
||||
|
||||
case 131200:
|
||||
// TLS_RC4_128_EXPORT40_WITH_MD5
|
||||
return this.Context.SupportedCiphers[prefix + "RSA_EXPORT_WITH_RC4_40_MD5"];
|
||||
|
||||
case 196736:
|
||||
// TLS_RC2_CBC_128_CBC_WITH_MD5
|
||||
return this.Context.SupportedCiphers[prefix + "RSA_EXPORT_WITH_RC2_CBC_40_MD5"];
|
||||
|
||||
case 262272:
|
||||
// TLS_RC2_CBC_128_CBC_EXPORT40_WITH_MD5
|
||||
return this.Context.SupportedCiphers[prefix + "RSA_EXPORT_WITH_RC2_CBC_40_MD5"];
|
||||
|
||||
case 327808:
|
||||
// TLS_IDEA_128_CBC_WITH_MD5
|
||||
return null;
|
||||
|
||||
case 393280:
|
||||
// TLS_DES_64_CBC_WITH_MD5
|
||||
return null;
|
||||
|
||||
case 458944:
|
||||
// TLS_DES_192_EDE3_CBC_WITH_MD5
|
||||
return null;
|
||||
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -33,6 +33,8 @@ namespace Mono.Security.Protocol.Tls
|
||||
{
|
||||
internal class ServerRecordProtocol : RecordProtocol
|
||||
{
|
||||
TlsClientCertificate cert;
|
||||
|
||||
#region Constructors
|
||||
|
||||
public ServerRecordProtocol(
|
||||
@@ -93,30 +95,45 @@ namespace Mono.Security.Protocol.Tls
|
||||
private HandshakeMessage createClientHandshakeMessage(
|
||||
HandshakeType type, byte[] buffer)
|
||||
{
|
||||
var last = context.LastHandshakeMsg;
|
||||
switch (type)
|
||||
{
|
||||
case HandshakeType.ClientHello:
|
||||
return new TlsClientHello(this.context, buffer);
|
||||
|
||||
case HandshakeType.Certificate:
|
||||
return new TlsClientCertificate(this.context, buffer);
|
||||
if (last != HandshakeType.ClientHello)
|
||||
break;
|
||||
cert = new TlsClientCertificate(this.context, buffer);
|
||||
return cert;
|
||||
|
||||
case HandshakeType.ClientKeyExchange:
|
||||
return new TlsClientKeyExchange(this.context, buffer);
|
||||
if (last == HandshakeType.ClientHello || last == HandshakeType.Certificate)
|
||||
return new TlsClientKeyExchange(this.context, buffer);
|
||||
break;
|
||||
|
||||
case HandshakeType.CertificateVerify:
|
||||
return new TlsClientCertificateVerify(this.context, buffer);
|
||||
if (last == HandshakeType.ClientKeyExchange && cert != null)
|
||||
return new TlsClientCertificateVerify(this.context, buffer);
|
||||
break;
|
||||
|
||||
case HandshakeType.Finished:
|
||||
return new TlsClientFinished(this.context, buffer);
|
||||
|
||||
// Certificates are optional, but if provided, they should send a CertificateVerify
|
||||
bool check = (cert == null) ? (last == HandshakeType.ClientKeyExchange) : (last == HandshakeType.CertificateVerify);
|
||||
// ChangeCipherSpecDone is not an handshake message (it's a content type) but still needs to be happens before finished
|
||||
if (check && context.ChangeCipherSpecDone) {
|
||||
context.ChangeCipherSpecDone = false;
|
||||
return new TlsClientFinished(this.context, buffer);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new TlsException(
|
||||
AlertDescription.UnexpectedMessage,
|
||||
String.Format(CultureInfo.CurrentUICulture,
|
||||
"Unknown server handshake message received ({0})",
|
||||
type.ToString()));
|
||||
throw new TlsException(AlertDescription.UnexpectedMessage, String.Format(CultureInfo.CurrentUICulture,
|
||||
"Unknown server handshake message received ({0})",
|
||||
type.ToString()));
|
||||
break;
|
||||
}
|
||||
throw new TlsException (AlertDescription.HandshakeFailiure, String.Format ("Protocol error, unexpected protocol transition from {0} to {1}", last, type));
|
||||
}
|
||||
|
||||
private HandshakeMessage createServerHandshakeMessage(
|
||||
|
||||
@@ -190,59 +190,15 @@ namespace Mono.Security.Protocol.Tls
|
||||
this.Context.ClientWriteKey = keyBlock.ReadBytes(this.KeyMaterialSize);
|
||||
this.Context.ServerWriteKey = keyBlock.ReadBytes(this.KeyMaterialSize);
|
||||
|
||||
if (!this.IsExportable)
|
||||
if (this.IvSize != 0)
|
||||
{
|
||||
if (this.IvSize != 0)
|
||||
{
|
||||
this.Context.ClientWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
this.Context.ServerWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Context.ClientWriteIV = CipherSuite.EmptyArray;
|
||||
this.Context.ServerWriteIV = CipherSuite.EmptyArray;
|
||||
}
|
||||
this.Context.ClientWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
this.Context.ServerWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
HashAlgorithm md5 = MD5.Create();
|
||||
|
||||
int keySize = (md5.HashSize >> 3); //in bytes not bits
|
||||
byte[] temp = new byte [keySize];
|
||||
|
||||
// Generate final write keys
|
||||
md5.TransformBlock(this.Context.ClientWriteKey, 0, this.Context.ClientWriteKey.Length, temp, 0);
|
||||
md5.TransformFinalBlock(this.Context.RandomCS, 0, this.Context.RandomCS.Length);
|
||||
byte[] finalClientWriteKey = new byte[this.ExpandedKeyMaterialSize];
|
||||
Buffer.BlockCopy(md5.Hash, 0, finalClientWriteKey, 0, this.ExpandedKeyMaterialSize);
|
||||
|
||||
md5.Initialize();
|
||||
md5.TransformBlock(this.Context.ServerWriteKey, 0, this.Context.ServerWriteKey.Length, temp, 0);
|
||||
md5.TransformFinalBlock(this.Context.RandomSC, 0, this.Context.RandomSC.Length);
|
||||
byte[] finalServerWriteKey = new byte[this.ExpandedKeyMaterialSize];
|
||||
Buffer.BlockCopy(md5.Hash, 0, finalServerWriteKey, 0, this.ExpandedKeyMaterialSize);
|
||||
|
||||
this.Context.ClientWriteKey = finalClientWriteKey;
|
||||
this.Context.ServerWriteKey = finalServerWriteKey;
|
||||
|
||||
// Generate IV keys
|
||||
if (this.IvSize > 0)
|
||||
{
|
||||
md5.Initialize();
|
||||
temp = md5.ComputeHash(this.Context.RandomCS, 0, this.Context.RandomCS.Length);
|
||||
this.Context.ClientWriteIV = new byte[this.IvSize];
|
||||
Buffer.BlockCopy(temp, 0, this.Context.ClientWriteIV, 0, this.IvSize);
|
||||
|
||||
md5.Initialize();
|
||||
temp = md5.ComputeHash(this.Context.RandomSC, 0, this.Context.RandomSC.Length);
|
||||
this.Context.ServerWriteIV = new byte[this.IvSize];
|
||||
Buffer.BlockCopy(temp, 0, this.Context.ServerWriteIV, 0, this.IvSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Context.ClientWriteIV = CipherSuite.EmptyArray;
|
||||
this.Context.ServerWriteIV = CipherSuite.EmptyArray;
|
||||
}
|
||||
this.Context.ClientWriteIV = CipherSuite.EmptyArray;
|
||||
this.Context.ServerWriteIV = CipherSuite.EmptyArray;
|
||||
}
|
||||
|
||||
DebugHelper.WriteLine(">>>> KeyBlock", keyBlock.ToArray());
|
||||
|
||||
@@ -588,14 +588,20 @@ namespace Mono.Security.Protocol.Tls
|
||||
}
|
||||
catch (TlsException ex)
|
||||
{
|
||||
// FIXME: should the send alert also be done asynchronously here and below?
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
negotiate.SetComplete (new IOException("The authentication or decryption has failed.", ex));
|
||||
try {
|
||||
Exception e = ex;
|
||||
this.protocol.SendAlert(ex.Alert != null ? ex.Alert : new Alert (AlertDescription.InternalError));
|
||||
} catch {
|
||||
}
|
||||
negotiate.SetComplete(new IOException("The authentication or decryption has failed.", ex));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
this.protocol.SendAlert(AlertDescription.InternalError);
|
||||
negotiate.SetComplete (new IOException("The authentication or decryption has failed.", ex));
|
||||
try {
|
||||
this.protocol.SendAlert(AlertDescription.InternalError);
|
||||
} catch {
|
||||
}
|
||||
negotiate.SetComplete(new IOException("The authentication or decryption has failed.", ex));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -233,16 +233,8 @@ namespace Mono.Security.Protocol.Tls
|
||||
// Send ServerCertificate message
|
||||
this.protocol.SendRecord(HandshakeType.Certificate);
|
||||
|
||||
// If the negotiated cipher is a KeyEx cipher send ServerKeyExchange
|
||||
if (this.context.Negotiating.Cipher.IsExportable)
|
||||
{
|
||||
this.protocol.SendRecord(HandshakeType.ServerKeyExchange);
|
||||
}
|
||||
|
||||
// If the negotiated cipher is a KeyEx cipher or
|
||||
// the client certificate is required send the CertificateRequest message
|
||||
if (this.context.Negotiating.Cipher.IsExportable ||
|
||||
((ServerContext)this.context).ClientCertificateRequired ||
|
||||
// If the client certificate is required send the CertificateRequest message
|
||||
if (((ServerContext)this.context).ClientCertificateRequired ||
|
||||
((ServerContext)this.context).RequestClientCertificate)
|
||||
{
|
||||
this.protocol.SendRecord(HandshakeType.CertificateRequest);
|
||||
|
||||
@@ -123,45 +123,15 @@ namespace Mono.Security.Protocol.Tls
|
||||
this.Context.ClientWriteKey = keyBlock.ReadBytes(this.KeyMaterialSize);
|
||||
this.Context.ServerWriteKey = keyBlock.ReadBytes(this.KeyMaterialSize);
|
||||
|
||||
if (!this.IsExportable)
|
||||
if (this.IvSize != 0)
|
||||
{
|
||||
if (this.IvSize != 0)
|
||||
{
|
||||
this.Context.ClientWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
this.Context.ServerWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Context.ClientWriteIV = CipherSuite.EmptyArray;
|
||||
this.Context.ServerWriteIV = CipherSuite.EmptyArray;
|
||||
}
|
||||
this.Context.ClientWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
this.Context.ServerWriteIV = keyBlock.ReadBytes(this.IvSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Generate final write keys
|
||||
byte[] finalClientWriteKey = PRF(this.Context.ClientWriteKey, "client write key", this.Context.RandomCS, this.ExpandedKeyMaterialSize);
|
||||
byte[] finalServerWriteKey = PRF(this.Context.ServerWriteKey, "server write key", this.Context.RandomCS, this.ExpandedKeyMaterialSize);
|
||||
|
||||
this.Context.ClientWriteKey = finalClientWriteKey;
|
||||
this.Context.ServerWriteKey = finalServerWriteKey;
|
||||
|
||||
if (this.IvSize > 0)
|
||||
{
|
||||
// Generate IV block
|
||||
byte[] ivBlock = PRF(CipherSuite.EmptyArray, "IV block", this.Context.RandomCS, this.IvSize*2);
|
||||
|
||||
// Generate IV keys
|
||||
this.Context.ClientWriteIV = new byte[this.IvSize];
|
||||
Buffer.BlockCopy(ivBlock, 0, this.Context.ClientWriteIV, 0, this.Context.ClientWriteIV.Length);
|
||||
|
||||
this.Context.ServerWriteIV = new byte[this.IvSize];
|
||||
Buffer.BlockCopy(ivBlock, this.IvSize, this.Context.ServerWriteIV, 0, this.Context.ServerWriteIV.Length);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.Context.ClientWriteIV = CipherSuite.EmptyArray;
|
||||
this.Context.ServerWriteIV = CipherSuite.EmptyArray;
|
||||
}
|
||||
this.Context.ClientWriteIV = CipherSuite.EmptyArray;
|
||||
this.Context.ServerWriteIV = CipherSuite.EmptyArray;
|
||||
}
|
||||
|
||||
DebugHelper.WriteLine(">>>> KeyBlock", keyBlock.ToArray());
|
||||
|
||||
@@ -538,7 +538,8 @@ namespace System {
|
||||
lock (_lock) {
|
||||
if (defaultZone != null)
|
||||
return defaultZone;
|
||||
return defaultZone = GetTimeZone ("Local", GetDefaultTimeZoneName ());
|
||||
var id = GetDefaultTimeZoneName ();
|
||||
return defaultZone = GetTimeZone (id, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -426,12 +426,6 @@ namespace System
|
||||
return FromRegistryKey(id, key);
|
||||
}
|
||||
#endif
|
||||
#if MONODROID
|
||||
var timeZoneInfo = AndroidTimeZones.GetTimeZone (id, id);
|
||||
if (timeZoneInfo == null)
|
||||
throw new TimeZoneNotFoundException ();
|
||||
return timeZoneInfo;
|
||||
#else
|
||||
// Local requires special logic that already exists in the Local property (bug #326)
|
||||
if (id == "Local")
|
||||
return Local;
|
||||
@@ -439,12 +433,16 @@ namespace System
|
||||
using (Stream stream = GetMonoTouchData (id)) {
|
||||
return BuildFromStream (id, stream);
|
||||
}
|
||||
#elif MONODROID
|
||||
var timeZoneInfo = AndroidTimeZones.GetTimeZone (id, id);
|
||||
if (timeZoneInfo == null)
|
||||
throw new TimeZoneNotFoundException ();
|
||||
return timeZoneInfo;
|
||||
#elif LIBC
|
||||
string filepath = Path.Combine (TimeZoneDirectory, id);
|
||||
return FindSystemTimeZoneByFileName (id, filepath);
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -401,9 +401,14 @@ namespace MonoTests.System.Threading
|
||||
{
|
||||
var v = new ReaderWriterLockSlim ();
|
||||
int local = 10;
|
||||
int ready_count = 0;
|
||||
int entered_count = 0;
|
||||
const int thread_count = 10;
|
||||
|
||||
var r = from i in Enumerable.Range (1, 10) select new Thread (() => {
|
||||
var r = from i in Enumerable.Range (1, thread_count) select new Thread (() => {
|
||||
Interlocked.Increment (ref ready_count);
|
||||
v.EnterReadLock ();
|
||||
Interlocked.Increment (ref entered_count);
|
||||
|
||||
Assert.AreEqual (11, local);
|
||||
});
|
||||
@@ -415,12 +420,16 @@ namespace MonoTests.System.Threading
|
||||
t.Start ();
|
||||
}
|
||||
|
||||
Thread.Sleep (200);
|
||||
while (ready_count != thread_count)
|
||||
Thread.Sleep (10);
|
||||
|
||||
/* Extra up to 2s of sleep to ensure all threads got the chance to enter the lock */
|
||||
for (int i = 0; i < 200 && v.WaitingReadCount != thread_count; ++i)
|
||||
Thread.Sleep (10);
|
||||
local = 11;
|
||||
|
||||
// FIXME: Don't rely on Thread.Sleep (200)
|
||||
Assert.AreEqual (0, v.WaitingWriteCount, "in waiting write");
|
||||
Assert.AreEqual (10, v.WaitingReadCount, "in waiting read");
|
||||
Assert.AreEqual (thread_count, v.WaitingReadCount, "in waiting read");
|
||||
Assert.AreEqual (0, v.WaitingUpgradeCount, "in waiting upgrade");
|
||||
v.ExitWriteLock ();
|
||||
|
||||
|
||||
@@ -257,6 +257,11 @@ namespace System.Net.Http.Headers
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!Lexer.IsValidCharacter (ch) || ch == '*' || ch == '?' || ch == '%') {
|
||||
sb.Append (Uri.HexEscape (ch));
|
||||
continue;
|
||||
}
|
||||
|
||||
sb.Append (ch);
|
||||
}
|
||||
|
||||
|
||||
@@ -193,13 +193,18 @@ namespace System.Net.Http.Headers
|
||||
//
|
||||
for (; i < input.Length; ++i) {
|
||||
char s = input[i];
|
||||
if (s > last_token_char || !token_chars[s])
|
||||
if (!IsValidCharacter (s))
|
||||
return false;
|
||||
}
|
||||
|
||||
return i > 0;
|
||||
}
|
||||
|
||||
public static bool IsValidCharacter (char input)
|
||||
{
|
||||
return input <= last_token_char && token_chars[input];
|
||||
}
|
||||
|
||||
public void EatChar ()
|
||||
{
|
||||
++pos;
|
||||
|
||||
+4
-1
@@ -237,8 +237,11 @@ namespace MonoTests.System.Net.Http.Headers
|
||||
value.FileNameStar = "č";
|
||||
Assert.AreEqual ("č", value.FileNameStar, "#11");
|
||||
Assert.AreEqual (new NameValueHeaderValue ("filename*", "utf-8''%C4%8D"), value.Parameters.First (), "#12");
|
||||
}
|
||||
|
||||
value.FileNameStar = "@x*\\%?.txt";
|
||||
Assert.AreEqual ("@x*\\%?.txt", value.FileNameStar, "#21");
|
||||
Assert.AreEqual (new NameValueHeaderValue ("filename*", "utf-8''%40x%2A%5C%25%3F.txt"), value.Parameters.First (), "#22");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Properties_Name ()
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
// Copyright 2003 Ximian, Inc. (http://www.ximian.com)
|
||||
// Copyright 2006, 2010 Novell, Inc. (http://www.novell.com)
|
||||
// Copyright 2012 Xamarin Inc. (http://www.xamarin.com)
|
||||
// Copyright 2014 Microsoft Inc
|
||||
//
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
@@ -553,6 +554,21 @@ namespace System.Net
|
||||
}
|
||||
}
|
||||
|
||||
// From the Microsoft reference source
|
||||
string MapToDefaultMethod(Uri address) {
|
||||
Uri uri;
|
||||
if (!address.IsAbsoluteUri && baseAddress != null) {
|
||||
uri = new Uri(baseAddress, address);
|
||||
} else {
|
||||
uri = address;
|
||||
}
|
||||
if (uri.Scheme.ToLower(System.Globalization.CultureInfo.InvariantCulture) == "ftp") {
|
||||
return WebRequestMethods.Ftp.UploadFile;
|
||||
} else {
|
||||
return "POST";
|
||||
}
|
||||
}
|
||||
|
||||
byte [] UploadFileCore (Uri address, string method, string fileName, object userToken)
|
||||
{
|
||||
string fileCType = Headers ["Content-Type"];
|
||||
@@ -565,7 +581,10 @@ namespace System.Net
|
||||
fileCType = "application/octet-stream";
|
||||
}
|
||||
|
||||
bool needs_boundary = (method != "PUT"); // only verified case so far
|
||||
if (method == null)
|
||||
method = MapToDefaultMethod (address);
|
||||
|
||||
bool needs_boundary = (method != "PUT" && method != WebRequestMethods.Ftp.UploadFile); // only verified case so far
|
||||
string boundary = null;
|
||||
if (needs_boundary) {
|
||||
boundary = "------------" + DateTime.Now.Ticks.ToString ("x");
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#if NET_2_0
|
||||
using NUnit.Framework;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
@@ -23,6 +24,31 @@ namespace MonoTests.System.Net
|
||||
{
|
||||
FtpWebRequest defaultRequest;
|
||||
|
||||
private string _tempDirectory;
|
||||
private string _tempFile;
|
||||
|
||||
[SetUp]
|
||||
public void SetUp ()
|
||||
{
|
||||
_tempDirectory = Path.Combine (Path.GetTempPath (), "MonoTests.System.Net.FileWebRequestTest");
|
||||
_tempFile = Path.Combine (_tempDirectory, "FtpWebRequestTest.tmp");
|
||||
if (!Directory.Exists (_tempDirectory)) {
|
||||
Directory.CreateDirectory (_tempDirectory);
|
||||
} else {
|
||||
// ensure no files are left over from previous runs
|
||||
string [] files = Directory.GetFiles (_tempDirectory, "*");
|
||||
foreach (string file in files)
|
||||
File.Delete (file);
|
||||
}
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public void TearDown ()
|
||||
{
|
||||
if (Directory.Exists (_tempDirectory))
|
||||
Directory.Delete (_tempDirectory, true);
|
||||
}
|
||||
|
||||
[TestFixtureSetUp]
|
||||
public void Init ()
|
||||
{
|
||||
@@ -183,13 +209,15 @@ namespace MonoTests.System.Net
|
||||
ftp.KeepAlive = false;
|
||||
ftp.Timeout = 5000;
|
||||
ftp.Method = WebRequestMethods.Ftp.UploadFile;
|
||||
ftp.ContentLength = 1;
|
||||
ftp.ContentLength = 10;
|
||||
ftp.UseBinary = true;
|
||||
Stream stream = ftp.GetRequestStream ();
|
||||
stream.WriteByte (0);
|
||||
for (int i = 0; i < 10; i++)
|
||||
stream.WriteByte ((byte)i);
|
||||
stream.Close ();
|
||||
FtpWebResponse response = (FtpWebResponse) ftp.GetResponse ();
|
||||
Assert.IsTrue ((int) response.StatusCode >= 200 && (int) response.StatusCode < 300, "UP#01");
|
||||
Assert.AreEqual (10, sp.result.Count, "UP#02");
|
||||
response.Close ();
|
||||
} catch (Exception) {
|
||||
if (!String.IsNullOrEmpty (sp.Where))
|
||||
@@ -200,6 +228,24 @@ namespace MonoTests.System.Net
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void UploadFile_WebClient ()
|
||||
{
|
||||
ServerPut sp = new ServerPut ();
|
||||
File.WriteAllText (_tempFile, "0123456789");
|
||||
sp.Start ();
|
||||
|
||||
using (WebClient m_WebClient = new WebClient())
|
||||
{
|
||||
string uri = String.Format ("ftp://{0}:{1}/uploads/file.txt", sp.IPAddress, sp.Port);
|
||||
|
||||
m_WebClient.UploadFile(uri, _tempFile);
|
||||
}
|
||||
Assert.AreEqual (10, sp.result.Count, "WebClient/Ftp#01");
|
||||
|
||||
sp.Stop ();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DownloadFile1 ()
|
||||
{
|
||||
@@ -464,6 +510,8 @@ namespace MonoTests.System.Net
|
||||
}
|
||||
|
||||
class ServerPut : FtpServer {
|
||||
public List<byte> result = new List<byte> ();
|
||||
|
||||
protected override void Run ()
|
||||
{
|
||||
Socket client = control.Accept ();
|
||||
@@ -511,8 +559,12 @@ namespace MonoTests.System.Net
|
||||
writer.Flush ();
|
||||
|
||||
Socket data_cnc = data.Accept ();
|
||||
byte [] dontcare = new byte [1];
|
||||
data_cnc.Receive (dontcare, 1, SocketFlags.None);
|
||||
var datastr = new NetworkStream (data_cnc, false);
|
||||
int ch;
|
||||
while ((ch = datastr.ReadByte ()) != -1){
|
||||
result.Add ((byte)ch);
|
||||
|
||||
}
|
||||
data_cnc.Close ();
|
||||
writer.WriteLine ("226 File received Ok");
|
||||
writer.Flush ();
|
||||
|
||||
@@ -807,15 +807,20 @@ namespace MonoTests.System.Threading.Tasks
|
||||
finished ++;
|
||||
Monitor.Pulse (monitor);
|
||||
}
|
||||
return r;
|
||||
return r ? 1 : 10; //1 -> ok, 10 -> evt wait failed
|
||||
});
|
||||
var cntd = new CountdownEvent (2);
|
||||
var cntd2 = new CountdownEvent (2);
|
||||
|
||||
bool r1 = false, r2 = false;
|
||||
int r1 = 0, r2 = 0;
|
||||
ThreadPool.QueueUserWorkItem (delegate {
|
||||
cntd.Signal ();
|
||||
r1 = t.Wait (1000) && t.Result;
|
||||
if (!t.Wait (1000))
|
||||
r1 = 20; // 20 -> task wait failed
|
||||
else if (t.Result != 1)
|
||||
r1 = 30 + t.Result; // 30 -> task result is bad
|
||||
else
|
||||
r1 = 2; //2 -> ok
|
||||
cntd2.Signal ();
|
||||
lock (monitor) {
|
||||
finished ++;
|
||||
@@ -824,7 +829,13 @@ namespace MonoTests.System.Threading.Tasks
|
||||
});
|
||||
ThreadPool.QueueUserWorkItem (delegate {
|
||||
cntd.Signal ();
|
||||
r2 = t.Wait (1000) && t.Result;
|
||||
if (!t.Wait (1000))
|
||||
r2 = 40; // 40 -> task wait failed
|
||||
else if (t.Result != 1)
|
||||
r2 = 50 + t.Result; // 50 -> task result is bad
|
||||
else
|
||||
r2 = 3; //3 -> ok
|
||||
|
||||
cntd2.Signal ();
|
||||
lock (monitor) {
|
||||
finished ++;
|
||||
@@ -834,8 +845,8 @@ namespace MonoTests.System.Threading.Tasks
|
||||
Assert.IsTrue (cntd.Wait (2000), "#1");
|
||||
evt.Set ();
|
||||
Assert.IsTrue (cntd2.Wait (2000), "#2");
|
||||
Assert.IsTrue (r1, "r1");
|
||||
Assert.IsTrue (r2, "r2");
|
||||
Assert.AreEqual (2, r1, "r1");
|
||||
Assert.AreEqual (3, r2, "r2");
|
||||
|
||||
// Wait for everything to finish to avoid overloading the tpool
|
||||
lock (monitor) {
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
// CS7048: First argument of a security attribute `CustomSecurityAttribute' must be a valid SecurityAction
|
||||
// Line: 20
|
||||
|
||||
using System.Security;
|
||||
using System.Security.Permissions;
|
||||
|
||||
public class CustomSecurityAttribute : CodeAccessSecurityAttribute
|
||||
{
|
||||
public CustomSecurityAttribute ()
|
||||
: base (SecurityAction.Demand)
|
||||
{
|
||||
}
|
||||
|
||||
public override IPermission CreatePermission()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
[CustomSecurity]
|
||||
class X
|
||||
{
|
||||
public static void Main ()
|
||||
{
|
||||
}
|
||||
}
|
||||
+34
-7
@@ -832,9 +832,9 @@ namespace Mono.CSharp {
|
||||
/// </summary>
|
||||
bool IsSecurityActionValid ()
|
||||
{
|
||||
SecurityAction action = GetSecurityActionValue ();
|
||||
Constant c = null;
|
||||
var action = GetSecurityActionValue (ref c);
|
||||
bool for_assembly = Target == AttributeTargets.Assembly || Target == AttributeTargets.Module;
|
||||
var c = (Constant)pos_args [0].Expr;
|
||||
|
||||
switch (action) {
|
||||
#pragma warning disable 618
|
||||
@@ -855,6 +855,10 @@ namespace Mono.CSharp {
|
||||
return true;
|
||||
break;
|
||||
#pragma warning restore 618
|
||||
case null:
|
||||
Report.Error (7048, loc, "First argument of a security attribute `{0}' must be a valid SecurityAction",
|
||||
Type.GetSignatureForError ());
|
||||
return false;
|
||||
|
||||
default:
|
||||
Report.Error (7049, c.Location, "Security attribute `{0}' has an invalid SecurityAction value `{1}'",
|
||||
@@ -876,9 +880,25 @@ namespace Mono.CSharp {
|
||||
return false;
|
||||
}
|
||||
|
||||
System.Security.Permissions.SecurityAction GetSecurityActionValue ()
|
||||
SecurityAction? GetSecurityActionValue (ref Constant value)
|
||||
{
|
||||
return (SecurityAction) ((Constant) pos_args[0].Expr).GetValue ();
|
||||
if (pos_args == null) {
|
||||
var predefined = context.Module.PredefinedAttributes;
|
||||
|
||||
//
|
||||
// BCL defines System.Security.Permissions.HostProtectionAttribute with parameterless
|
||||
// contructor which should not be valid but it's already part of the framework
|
||||
//
|
||||
if (Type == predefined.HostProtection.TypeSpec) {
|
||||
value = new IntConstant (context.Module.Compiler.BuiltinTypes, (int)SecurityAction.LinkDemand, loc);
|
||||
return SecurityAction.LinkDemand;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
value = (Constant) pos_args [0].Expr;
|
||||
return (SecurityAction) value.GetValue ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -888,9 +908,14 @@ namespace Mono.CSharp {
|
||||
public void ExtractSecurityPermissionSet (MethodSpec ctor, ref SecurityType permissions)
|
||||
{
|
||||
#if STATIC
|
||||
object[] values = new object[pos_args.Count];
|
||||
for (int i = 0; i < values.Length; ++i)
|
||||
values[i] = ((Constant) pos_args[i].Expr).GetValue ();
|
||||
object[] values;
|
||||
if (pos_args != null) {
|
||||
values = new object[pos_args.Count];
|
||||
for (int i = 0; i < values.Length; ++i)
|
||||
values[i] = ((Constant) pos_args[i].Expr).GetValue ();
|
||||
} else {
|
||||
values = null;
|
||||
}
|
||||
|
||||
PropertyInfo[] prop;
|
||||
object[] prop_values;
|
||||
@@ -1679,6 +1704,7 @@ namespace Mono.CSharp {
|
||||
public readonly PredefinedDebuggerBrowsableAttribute DebuggerBrowsable;
|
||||
public readonly PredefinedAttribute DebuggerStepThrough;
|
||||
public readonly PredefinedDebuggableAttribute Debuggable;
|
||||
public readonly PredefinedAttribute HostProtection;
|
||||
|
||||
// New in .NET 3.5
|
||||
public readonly PredefinedAttribute Extension;
|
||||
@@ -1734,6 +1760,7 @@ namespace Mono.CSharp {
|
||||
DefaultParameterValue = new PredefinedAttribute (module, "System.Runtime.InteropServices", "DefaultParameterValueAttribute");
|
||||
OptionalParameter = new PredefinedAttribute (module, "System.Runtime.InteropServices", "OptionalAttribute");
|
||||
UnverifiableCode = new PredefinedAttribute (module, "System.Security", "UnverifiableCodeAttribute");
|
||||
HostProtection = new PredefinedAttribute (module, "System.Security.Permissions", "HostProtectionAttribute");
|
||||
|
||||
DefaultCharset = new PredefinedAttribute (module, "System.Runtime.InteropServices", "DefaultCharSetAttribute");
|
||||
TypeForwarder = new PredefinedAttribute (module, "System.Runtime.CompilerServices", "TypeForwardedToAttribute");
|
||||
|
||||
+13
-1
@@ -1298,7 +1298,7 @@ namespace Mono.CSharp
|
||||
CreateMetadataName (sb);
|
||||
TypeBuilder = Module.CreateBuilder (sb.ToString (), TypeAttr, type_size);
|
||||
} else {
|
||||
TypeBuilder = parent_def.TypeBuilder.DefineNestedType (MemberName.Basename, TypeAttr, null, type_size);
|
||||
TypeBuilder = parent_def.TypeBuilder.DefineNestedType (FilterNestedName (MemberName.Basename), TypeAttr, null, type_size);
|
||||
}
|
||||
|
||||
if (DeclaringAssembly.Importer != null)
|
||||
@@ -1328,6 +1328,18 @@ namespace Mono.CSharp
|
||||
return true;
|
||||
}
|
||||
|
||||
public static string FilterNestedName (string name)
|
||||
{
|
||||
//
|
||||
// SRE API does not handle namespaces and types separately but
|
||||
// determine that from '.' in name. That's problematic because
|
||||
// dot is valid character for type name. By replacing any '.'
|
||||
// in name we avoid any ambiguities and never emit metadata
|
||||
// namespace for nested types
|
||||
//
|
||||
return name.Replace ('.', '_');
|
||||
}
|
||||
|
||||
string[] CreateTypeParameters (TypeParameters parentAllTypeParameters)
|
||||
{
|
||||
string[] names;
|
||||
|
||||
@@ -887,7 +887,7 @@ named_argument
|
||||
|
||||
named_argument_expr
|
||||
: expression_or_error
|
||||
| declaration_expression
|
||||
// | declaration_expression
|
||||
;
|
||||
|
||||
opt_named_modifier
|
||||
|
||||
+1
-1
@@ -425,7 +425,7 @@ namespace Mono.CSharp
|
||||
}
|
||||
|
||||
// Create nested fixed buffer container
|
||||
string name = String.Format ("<{0}>__FixedBuffer{1}", Name, GlobalCounter++);
|
||||
string name = String.Format ("<{0}>__FixedBuffer{1}", TypeDefinition.FilterNestedName (Name), GlobalCounter++);
|
||||
fixed_buffer_type = Parent.TypeBuilder.DefineNestedType (name,
|
||||
TypeAttributes.NestedPublic | TypeAttributes.Sealed | TypeAttributes.BeforeFieldInit,
|
||||
Compiler.BuiltinTypes.ValueType.GetMetaInfo ());
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
// parser test
|
||||
|
||||
class X
|
||||
{
|
||||
public static int T1 (int seconds)
|
||||
{
|
||||
return T1_Foo (value: seconds * 1000);
|
||||
}
|
||||
|
||||
public static int T1_Foo (int value = 0)
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
public static void Main ()
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
using System.Security;
|
||||
using System.Security.Permissions;
|
||||
|
||||
[HostProtection]
|
||||
class X
|
||||
{
|
||||
public static void Main ()
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
|
||||
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Mono.Cecil;
|
||||
|
||||
namespace N
|
||||
{
|
||||
class C
|
||||
{
|
||||
}
|
||||
|
||||
interface I<T>
|
||||
{
|
||||
void Foo (T t);
|
||||
}
|
||||
|
||||
class X : I<C>
|
||||
{
|
||||
async void I<C>.Foo (C c)
|
||||
{
|
||||
await Task.Delay (1);
|
||||
}
|
||||
|
||||
public static void Main ()
|
||||
{
|
||||
var assembly = AssemblyDefinition.ReadAssembly (typeof (X).Assembly.Location);
|
||||
foreach (var t in assembly.MainModule.Types) {
|
||||
PrintType (t, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void PrintType (TypeDefinition td, int indent)
|
||||
{
|
||||
if (td.IsNested && !string.IsNullOrEmpty (td.Namespace))
|
||||
throw new ApplicationException ("BROKEN NESTED TYPE:");
|
||||
Console.WriteLine ("{2} Namespace: {0} Name: {1}", td.Namespace, td.Name, new string (' ', indent * 4));
|
||||
foreach (var tn in td.NestedTypes)
|
||||
PrintType (tn, indent + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,9 +29,9 @@ class DeclarationExpression
|
||||
if (r2 != 8)
|
||||
return 6;
|
||||
|
||||
Out2 (str: "b", v: out var o5);
|
||||
if (o5 != 9)
|
||||
return 7;
|
||||
// Out2 (str: "b", v: out var o5);
|
||||
// if (o5 != 9)
|
||||
// return 7;
|
||||
|
||||
Out3 (out var o6 = 9m);
|
||||
if (o6.GetType () != typeof (decimal))
|
||||
|
||||
@@ -10959,16 +10959,24 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Qux`2+GetEnumerator>c__Iterator0[X,V]">
|
||||
<type name="Qux`2[X,V]">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Qux`2+<System_Collections_IEnumerable_GetEnumerator>c__Iterator0[X,V]">
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="System.Object System.Collections.Generic.IEnumerator<object>.get_Current()" attrs="2529">
|
||||
<size>14</size>
|
||||
</method>
|
||||
<method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
|
||||
<size>14</size>
|
||||
</method>
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="Void Dispose()" attrs="486">
|
||||
<size>1</size>
|
||||
</method>
|
||||
@@ -10979,14 +10987,6 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Qux`2[X,V]">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-272.cs">
|
||||
<type name="Handler`1[T]">
|
||||
@@ -11736,16 +11736,24 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Test+GetEnumerator>c__Iterator0">
|
||||
<type name="Test">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable<int>.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Test+<System_Collections_Generic_IEnumerable<int>_GetEnumerator>c__Iterator0">
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="Int32 System.Collections.Generic.IEnumerator<int>.get_Current()" attrs="2529">
|
||||
<size>14</size>
|
||||
</method>
|
||||
<method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
|
||||
<size>19</size>
|
||||
</method>
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="Void Dispose()" attrs="486">
|
||||
<size>1</size>
|
||||
</method>
|
||||
@@ -11756,14 +11764,6 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Test">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable<int>.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-303.cs">
|
||||
<type name="test.BaseClass">
|
||||
@@ -29260,6 +29260,22 @@
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-named-06.cs">
|
||||
<type name="X">
|
||||
<method name="Int32 T1(Int32)" attrs="150">
|
||||
<size>21</size>
|
||||
</method>
|
||||
<method name="Int32 T1_Foo(Int32)" attrs="150">
|
||||
<size>10</size>
|
||||
</method>
|
||||
<method name="Void Main()" attrs="150">
|
||||
<size>2</size>
|
||||
</method>
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-optional-01.cs">
|
||||
<type name="C">
|
||||
<method name="Void TestA(Int32)" attrs="150">
|
||||
@@ -50891,6 +50907,16 @@
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-910.cs">
|
||||
<type name="X">
|
||||
<method name="Void Main()" attrs="150">
|
||||
<size>2</size>
|
||||
</method>
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-92.cs">
|
||||
<type name="Outer">
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
@@ -62064,11 +62090,6 @@
|
||||
<size>285</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="A+async>c__async0">
|
||||
<method name="Void MoveNext()" attrs="486">
|
||||
<size>61</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="D">
|
||||
<method name="System.Threading.Tasks.Task M()" attrs="129">
|
||||
<size>33</size>
|
||||
@@ -62116,11 +62137,6 @@
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="A+async>c__async0">
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="D+<M>c__async0">
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
@@ -62153,6 +62169,14 @@
|
||||
<size>2</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="A+<Iasync_async>c__async0">
|
||||
<method name="Void MoveNext()" attrs="486">
|
||||
<size>61</size>
|
||||
</method>
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-async-23.cs">
|
||||
<type name="MyContext">
|
||||
@@ -64187,6 +64211,35 @@
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-async-76.cs">
|
||||
<type name="N.C">
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="N.X">
|
||||
<method name="Void N.I<N.C>.Foo(N.C)" attrs="481">
|
||||
<size>27</size>
|
||||
</method>
|
||||
<method name="Void Main()" attrs="150">
|
||||
<size>99</size>
|
||||
</method>
|
||||
<method name="Void PrintType(Mono.Cecil.TypeDefinition, Int32)" attrs="145">
|
||||
<size>138</size>
|
||||
</method>
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="N.X+<N_I<N_C>_Foo>c__async0">
|
||||
<method name="Void MoveNext()" attrs="486">
|
||||
<size>157</size>
|
||||
</method>
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-cls-00.cs">
|
||||
<type name="CLSCLass_6">
|
||||
<method name="Void add_Disposed(Delegate)" attrs="2182">
|
||||
@@ -65646,7 +65699,7 @@
|
||||
<test name="test-decl-expr-01.cs">
|
||||
<type name="DeclarationExpression">
|
||||
<method name="Int32 Main()" attrs="150">
|
||||
<size>252</size>
|
||||
<size>223</size>
|
||||
</method>
|
||||
<method name="Boolean Out(Int32 ByRef)" attrs="145">
|
||||
<size>13</size>
|
||||
|
||||
@@ -146,7 +146,7 @@ sgen_gray_object_dequeue (SgenGrayQueue *queue)
|
||||
entry = *queue->cursor--;
|
||||
|
||||
#ifdef SGEN_HEAVY_BINARY_PROTOCOL
|
||||
binary_protocol_gray_dequeue (queue, queue->cursor + 1, obj);
|
||||
binary_protocol_gray_dequeue (queue, queue->cursor + 1, entry.obj);
|
||||
#endif
|
||||
|
||||
if (G_UNLIKELY (queue->cursor < GRAY_FIRST_CURSOR_POSITION (queue->first))) {
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
#ifndef __MONO_SGEN_GRAY_H__
|
||||
#define __MONO_SGEN_GRAY_H__
|
||||
|
||||
#include "sgen-protocol.h"
|
||||
|
||||
/*
|
||||
* This gray queue has to be as optimized as possible, because it is in the core of
|
||||
* the mark/copy phase of the garbage collector. The memory access has then to be as
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "metadata/sgen-cardtable.h"
|
||||
#include "metadata/sgen-memory-governor.h"
|
||||
#include "utils/mono-mmap.h"
|
||||
#include "utils/mono-compiler.h"
|
||||
|
||||
#define LOS_SECTION_SIZE (1024 * 1024)
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "utils/mono-compiler.h"
|
||||
#include "metadata/sgen-gc.h"
|
||||
#include "metadata/sgen-pointer-queue.h"
|
||||
|
||||
|
||||
@@ -191,8 +191,6 @@ buildver-boehm.h: libmini-static.la $(monodir)/mono/metadata/libmonoruntime-stat
|
||||
endif
|
||||
@echo "const char *build_date = \"`date`\";" > buildver-boehm.h
|
||||
mono_boehm-main.$(OBJEXT): buildver-boehm.h
|
||||
main.c: buildver-boehm.h
|
||||
|
||||
endif
|
||||
|
||||
if DISABLE_EXECUTABLES
|
||||
@@ -202,8 +200,7 @@ buildver-sgen.h: libmini-static.la $(monodir)/mono/metadata/libmonoruntimesgen-s
|
||||
endif
|
||||
@echo "const char *build_date = \"`date`\";" > buildver-sgen.h
|
||||
mono_sgen-main-sgen.$(OBJEXT): buildver-sgen.h
|
||||
main-sgen.c: buildver-sgen.h
|
||||
|
||||
main-sgen.$(OBJEXT): buildver-sgen.h
|
||||
|
||||
if DTRACE_G_REQUIRED
|
||||
LIBMONO_DTRACE_OBJECT = .libs/mono-dtrace.$(OBJEXT)
|
||||
|
||||
@@ -324,7 +324,7 @@ long_conv_to_ovf_i4_2: dest:i src1:i src2:i len:36
|
||||
vcall2: len:40 clob:c
|
||||
vcall2_reg: src1:i len:40 clob:c
|
||||
vcall2_membase: src1:b len:40 clob:c
|
||||
dyn_call: src1:i src2:i len:120 clob:c
|
||||
dyn_call: src1:i src2:i len:192 clob:c
|
||||
|
||||
# This is different from the original JIT opcodes
|
||||
float_beq: len:32
|
||||
|
||||
@@ -4136,6 +4136,9 @@ assembly_load (MonoProfiler *prof, MonoAssembly *assembly, int result)
|
||||
static void
|
||||
assembly_unload (MonoProfiler *prof, MonoAssembly *assembly)
|
||||
{
|
||||
if (is_debugger_thread ())
|
||||
return;
|
||||
|
||||
process_profiler_event (EVENT_KIND_ASSEMBLY_UNLOAD, assembly);
|
||||
|
||||
clear_event_requests_for_assembly (assembly);
|
||||
@@ -6504,6 +6507,10 @@ clear_types_for_assembly (MonoAssembly *assembly)
|
||||
MonoDomain *domain = mono_domain_get ();
|
||||
AgentDomainInfo *info = NULL;
|
||||
|
||||
if (!domain || !domain_jit_info (domain))
|
||||
/* Can happen during shutdown */
|
||||
return;
|
||||
|
||||
mono_loader_lock ();
|
||||
info = get_agent_domain_info (domain);
|
||||
g_hash_table_foreach_remove (info->loaded_classes, type_comes_from_assembly, assembly);
|
||||
|
||||
@@ -1119,6 +1119,27 @@ class Tests
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
struct FooStruct2 {
|
||||
public int a1, a2, a3;
|
||||
}
|
||||
|
||||
class MyClass<T> where T: struct {
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public MyClass(int a1, int a2, int a3, int a4, int a5, int a6, Nullable<T> a) {
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static MyClass<T> foo () {
|
||||
Nullable<T> a = new Nullable<T> ();
|
||||
return new MyClass<T> (0, 0, 0, 0, 0, 0, a);
|
||||
}
|
||||
}
|
||||
|
||||
public static int test_0_newobj_generic_context () {
|
||||
MyClass<FooStruct2>.foo ();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
#if !MOBILE
|
||||
|
||||
@@ -9672,7 +9672,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
|
||||
cmethod = mini_get_method (cfg, method, token, NULL, generic_context);
|
||||
if (!cmethod || mono_loader_get_last_error ())
|
||||
LOAD_ERROR;
|
||||
fsig = mono_method_get_signature (cmethod, image, token);
|
||||
fsig = mono_method_get_signature_full (cmethod, image, token, generic_context);
|
||||
if (!fsig)
|
||||
LOAD_ERROR;
|
||||
|
||||
|
||||
+2
-2
@@ -6692,8 +6692,8 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
|
||||
gpointer *args;
|
||||
static RuntimeInvokeDynamicFunction dyn_runtime_invoke;
|
||||
int i, pindex;
|
||||
guint8 buf [128];
|
||||
guint8 retval [128];
|
||||
guint8 buf [256];
|
||||
guint8 retval [256];
|
||||
|
||||
if (!dyn_runtime_invoke) {
|
||||
invoke = mono_marshal_get_runtime_invoke_dynamic ();
|
||||
|
||||
@@ -1300,12 +1300,8 @@ patch-libtool:
|
||||
if NACL_CODEGEN
|
||||
test-process-exit:
|
||||
else
|
||||
EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
|
||||
EXTRA_DIST += threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
|
||||
test-process-exit:
|
||||
@$(MCS) $(srcdir)/bug-438454.cs -out:bug-438454.exe
|
||||
@echo "Testing bug-438454.exe..."
|
||||
@$(RUNTIME) bug-438454.exe > bug-438454.exe.stdout
|
||||
@diff -w bug-438454.exe.stdout $(srcdir)/bug-438454.exe.stdout.expected
|
||||
@$(MCS) $(srcdir)/threadpool-in-processexit.cs -out:threadpool-in-processexit.exe
|
||||
@echo "Testing threadpool-in-processexit.exe..."
|
||||
@$(RUNTIME) threadpool-in-processexit.exe > threadpool-in-processexit.exe.stdout
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
class Program
|
||||
{
|
||||
static void Main ()
|
||||
{
|
||||
var d = AppDomain.CreateDomain("Foo");
|
||||
d.ProcessExit += AppDomain_ProcessExit;
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += new EventHandler (AppDomain_ProcessExit);
|
||||
ThreadPool.QueueUserWorkItem (new WaitCallback (Proc));
|
||||
Thread.Sleep (100);
|
||||
}
|
||||
|
||||
static void Proc (object unused)
|
||||
{
|
||||
Thread.CurrentThread.IsBackground = false;
|
||||
Thread.Sleep (500);
|
||||
Console.WriteLine ("done");
|
||||
}
|
||||
|
||||
static void AppDomain_ProcessExit (object sender, EventArgs e)
|
||||
{
|
||||
Console.WriteLine ("exit");
|
||||
|
||||
// No messages should be printed, as when this event is fired the
|
||||
// ThreadPool has been shutdown, thus `a.BeginInvoke()` has no effect.
|
||||
Action a = () => {
|
||||
int i = 0;
|
||||
while (i < 1024)
|
||||
Console.WriteLine ("Ha! {0}", i++);
|
||||
};
|
||||
a.BeginInvoke (null, null);
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
done
|
||||
exit
|
||||
exit
|
||||
@@ -219,6 +219,20 @@
|
||||
#include <BaseTsd.h>
|
||||
typedef SSIZE_T ssize_t;
|
||||
|
||||
/*
|
||||
* SSIZE_MAX is not defined in MSVC, so define it here.
|
||||
*
|
||||
* These values come from MinGW64, and are public domain.
|
||||
*
|
||||
*/
|
||||
#ifndef SSIZE_MAX
|
||||
#ifdef _WIN64
|
||||
#define SSIZE_MAX _I64_MAX
|
||||
#else
|
||||
#define SSIZE_MAX INT_MAX
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(PLATFORM_SOLARIS) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(MONOTOUCH) && HAVE_VISIBILITY_HIDDEN
|
||||
|
||||
+30
-12
@@ -20,6 +20,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
#include <sys/errno.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
@@ -61,17 +62,19 @@ mono_process_list (int *size)
|
||||
struct kinfo_proc2 *processes = malloc (data_len);
|
||||
#else
|
||||
int mib [4];
|
||||
size_t data_len = sizeof (struct kinfo_proc) * 400;
|
||||
struct kinfo_proc *processes = malloc (data_len);
|
||||
size_t data_len = sizeof (struct kinfo_proc) * 16;
|
||||
struct kinfo_proc *processes;
|
||||
int limit = 8;
|
||||
#endif /* KERN_PROC2 */
|
||||
void **buf = NULL;
|
||||
|
||||
if (size)
|
||||
*size = 0;
|
||||
|
||||
#ifdef KERN_PROC2
|
||||
if (!processes)
|
||||
return NULL;
|
||||
|
||||
#ifdef KERN_PROC2
|
||||
mib [0] = CTL_KERN;
|
||||
mib [1] = KERN_PROC2;
|
||||
mib [2] = KERN_PROC_ALL;
|
||||
@@ -80,19 +83,34 @@ mono_process_list (int *size)
|
||||
mib [5] = 400; /* XXX */
|
||||
|
||||
res = sysctl (mib, 6, processes, &data_len, NULL, 0);
|
||||
#else
|
||||
mib [0] = CTL_KERN;
|
||||
mib [1] = KERN_PROC;
|
||||
mib [2] = KERN_PROC_ALL;
|
||||
mib [3] = 0;
|
||||
|
||||
res = sysctl (mib, 4, processes, &data_len, NULL, 0);
|
||||
#endif /* KERN_PROC2 */
|
||||
|
||||
if (res < 0) {
|
||||
free (processes);
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
processes = NULL;
|
||||
while (limit) {
|
||||
mib [0] = CTL_KERN;
|
||||
mib [1] = KERN_PROC;
|
||||
mib [2] = KERN_PROC_ALL;
|
||||
mib [3] = 0;
|
||||
|
||||
res = sysctl (mib, 4, NULL, &data_len, NULL, 0);
|
||||
if (res)
|
||||
return NULL;
|
||||
processes = malloc (data_len);
|
||||
res = sysctl (mib, 4, NULL, &data_len, NULL, 0);
|
||||
if (res < 0) {
|
||||
free (processes);
|
||||
if (errno != ENOMEM)
|
||||
return NULL;
|
||||
limit --;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif /* KERN_PROC2 */
|
||||
|
||||
#ifdef KERN_PROC2
|
||||
res = data_len/sizeof (struct kinfo_proc2);
|
||||
#else
|
||||
|
||||
+127
-5
@@ -1,6 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug_SGen|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug_SGen|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -9,6 +17,14 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -29,51 +45,107 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
@@ -89,7 +161,21 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
@@ -103,7 +189,26 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
@@ -122,7 +227,24 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
@@ -182,4 +304,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
+307
-2
@@ -1,6 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug_SGen|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug_SGen|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -9,6 +17,14 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -30,50 +46,94 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEvent>
|
||||
@@ -118,6 +178,49 @@
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TypeLibraryName>.\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
@@ -132,7 +235,51 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
<TypeLibraryName>.\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
@@ -204,6 +351,48 @@
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TypeLibraryName>.\Release/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
@@ -219,7 +408,51 @@
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
<TypeLibraryName>.\Release/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
@@ -255,19 +488,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\mono\mini\helpers.c">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -275,19 +526,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\mono\utils\monobitset.c">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -295,19 +564,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\mono\metadata\opcodes.c">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -315,19 +602,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
+140
-4
@@ -1,6 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug_SGen|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug_SGen|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -9,6 +17,14 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -29,53 +45,113 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
@@ -95,7 +171,24 @@
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
@@ -115,7 +208,30 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
@@ -138,7 +254,27 @@
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
|
||||
@@ -109,7 +109,9 @@
|
||||
<ClCompile Include="..\mono\metadata\sgen-os-win32.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-pinning-stats.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-pinning.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-pointer-queue.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-protocol.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-qsort.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-simple-nursery.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-split-nursery.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c" />
|
||||
|
||||
@@ -84,6 +84,7 @@ mono_class_from_mono_type
|
||||
mono_class_from_name
|
||||
mono_class_from_name_case
|
||||
mono_class_from_typeref
|
||||
mono_class_from_typeref_checked
|
||||
mono_class_get
|
||||
mono_class_get_byref_type
|
||||
mono_class_get_com_object_class
|
||||
@@ -161,10 +162,19 @@ mono_context_get
|
||||
mono_context_get_desc
|
||||
mono_context_init
|
||||
mono_context_set
|
||||
mono_counter_get_name
|
||||
mono_counter_get_section
|
||||
mono_counter_get_size
|
||||
mono_counter_get_type
|
||||
mono_counter_get_unit
|
||||
mono_counter_get_variance
|
||||
mono_counters_cleanup
|
||||
mono_counters_dump
|
||||
mono_counters_enable
|
||||
mono_counters_foreach
|
||||
mono_counters_register
|
||||
mono_counters_register_with_size
|
||||
mono_counters_sample
|
||||
mono_custom_attrs_construct
|
||||
mono_custom_attrs_free
|
||||
mono_custom_attrs_from_assembly
|
||||
@@ -209,6 +219,7 @@ mono_debug_symfile_is_loaded
|
||||
mono_debug_symfile_lookup_locals
|
||||
mono_debug_symfile_lookup_location
|
||||
mono_debug_symfile_lookup_method
|
||||
mono_debugger_agent_register_transport
|
||||
mono_debugger_insert_breakpoint
|
||||
mono_debugger_method_has_breakpoint
|
||||
mono_debugger_run_finally
|
||||
@@ -250,6 +261,7 @@ mono_domain_try_unload
|
||||
mono_domain_unload
|
||||
mono_dwarf_escape_path
|
||||
mono_emit_native_call
|
||||
mono_enable_debug_domain_unload
|
||||
mono_environment_exitcode_get
|
||||
mono_environment_exitcode_set
|
||||
mono_error_cleanup
|
||||
@@ -325,6 +337,9 @@ mono_gc_out_of_memory
|
||||
mono_gc_reference_queue_add
|
||||
mono_gc_reference_queue_free
|
||||
mono_gc_reference_queue_new
|
||||
mono_gc_register_finalizer_callbacks
|
||||
mono_gc_toggleref_add
|
||||
mono_gc_toggleref_register_callback
|
||||
mono_gc_walk_heap
|
||||
mono_gc_wbarrier_arrayref_copy
|
||||
mono_gc_wbarrier_generic_nostore
|
||||
@@ -537,6 +552,7 @@ mono_metadata_guid_heap
|
||||
mono_metadata_implmap_from_method
|
||||
mono_metadata_init
|
||||
mono_metadata_interfaces_from_typedef
|
||||
mono_metadata_load_generic_param_constraints_checked
|
||||
mono_metadata_load_generic_params
|
||||
mono_metadata_locate
|
||||
mono_metadata_locate_token
|
||||
@@ -688,6 +704,7 @@ mono_profiler_install_thread_name
|
||||
mono_profiler_install_transition
|
||||
mono_profiler_load
|
||||
mono_profiler_set_events
|
||||
mono_profiler_set_statistical_mode
|
||||
mono_property_get_flags
|
||||
mono_property_get_get_method
|
||||
mono_property_get_name
|
||||
@@ -704,6 +721,7 @@ mono_property_set_value
|
||||
mono_ptr_class_get
|
||||
mono_raise_exception
|
||||
mono_realloc_native_code
|
||||
mono_reflection_assembly_get_assembly
|
||||
mono_reflection_free_type_info
|
||||
mono_reflection_get_custom_attrs
|
||||
mono_reflection_get_custom_attrs_blob
|
||||
@@ -736,6 +754,7 @@ mono_runtime_resource_check_limit
|
||||
mono_runtime_resource_limit
|
||||
mono_runtime_resource_set_callback
|
||||
mono_runtime_run_main
|
||||
mono_runtime_set_main_args
|
||||
mono_runtime_set_shutting_down
|
||||
mono_security_core_clr_get_options
|
||||
mono_security_core_clr_require_elevated_permissions
|
||||
@@ -748,6 +767,7 @@ mono_sem_wait
|
||||
mono_set_assemblies_path
|
||||
mono_set_break_policy
|
||||
mono_set_config_dir
|
||||
mono_set_crash_chaining
|
||||
mono_set_defaults
|
||||
mono_set_dirs
|
||||
mono_set_is_debugger_attached
|
||||
@@ -776,6 +796,7 @@ mono_signature_vararg_start
|
||||
mono_signbit_double
|
||||
mono_signbit_float
|
||||
mono_stack_walk
|
||||
mono_stack_walk_async_safe
|
||||
mono_stack_walk_no_il
|
||||
mono_store_remote_field
|
||||
mono_store_remote_field_new
|
||||
@@ -783,6 +804,7 @@ mono_string_chars
|
||||
mono_string_equal
|
||||
mono_string_from_bstr
|
||||
mono_string_from_utf16
|
||||
mono_string_from_utf32
|
||||
mono_string_hash
|
||||
mono_string_intern
|
||||
mono_string_is_interned
|
||||
@@ -791,8 +813,10 @@ mono_string_new
|
||||
mono_string_new_len
|
||||
mono_string_new_size
|
||||
mono_string_new_utf16
|
||||
mono_string_new_utf32
|
||||
mono_string_new_wrapper
|
||||
mono_string_to_utf16
|
||||
mono_string_to_utf32
|
||||
mono_string_to_utf8
|
||||
mono_string_to_utf8_checked
|
||||
mono_stringify_assembly_name
|
||||
@@ -802,9 +826,20 @@ mono_thread_cleanup
|
||||
mono_thread_create
|
||||
mono_thread_current
|
||||
mono_thread_detach
|
||||
mono_thread_detach_if_exiting
|
||||
mono_thread_exit
|
||||
mono_thread_get_main
|
||||
mono_thread_get_undeniable_exception
|
||||
mono_thread_info_clear_interruption
|
||||
mono_thread_info_exit
|
||||
mono_thread_info_finish_interrupt
|
||||
mono_thread_info_get_stack_bounds
|
||||
mono_thread_info_interrupt
|
||||
mono_thread_info_open_handle
|
||||
mono_thread_info_prepare_interrupt
|
||||
mono_thread_info_self_interrupt
|
||||
mono_thread_info_tls_get
|
||||
mono_thread_info_tls_set
|
||||
mono_thread_init
|
||||
mono_thread_is_foreign
|
||||
mono_thread_manage
|
||||
@@ -812,13 +847,22 @@ mono_thread_new_init
|
||||
mono_thread_set_main
|
||||
mono_thread_set_manage_callback
|
||||
mono_thread_stop
|
||||
mono_threads_attach_tools_thread
|
||||
mono_threads_core_clear_interruption
|
||||
mono_threads_core_finish_interrupt
|
||||
mono_threads_core_prepare_interrupt
|
||||
mono_threads_core_self_interrupt
|
||||
mono_threads_create_thread
|
||||
mono_threads_get_default_stacksize
|
||||
mono_threads_request_thread_dump
|
||||
mono_threads_set_default_stacksize
|
||||
mono_tls_key_get_offset
|
||||
mono_tls_key_set_offset
|
||||
mono_trace_set_level_string
|
||||
mono_trace_set_log_handler
|
||||
mono_trace_set_mask_string
|
||||
mono_trace_set_print_handler
|
||||
mono_trace_set_printerr_handler
|
||||
mono_type_create_from_typespec
|
||||
mono_type_full_name
|
||||
mono_type_generic_inst_is_valuetype
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\eglib\src;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;_WIN32_WINNT=0x0502;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
||||
+41
-2
@@ -84,6 +84,7 @@ mono_class_from_mono_type
|
||||
mono_class_from_name
|
||||
mono_class_from_name_case
|
||||
mono_class_from_typeref
|
||||
mono_class_from_typeref_checked
|
||||
mono_class_get
|
||||
mono_class_get_byref_type
|
||||
mono_class_get_com_object_class
|
||||
@@ -161,10 +162,19 @@ mono_context_get
|
||||
mono_context_get_desc
|
||||
mono_context_init
|
||||
mono_context_set
|
||||
mono_counter_get_name
|
||||
mono_counter_get_section
|
||||
mono_counter_get_size
|
||||
mono_counter_get_type
|
||||
mono_counter_get_unit
|
||||
mono_counter_get_variance
|
||||
mono_counters_cleanup
|
||||
mono_counters_dump
|
||||
mono_counters_enable
|
||||
mono_counters_foreach
|
||||
mono_counters_register
|
||||
mono_counters_register_with_size
|
||||
mono_counters_sample
|
||||
mono_custom_attrs_construct
|
||||
mono_custom_attrs_free
|
||||
mono_custom_attrs_from_assembly
|
||||
@@ -251,6 +261,7 @@ mono_domain_try_unload
|
||||
mono_domain_unload
|
||||
mono_dwarf_escape_path
|
||||
mono_emit_native_call
|
||||
mono_enable_debug_domain_unload
|
||||
mono_environment_exitcode_get
|
||||
mono_environment_exitcode_set
|
||||
mono_error_cleanup
|
||||
@@ -327,7 +338,7 @@ mono_gc_reference_queue_add
|
||||
mono_gc_reference_queue_free
|
||||
mono_gc_reference_queue_new
|
||||
mono_gc_register_bridge_callbacks
|
||||
mono_gc_scan_for_specific_ref
|
||||
mono_gc_register_finalizer_callbacks
|
||||
mono_gc_toggleref_add
|
||||
mono_gc_toggleref_register_callback
|
||||
mono_gc_wait_for_bridge_processing
|
||||
@@ -543,7 +554,7 @@ mono_metadata_guid_heap
|
||||
mono_metadata_implmap_from_method
|
||||
mono_metadata_init
|
||||
mono_metadata_interfaces_from_typedef
|
||||
mono_metadata_load_generic_param_constraints
|
||||
mono_metadata_load_generic_param_constraints_checked
|
||||
mono_metadata_load_generic_params
|
||||
mono_metadata_locate
|
||||
mono_metadata_locate_token
|
||||
@@ -695,6 +706,7 @@ mono_profiler_install_thread_name
|
||||
mono_profiler_install_transition
|
||||
mono_profiler_load
|
||||
mono_profiler_set_events
|
||||
mono_profiler_set_statistical_mode
|
||||
mono_property_get_flags
|
||||
mono_property_get_get_method
|
||||
mono_property_get_name
|
||||
@@ -711,6 +723,7 @@ mono_property_set_value
|
||||
mono_ptr_class_get
|
||||
mono_raise_exception
|
||||
mono_realloc_native_code
|
||||
mono_reflection_assembly_get_assembly
|
||||
mono_reflection_free_type_info
|
||||
mono_reflection_get_custom_attrs
|
||||
mono_reflection_get_custom_attrs_blob
|
||||
@@ -743,6 +756,7 @@ mono_runtime_resource_check_limit
|
||||
mono_runtime_resource_limit
|
||||
mono_runtime_resource_set_callback
|
||||
mono_runtime_run_main
|
||||
mono_runtime_set_main_args
|
||||
mono_runtime_set_shutting_down
|
||||
mono_security_core_clr_get_options
|
||||
mono_security_core_clr_require_elevated_permissions
|
||||
@@ -755,6 +769,7 @@ mono_sem_wait
|
||||
mono_set_assemblies_path
|
||||
mono_set_break_policy
|
||||
mono_set_config_dir
|
||||
mono_set_crash_chaining
|
||||
mono_set_defaults
|
||||
mono_set_dirs
|
||||
mono_set_is_debugger_attached
|
||||
@@ -783,6 +798,7 @@ mono_signature_vararg_start
|
||||
mono_signbit_double
|
||||
mono_signbit_float
|
||||
mono_stack_walk
|
||||
mono_stack_walk_async_safe
|
||||
mono_stack_walk_no_il
|
||||
mono_store_remote_field
|
||||
mono_store_remote_field_new
|
||||
@@ -790,6 +806,7 @@ mono_string_chars
|
||||
mono_string_equal
|
||||
mono_string_from_bstr
|
||||
mono_string_from_utf16
|
||||
mono_string_from_utf32
|
||||
mono_string_hash
|
||||
mono_string_intern
|
||||
mono_string_is_interned
|
||||
@@ -798,8 +815,10 @@ mono_string_new
|
||||
mono_string_new_len
|
||||
mono_string_new_size
|
||||
mono_string_new_utf16
|
||||
mono_string_new_utf32
|
||||
mono_string_new_wrapper
|
||||
mono_string_to_utf16
|
||||
mono_string_to_utf32
|
||||
mono_string_to_utf8
|
||||
mono_string_to_utf8_checked
|
||||
mono_stringify_assembly_name
|
||||
@@ -809,9 +828,20 @@ mono_thread_cleanup
|
||||
mono_thread_create
|
||||
mono_thread_current
|
||||
mono_thread_detach
|
||||
mono_thread_detach_if_exiting
|
||||
mono_thread_exit
|
||||
mono_thread_get_main
|
||||
mono_thread_get_undeniable_exception
|
||||
mono_thread_info_clear_interruption
|
||||
mono_thread_info_exit
|
||||
mono_thread_info_finish_interrupt
|
||||
mono_thread_info_get_stack_bounds
|
||||
mono_thread_info_interrupt
|
||||
mono_thread_info_open_handle
|
||||
mono_thread_info_prepare_interrupt
|
||||
mono_thread_info_self_interrupt
|
||||
mono_thread_info_tls_get
|
||||
mono_thread_info_tls_set
|
||||
mono_thread_init
|
||||
mono_thread_is_foreign
|
||||
mono_thread_manage
|
||||
@@ -819,13 +849,22 @@ mono_thread_new_init
|
||||
mono_thread_set_main
|
||||
mono_thread_set_manage_callback
|
||||
mono_thread_stop
|
||||
mono_threads_attach_tools_thread
|
||||
mono_threads_core_clear_interruption
|
||||
mono_threads_core_finish_interrupt
|
||||
mono_threads_core_prepare_interrupt
|
||||
mono_threads_core_self_interrupt
|
||||
mono_threads_create_thread
|
||||
mono_threads_get_default_stacksize
|
||||
mono_threads_request_thread_dump
|
||||
mono_threads_set_default_stacksize
|
||||
mono_tls_key_get_offset
|
||||
mono_tls_key_set_offset
|
||||
mono_trace_set_level_string
|
||||
mono_trace_set_log_handler
|
||||
mono_trace_set_mask_string
|
||||
mono_trace_set_print_handler
|
||||
mono_trace_set_printerr_handler
|
||||
mono_type_create_from_typespec
|
||||
mono_type_full_name
|
||||
mono_type_generic_inst_is_valuetype
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
@echo off
|
||||
cd ..
|
||||
if exist config.h if not exist cygconfig.h copy config.h cygconfig.h
|
||||
if exist eglib\config.h if not exist eglib\cygconfig.h copy eglib\config.h eglib\cygconfig.h
|
||||
copy winconfig.h config.h
|
||||
copy eglib\winconfig.h eglib\config.h
|
||||
goto end
|
||||
:error
|
||||
echo fatal error: the VSDepenancies directory was not found in the "mono" directory
|
||||
|
||||
+6
-1
@@ -1,6 +1,10 @@
|
||||
/* config.h. Generated from config.h.in by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include "cygconfig.h"
|
||||
#else
|
||||
|
||||
/* The architecture this is running on */
|
||||
#if defined(_M_IA64)
|
||||
#define ARCHITECTURE "ia64"
|
||||
@@ -629,4 +633,5 @@
|
||||
/* #undef USE_MONO_MUTEX */
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.11"
|
||||
#define VERSION "3.12.0"
|
||||
#endif
|
||||
Reference in new issue
Block a user