Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -91,7 +91,7 @@ namespace TestRunner {
}
}
#if !NET_2_1
#if !MOBILE
class ProcessTester: ITester
{
ProcessStartInfo pi;
@@ -734,7 +734,7 @@ namespace TestRunner {
bool update_verif_file;
Hashtable verif_data;
#if !NET_2_1
#if !MOBILE
ProcessStartInfo pi;
#endif
readonly string mono;
@@ -756,7 +756,7 @@ namespace TestRunner {
files_folder = Directory.GetCurrentDirectory ();
this.verif_file = verif_file;
#if !NET_2_1
#if !MOBILE
pi = new ProcessStartInfo ();
pi.CreateNoWindow = true;
pi.WindowStyle = ProcessWindowStyle.Hidden;
@@ -965,7 +965,7 @@ namespace TestRunner {
string filename = test.FileName;
AppDomain domain = null;
#if !NET_2_1
#if !MOBILE
if (safe_execution) {
// Create a new AppDomain, with the current directory as the base.
AppDomainSetup setupInfo = new AppDomainSetup ();
@@ -977,7 +977,7 @@ namespace TestRunner {
try {
DomainTester tester;
try {
#if !NET_2_1
#if !MOBILE
if (domain != null)
tester = (DomainTester) domain.CreateInstanceAndUnwrap (typeof (PositiveChecker).Assembly.FullName, typeof (DomainTester).FullName);
else
@@ -998,7 +998,7 @@ namespace TestRunner {
if (doc_output != null) {
string ref_file = filename.Replace (".cs", "-ref.xml");
try {
#if !NET_2_1
#if !MOBILE
new XmlComparer ("doc").Compare (ref_file, doc_output);
#endif
} catch (Exception e) {

View File

@@ -24,9 +24,9 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
//
#if !NET_2_1
#if !MOBILE
using System;
using System.Collections;
@@ -137,4 +137,4 @@ public class XmlComparer
}
}
#endif
#endif