Imported Upstream version 6.0.0.183

Former-commit-id: 52d866fe5c7f8a1e61b372993391b8bfdfac2bd0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-18 08:43:48 +00:00
parent 7aefecd37c
commit 82da664f86
57 changed files with 115 additions and 106 deletions

View File

@@ -9,8 +9,12 @@ include ../../build/rules.make
LIBRARY = Mono.Runtime.Tests.dll
NO_BUILD = 1
NO_INSTALL = 1
LIB_REFS = System System.Core System.Numerics System.Numerics.Vectors Mono.Simd
LIB_REFS = System System.Core System.Numerics System.Numerics.Vectors
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -unsafe -d:__MOBILE__ -nowarn:CS0169,CS0649,CS0414,CS0618,CS0219,CS0168
ifneq ($(PROFILE),monodroid)
LIB_REFS += Mono.Simd
endif
include ../../build/library.make

View File

@@ -0,0 +1 @@
../../../../mono/mini/basic-simd.cs

View File

@@ -1071,7 +1071,7 @@ namespace System.Windows.Forms
return TreeView.ImageList.Images.IndexOfKey (selected_image_key);
if (!string.IsNullOrEmpty (TreeView.SelectedImageKey))
return TreeView.ImageList.Images.IndexOfKey (TreeView.SelectedImageKey);
if (TreeView.SelectedImageIndex >= 0)
if (selected_image_index == -1 && TreeView.SelectedImageIndex >= 0)
return TreeView.SelectedImageIndex;
} else {
if (image_index >= 0)
@@ -1080,12 +1080,9 @@ namespace System.Windows.Forms
return TreeView.ImageList.Images.IndexOfKey (image_key);
if (!string.IsNullOrEmpty (TreeView.ImageKey))
return TreeView.ImageList.Images.IndexOfKey (TreeView.ImageKey);
if (TreeView.ImageIndex >= 0)
if (image_index == -1 && TreeView.ImageIndex >= 0)
return TreeView.ImageIndex;
}
if (TreeView.ImageList.Images.Count > 0)
return 0;
return -1;
}

View File

@@ -923,7 +923,7 @@ namespace MonoTests.System.IO
}
Assert.IsTrue (File.Exists (bar), "#1");
File.Move (bar, baz);
Assert.DoesNotThrow (() => File.Move (bar, baz), "#5");
Assert.IsFalse (File.Exists (bar), "#2");
Assert.IsTrue (File.Exists (baz), "#3");
@@ -939,7 +939,7 @@ namespace MonoTests.System.IO
Directory.CreateDirectory (dir);
Directory.CreateDirectory (dir2);
File.Create (dir_foo).Close ();
File.Move (dir_foo, dir2_foo);
Assert.DoesNotThrow (() => File.Move (dir_foo, dir2_foo), "#6");
Assert.IsTrue (File.Exists (dir2_foo), "#4");
Directory.Delete (dir, true);

View File

@@ -1 +1 @@
3bb5075309cfee79947231190b6c06970814ecbf
812e72bb33c83991369be9f9ec7ceb56d725d4ba

View File

@@ -1 +1 @@
4eff81e78b9af7cda22830830d3d49092a6b7018
abbfbea3a51f4a664ba8db3d9464ad05a3e55baf

View File

@@ -1 +1 @@
3b0cda7b19ee016a6f2b3ad97ef9a6ddd8b9bbe5
7aadfbf5cf560b7c3b74e842ea934137d259649f

View File

@@ -1 +1 @@
167a06dea1a9f639eed2d5ae04afc5c23891d656
edd9d4c737bb1d7820ff3adb5eb44303676c0579

View File

@@ -1 +1 @@
71b6657d1ec9f6a632e30c9ed789ef7fd6e97b70
a4050af4872d879b40435b821550b364b53a0c5e

View File

@@ -1 +1 @@
81c98bb54997edda2c51abc2c020a02ef58bcb65
78cc979f44705424bfcf8a9065b8f1ea0c06a407

View File

@@ -1 +1 @@
02e92c8371781b6e97eef8cd9fff063521233353
10a0ef69f7a743c313c308618241d53fbf0867c8

View File

@@ -1 +1 @@
3bb5075309cfee79947231190b6c06970814ecbf
812e72bb33c83991369be9f9ec7ceb56d725d4ba

View File

@@ -1 +1 @@
4eff81e78b9af7cda22830830d3d49092a6b7018
abbfbea3a51f4a664ba8db3d9464ad05a3e55baf

View File

@@ -1 +1 @@
3b0cda7b19ee016a6f2b3ad97ef9a6ddd8b9bbe5
7aadfbf5cf560b7c3b74e842ea934137d259649f

View File

@@ -1 +1 @@
167a06dea1a9f639eed2d5ae04afc5c23891d656
edd9d4c737bb1d7820ff3adb5eb44303676c0579

View File

@@ -1 +1 @@
71b6657d1ec9f6a632e30c9ed789ef7fd6e97b70
a4050af4872d879b40435b821550b364b53a0c5e

View File

@@ -1 +1 @@
81c98bb54997edda2c51abc2c020a02ef58bcb65
78cc979f44705424bfcf8a9065b8f1ea0c06a407

View File

@@ -1 +1 @@
02e92c8371781b6e97eef8cd9fff063521233353
10a0ef69f7a743c313c308618241d53fbf0867c8

Some files were not shown because too many files have changed in this diff Show More