VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-11 02:13:38 +09:00
Code Activity

Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02929-01, preview1-26630-01, preview1-26628-03, preview1-26629-04, beta-26629-00, beta-26629-00, respectively (master) (dotnet/corefx#30766)

Browse source 
* Update BuildTools, CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-02929-01, preview1-26630-01, preview1-26628-03, preview1-26629-04, beta-26629-00, beta-26629-00, respectively

* Use public implementation API RemoveEventHandler


Commit migrated from bcbf63568b
This commit is contained in:
dotnet-maestro-bot 2018-06-29 23:00:13 -07:00 • committed by Jan Kotas
parent 5fe6bee2d0
commit 473ba45dfe
5 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libraries/BuildToolsVersion.txt
View file

@ -1 +1 @@
2.2.0-preview1-02928-01
2.2.0-preview1-02929-01

9
src/libraries/System.Runtime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs
View file

@ -326,8 +326,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime
INotifyCollectionChanged _this = Unsafe.As<INotifyCollectionChanged>(this);
EventRegistrationTokenTable<NotifyCollectionChangedEventHandler> table = s_weakTable.GetOrCreateValue(_this);
NotifyCollectionChangedEventHandler handler = table.ExtractHandler(token);
if (handler != null)
if (table.RemoveEventHandler(token, out NotifyCollectionChangedEventHandler handler))
{
_this.CollectionChanged -= handler;
}
@ -408,8 +407,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime
INotifyPropertyChanged _this = Unsafe.As<INotifyPropertyChanged>(this);
EventRegistrationTokenTable<PropertyChangedEventHandler> table = s_weakTable.GetOrCreateValue(_this);
PropertyChangedEventHandler handler = table.ExtractHandler(token);
if (handler != null)
if (table.RemoveEventHandler(token, out PropertyChangedEventHandler handler))
{
_this.PropertyChanged -= handler;
}
@ -516,8 +514,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime
ICommand _this = Unsafe.As<ICommand>(this);
EventRegistrationTokenTable<EventHandler> table = s_weakTable.GetOrCreateValue(_this);
EventHandler handler = table.ExtractHandler(token);
if (handler != null)
if (table.RemoveEventHandler(token, out EventHandler handler))
{
_this.CanExecuteChanged -= handler;
}

34
src/libraries/dependencies.props
View file

@ -9,15 +9,15 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreFxCurrentRef>
<CoreClrCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreClrCurrentRef>
<CoreSetupCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreSetupCurrentRef>
<CoreFxCurrentRef>083f2bebb870ad2a5e4d37989790511b346d9887</CoreFxCurrentRef>
<CoreClrCurrentRef>083f2bebb870ad2a5e4d37989790511b346d9887</CoreClrCurrentRef>
<CoreSetupCurrentRef>083f2bebb870ad2a5e4d37989790511b346d9887</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>083f2bebb870ad2a5e4d37989790511b346d9887</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>083f2bebb870ad2a5e4d37989790511b346d9887</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
<BuildToolsCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</BuildToolsCurrentRef>
<BuildToolsCurrentRef>083f2bebb870ad2a5e4d37989790511b346d9887</BuildToolsCurrentRef>
</PropertyGroup>
<!-- Product dependency versions. -->
@ -31,15 +31,15 @@
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-26628-01</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26627-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26627-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26627-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreAppPackageVersion>
<CoreFxExpectedPrerelease>preview1-26628-03</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26628-03</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26630-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26629-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26629-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26629-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview1-26629-04</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview1-26629-04</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26629-04</MicrosoftNETCoreAppPackageVersion>
<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
@ -47,7 +47,7 @@
<AppXRunnerVersion>2.2.0-preview1-02915-01</AppXRunnerVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0019</XunitPerfAnalysisPackageVersion>
<TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
<XunitNetcoreExtensionsVersion>2.2.0-preview1-02928-01</XunitNetcoreExtensionsVersion>
<XunitNetcoreExtensionsVersion>2.2.0-preview1-02929-01</XunitNetcoreExtensionsVersion>
<!-- Roslyn optimization data package version -->
<OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
@ -56,7 +56,7 @@
<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<FeedTasksPackageVersion>2.2.0-preview1-02928-01</FeedTasksPackageVersion>
<FeedTasksPackageVersion>2.2.0-preview1-02929-01</FeedTasksPackageVersion>
</PropertyGroup>
<!-- Publish symbol build task package -->

6
src/libraries/external/test-runtime/optional.json vendored
View file

@ -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-26629-00",
"TestILC.armret": "1.0.0-beta-26629-00",
"TestILC.x86ret": "1.0.0-beta-26629-00"
}
}
}

2
tools-local/ILAsmVersion.txt
View file

@ -1 +1 @@
3.0.0-preview1-26628-01
3.0.0-preview1-26630-01