diff --git a/dependencies.props b/dependencies.props index c2ff4bdc97e7..a091b6c8cde2 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,12 +9,12 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 13ca435e8c2b6c8eed73589533a175c283b71f77 - 13ca435e8c2b6c8eed73589533a175c283b71f77 - 13ca435e8c2b6c8eed73589533a175c283b71f77 + 7aa763c8edff328ec7771d79a7435a865ae23322 + 7aa763c8edff328ec7771d79a7435a865ae23322 + 7aa763c8edff328ec7771d79a7435a865ae23322 96dc7805f5df4a70a55783964ce69dcd91bfca80 - 13ca435e8c2b6c8eed73589533a175c283b71f77 - 13ca435e8c2b6c8eed73589533a175c283b71f77 + 7aa763c8edff328ec7771d79a7435a865ae23322 + 7aa763c8edff328ec7771d79a7435a865ae23322 8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd 9004703a1923e5c5582ceb8d79712df777412446 13ca435e8c2b6c8eed73589533a175c283b71f77 @@ -31,15 +31,15 @@ - preview1-26628-01 - 3.0.0-preview1-26628-01 - 3.0.0-preview1-26628-01 - beta-26627-00 - beta-26627-00 - 1.0.0-beta-26627-00 - 3.0.0-preview1-26627-03 - 3.0.0-preview1-26627-03 - 3.0.0-preview1-26627-03 + preview1-26628-03 + 3.0.0-preview1-26628-03 + 3.0.0-preview1-26628-04 + beta-26628-00 + beta-26628-00 + 1.0.0-beta-26628-00 + 3.0.0-preview1-26628-01 + 3.0.0-preview1-26628-01 + 3.0.0-preview1-26628-01 4.4.0 diff --git a/external/test-runtime/optional.json b/external/test-runtime/optional.json index b213a1067c39..a14919e2feda 100644 --- a/external/test-runtime/optional.json +++ b/external/test-runtime/optional.json @@ -3,9 +3,9 @@ "net45": { "dependencies": { "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001", - "TestILC.amd64ret": "1.0.0-beta-26627-00", - "TestILC.armret": "1.0.0-beta-26627-00", - "TestILC.x86ret": "1.0.0-beta-26627-00" + "TestILC.amd64ret": "1.0.0-beta-26628-00", + "TestILC.armret": "1.0.0-beta-26628-00", + "TestILC.x86ret": "1.0.0-beta-26628-00" } } } diff --git a/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs b/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs index 57d3124eae9a..6c6c1d8f6d42 100644 --- a/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs +++ b/src/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs @@ -310,8 +310,8 @@ internal void remove_CollectionChanged(EventRegistrationToken token) INotifyCollectionChanged _this = Unsafe.As(this); EventRegistrationTokenTable table = s_weakTable.GetOrCreateValue(_this); - NotifyCollectionChangedEventHandler handler = table.ExtractHandler(token); - if (handler != null) + NotifyCollectionChangedEventHandler handler; + if (table.RemoveEventHandler(token, out handler)) { _this.CollectionChanged -= handler; } @@ -392,8 +392,8 @@ internal void remove_PropertyChanged(EventRegistrationToken token) INotifyPropertyChanged _this = Unsafe.As(this); EventRegistrationTokenTable table = s_weakTable.GetOrCreateValue(_this); - PropertyChangedEventHandler handler = table.ExtractHandler(token); - if (handler != null) + PropertyChangedEventHandler handler; + if (table.RemoveEventHandler(token, out handler)) { _this.PropertyChanged -= handler; } @@ -500,8 +500,8 @@ private void remove_CanExecuteChanged(EventRegistrationToken token) ICommand _this = Unsafe.As(this); EventRegistrationTokenTable table = s_weakTable.GetOrCreateValue(_this); - EventHandler handler = table.ExtractHandler(token); - if (handler != null) + EventHandler handler; + if (table.RemoveEventHandler(token, out handler)) { _this.CanExecuteChanged -= handler; } diff --git a/tools-local/ILAsmVersion.txt b/tools-local/ILAsmVersion.txt index 453a2b67962c..e23f0a23e49d 100644 --- a/tools-local/ILAsmVersion.txt +++ b/tools-local/ILAsmVersion.txt @@ -1 +1 @@ -3.0.0-preview1-26628-01 \ No newline at end of file +3.0.0-preview1-26628-04 \ No newline at end of file