Imported Upstream version 5.16.0.117
Former-commit-id: 44f8fd0c4b66c828855b08eefcc53d59832c25a6
This commit is contained in:
parent
2a01a829a1
commit
4a084bd265
@ -1 +1 @@
|
|||||||
c3baf1794d343c0b008ac1b5479883f52501ec29
|
7d284941342ec1cd091ea92c920e7a1067762050
|
@ -1 +1 @@
|
|||||||
85b829d55bd85816e5a9f5963c80ab3e10bda7ab
|
b4edd2150613367bbf97e0245adf4ed33f1c72ee
|
@ -249,6 +249,10 @@ namespace NUnitLite.Runner
|
|||||||
|
|
||||||
if (properties.ContainsKey(PropertyNames.Category))
|
if (properties.ContainsKey(PropertyNames.Category))
|
||||||
{
|
{
|
||||||
|
#if MONO
|
||||||
|
if (properties[PropertyNames.Category].Count == 0)
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
xmlWriter.WriteStartElement("categories");
|
xmlWriter.WriteStartElement("categories");
|
||||||
|
|
||||||
foreach (string category in properties[PropertyNames.Category])
|
foreach (string category in properties[PropertyNames.Category])
|
||||||
|
@ -212,10 +212,12 @@ namespace NUnitLite.Runner
|
|||||||
}
|
}
|
||||||
catch (FileNotFoundException ex)
|
catch (FileNotFoundException ex)
|
||||||
{
|
{
|
||||||
|
Failure = true;
|
||||||
writer.WriteLine(ex.Message);
|
writer.WriteLine(ex.Message);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Failure = true;
|
||||||
writer.WriteLine(ex.ToString());
|
writer.WriteLine(ex.ToString());
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
@ -34,7 +34,7 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.16.0.114";
|
public const string MonoVersion = "5.16.0.117";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
|
@ -15,7 +15,6 @@ using NUnit.Framework;
|
|||||||
using System;
|
using System;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using Network = System.Net;
|
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
using System.Xml.Schema;
|
using System.Xml.Schema;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -94,7 +93,7 @@ namespace MonoTests.System.Xml.Schema
|
|||||||
{
|
{
|
||||||
// Create a resolver with default credentials.
|
// Create a resolver with default credentials.
|
||||||
XmlUrlResolver resolver = new XmlUrlResolver ();
|
XmlUrlResolver resolver = new XmlUrlResolver ();
|
||||||
resolver.Credentials = Network.CredentialCache.DefaultCredentials;
|
resolver.Credentials = global::System.Net.CredentialCache.DefaultCredentials;
|
||||||
// Set the reader settings object to use the resolver.
|
// Set the reader settings object to use the resolver.
|
||||||
XmlReaderSettings settings = new XmlReaderSettings ();
|
XmlReaderSettings settings = new XmlReaderSettings ();
|
||||||
settings.XmlResolver = resolver;
|
settings.XmlResolver = resolver;
|
||||||
|
@ -508,9 +508,12 @@ namespace System.Diagnostics
|
|||||||
int size = 0;
|
int size = 0;
|
||||||
|
|
||||||
for (int i = 0; i < processes.Length; i++) {
|
for (int i = 0; i < processes.Length; i++) {
|
||||||
|
var process = processes[i];
|
||||||
try {
|
try {
|
||||||
if (String.Compare (processName, processes[i].ProcessName, true) == 0)
|
if (String.Compare (processName, process.ProcessName, true) == 0)
|
||||||
processes [size++] = processes[i];
|
processes [size++] = process;
|
||||||
|
else
|
||||||
|
process.Dispose();
|
||||||
} catch (SystemException) {
|
} catch (SystemException) {
|
||||||
/* The process might exit between GetProcesses_internal and GetProcessById */
|
/* The process might exit between GetProcesses_internal and GetProcessById */
|
||||||
}
|
}
|
||||||
|
@ -1 +1 @@
|
|||||||
f62bccca025ee1db3cdeaa7b016ca72f1ca8d6f5
|
d9acdccc6ac1c957dcbc61b3d292ecec99486cda
|
@ -1 +1 @@
|
|||||||
68004a3cd5f5be134321ee36eed741762b6eaaaf
|
f27f41f18750c6759dd5eb0d37ce416a7bc90a02
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
4d3bdbfc4785847f4bd78efe233b084e3aab2cef
|
6408a5a4b96854d81a5ad4dd11ba25d35c9036f3
|
@ -1 +1 @@
|
|||||||
10f810324b41b0445aa797dfa5e0f7a89a33863f
|
924c378c6aa852f8d710590bf122c8dcb2517511
|
@ -1 +1 @@
|
|||||||
5e6517a05e25cdef5fc622bebd6e8ba60550fbad
|
829831686aa1d3f4ce328e7b897fbf497416a331
|
@ -1 +1 @@
|
|||||||
30ea59dcf65debf86f3f235293867214fe42502f
|
2c4a8f6cc7772af68425f1f717c31623f19c8291
|
@ -1 +1 @@
|
|||||||
ceefd8dbc8aa8cf164e76d671f195ee6a88f5163
|
56c13fa3b5c1f24857860749a57fd0b73009f9a3
|
@ -1 +1 @@
|
|||||||
1e67a5988c6bba32847ff36dd4122e03f18ddd8a
|
c8236115536f96c8f588f69e21905a2e01fdc366
|
@ -1 +1 @@
|
|||||||
f62bccca025ee1db3cdeaa7b016ca72f1ca8d6f5
|
d9acdccc6ac1c957dcbc61b3d292ecec99486cda
|
@ -1 +1 @@
|
|||||||
68004a3cd5f5be134321ee36eed741762b6eaaaf
|
f27f41f18750c6759dd5eb0d37ce416a7bc90a02
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
4d3bdbfc4785847f4bd78efe233b084e3aab2cef
|
6408a5a4b96854d81a5ad4dd11ba25d35c9036f3
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user