Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-26628-04, preview1-26628-03, preview1-26628-01, beta-26628-00, beta-26628-00, respectively (master) #30725

Closed
dotnet-maestro-bot wants to merge 2 commits into from
Closed

Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to preview1-26628-04, preview1-26628-03, preview1-26628-01, beta-26628-00, beta-26628-00, respectively (master) #30725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
494e7d4
Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to…
dotnet-maestro-bot Jun 28, 2018
0065a74
Use public implementation API RemoveEventHandler
Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreFxCurrentRef>
<CoreClrCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreClrCurrentRef>
<CoreSetupCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreSetupCurrentRef>
<CoreFxCurrentRef>7aa763c8edff328ec7771d79a7435a865ae23322</CoreFxCurrentRef>
<CoreClrCurrentRef>7aa763c8edff328ec7771d79a7435a865ae23322</CoreClrCurrentRef>
<CoreSetupCurrentRef>7aa763c8edff328ec7771d79a7435a865ae23322</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>7aa763c8edff328ec7771d79a7435a865ae23322</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>7aa763c8edff328ec7771d79a7435a865ae23322</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
<BuildToolsCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</BuildToolsCurrentRef>
Expand All @@ -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-26628-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26628-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26628-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26628-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCoreAppPackageVersion>

<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions external/test-runtime/optional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...ime.WindowsRuntime/src/System/Runtime/InteropServices/WindowsRuntime/MarshalingHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ internal void remove_CollectionChanged(EventRegistrationToken token)
INotifyCollectionChanged _this = Unsafe.As<INotifyCollectionChanged>(this);
EventRegistrationTokenTable<NotifyCollectionChangedEventHandler> table = s_weakTable.GetOrCreateValue(_this);

NotifyCollectionChangedEventHandler handler = table.ExtractHandler(token);
if (handler != null)
NotifyCollectionChangedEventHandler handler;
if (table.RemoveEventHandler(token, out handler))
{
_this.CollectionChanged -= handler;
}
Expand Down Expand Up @@ -392,8 +392,8 @@ internal void remove_PropertyChanged(EventRegistrationToken token)
INotifyPropertyChanged _this = Unsafe.As<INotifyPropertyChanged>(this);
EventRegistrationTokenTable<PropertyChangedEventHandler> table = s_weakTable.GetOrCreateValue(_this);

PropertyChangedEventHandler handler = table.ExtractHandler(token);
if (handler != null)
PropertyChangedEventHandler handler;
if (table.RemoveEventHandler(token, out handler))
{
_this.PropertyChanged -= handler;
}
Expand Down Expand Up @@ -500,8 +500,8 @@ private void remove_CanExecuteChanged(EventRegistrationToken token)
ICommand _this = Unsafe.As<ICommand>(this);
EventRegistrationTokenTable<EventHandler> table = s_weakTable.GetOrCreateValue(_this);

EventHandler handler = table.ExtractHandler(token);
if (handler != null)
EventHandler handler;
if (table.RemoveEventHandler(token, out handler))
{
_this.CanExecuteChanged -= handler;
}
Expand Down
2 changes: 1 addition & 1 deletion tools-local/ILAsmVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0-preview1-26628-01
3.0.0-preview1-26628-04