mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: d0b478b3e897f41bf2d206867201a36b11bd7aa7
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-06-01 08:56:28 +00:00
commit f70d3555a6
40 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
44df991ba30f88ca18964668fe7dfeedaad59fbb
f2975e434fb9a78dbc5f2ccc946c7cbf285a3a46

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
6d86be4bee4429c6d41d6bbefa217551f0d0f345
71862039cdd700167d24ff50835960834c3faaf5

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.14.0.110";
public const string MonoVersion = "5.14.0.116";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

9
mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
View File

@ -937,6 +937,7 @@ namespace System.Windows.Forms
if (tabs != null && tabs.Count > 0) {
foreach (PropertyTab tab in tabs) {
PropertyToolBarButton button = new PropertyToolBarButton (tab);
button.Click += new EventHandler (toolbarbutton_clicked);
toolbar.Items.Add (button);
if (tab.Bitmap != null) {
tab.Bitmap.MakeTransparent ();
@ -986,7 +987,7 @@ namespace System.Windows.Forms
scopes.Clear ();
IList currentIntersection = (i == 0 ? (IList)tabAttribute.TabClasses : (IList)intersection);
for (int j=0; j < currentIntersection.Count; j++) {
if ((Type)intersection[j] == tabAttribute.TabClasses[j]) {
if ((Type)currentIntersection[j] == tabAttribute.TabClasses[j]) {
new_intersection.Add (tabAttribute.TabClasses[j]);
scopes.Add (tabAttribute.TabScopes[j]);
}
@ -1410,8 +1411,10 @@ namespace System.Windows.Forms
toRemove.Add (i);
}
foreach (int indexToRemove in toRemove) {
property_tabs.RemoveAt (indexToRemove);
property_tabs_scopes.RemoveAt (indexToRemove);
if (property_tabs.Count > indexToRemove)
property_tabs.RemoveAt (indexToRemove);
if (property_tabs_scopes.Count > indexToRemove)
property_tabs_scopes.RemoveAt (indexToRemove);
}
property_grid.RefreshToolbar (this);
}

10
mcs/class/System/System.IO/CoreFXFileSystemWatcherProxy.cs
View File

@ -105,16 +105,16 @@ namespace System.IO {
var result = new C ();
result.Changed += (object o, FileSystemEventArgs args) =>
{ ProxyDispatch (o, FileAction.Modified, args); };
Task.Run (() => ProxyDispatch (o, FileAction.Modified, args));
result.Created += (object o, FileSystemEventArgs args) =>
{ ProxyDispatch (o, FileAction.Added, args); };
Task.Run (() => ProxyDispatch (o, FileAction.Added, args));
result.Deleted += (object o, FileSystemEventArgs args) =>
{ ProxyDispatch (o, FileAction.Removed, args); };
Task.Run (() => ProxyDispatch (o, FileAction.Removed, args));
result.Renamed += (object o, RenamedEventArgs args) =>
{ ProxyDispatch (o, FileAction.RenamedNewName, args); };
Task.Run (() => ProxyDispatch (o, FileAction.RenamedNewName, args));
result.Error += (object o, ErrorEventArgs args) =>
{ ProxyDispatchError (handle, args); };
Task.Run (() => ProxyDispatchError (handle, args));
Operation (map_op: (in_map, out_map, event_map, _) => {
in_map.Add (handle, result);

12
mcs/class/System/System.IO/FileSystemWatcher.cs
View File

@ -37,6 +37,7 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security.Permissions;
using System.Threading;
using System.Threading.Tasks;
namespace System.IO {
[DefaultEvent("Changed")]
@ -114,7 +115,7 @@ namespace System.IO {
void InitWatcher ()
{
lock (lockobj) {
if (watcher != null)
if (watcher_handle != null)
return;
string managed = Environment.GetEnvironmentVariable ("MONO_MANAGED_WATCHER");
@ -510,17 +511,17 @@ namespace System.IO {
case FileAction.Added:
lastData.Name = filename;
lastData.ChangeType = WatcherChangeTypes.Created;
OnCreated (new FileSystemEventArgs (WatcherChangeTypes.Created, path, filename));
Task.Run (() => OnCreated (new FileSystemEventArgs (WatcherChangeTypes.Created, path, filename)));
break;
case FileAction.Removed:
lastData.Name = filename;
lastData.ChangeType = WatcherChangeTypes.Deleted;
OnDeleted (new FileSystemEventArgs (WatcherChangeTypes.Deleted, path, filename));
Task.Run (() => OnDeleted (new FileSystemEventArgs (WatcherChangeTypes.Deleted, path, filename)));
break;
case FileAction.Modified:
lastData.Name = filename;
lastData.ChangeType = WatcherChangeTypes.Changed;
OnChanged (new FileSystemEventArgs (WatcherChangeTypes.Changed, path, filename));
Task.Run (() => OnChanged (new FileSystemEventArgs (WatcherChangeTypes.Changed, path, filename)));
break;
case FileAction.RenamedOldName:
if (renamed != null) {
@ -536,7 +537,8 @@ namespace System.IO {
if (renamed == null) {
renamed = new RenamedEventArgs (WatcherChangeTypes.Renamed, path, "", filename);
}
OnRenamed (renamed);
var renamed_ref = renamed;
Task.Run (() => OnRenamed (renamed_ref));
renamed = null;
break;
default:

2
mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
061d164b61dd4f5d7b45ea45d24beb68e090aa1d
88463079f1bc9e293ff4eeffc52b8fe7ddb4b61d

2
mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
cb48e0acfece34c129d2f0df12736b761894e6ff
69022cbbe03b81539b541184bb204f1027e88e47

2
mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d9216fb81ca067b812c2af0244ab4b09fda355cc
abf20bddd551faa4c03903b90d5ef125923a6a58

2
mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
5e57c68548c3d4b813e8afcd3faa90d664d333ee
3a253a3488929d890119bb844ed58e36e6a9b20d

2
mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
27f33bdbdeb3aeb2cd0603faa95162b9e685b44c
f9d99688c9ea9c2a3c6d751ebcc47a65e35f4cd1

2
mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
2ab602ec65de544966c6b22e2cf6c2901778f977
701fb7ddb42ec02b674abe8af949fa839afd936f

2
mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
6f76e77a06b2bdc54f25fbd8a4f39aa04c431c44
d5beee2f9672bee46acd54553c2a6cf4f66d4a57

2
mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
7cb730ea0b4be07c4176b3f102c6e4a6e5697768
fccf96191cc72249f43f2d18d25931f1aba8b06b

2
mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
061d164b61dd4f5d7b45ea45d24beb68e090aa1d
88463079f1bc9e293ff4eeffc52b8fe7ddb4b61d

2
mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
cb48e0acfece34c129d2f0df12736b761894e6ff
69022cbbe03b81539b541184bb204f1027e88e47

2
mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d9216fb81ca067b812c2af0244ab4b09fda355cc
abf20bddd551faa4c03903b90d5ef125923a6a58

2
mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
5e57c68548c3d4b813e8afcd3faa90d664d333ee
3a253a3488929d890119bb844ed58e36e6a9b20d

2
mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
27f33bdbdeb3aeb2cd0603faa95162b9e685b44c
f9d99688c9ea9c2a3c6d751ebcc47a65e35f4cd1

2
mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
2ab602ec65de544966c6b22e2cf6c2901778f977
701fb7ddb42ec02b674abe8af949fa839afd936f

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