diff options
| author | dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com> | 2018-12-14 04:06:12 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-12-14 07:06:12 -0500 |
| commit | bbfafe73ee054cc024c7db5dea53ec18c25b013c (patch) | |
| tree | 514843daf25da894581015156ea82b84a040ce01 | |
| parent | 1649da12db73c8c07513c9168cb30ec70c310063 (diff) | |
| download | coreclr-bbfafe73ee054cc024c7db5dea53ec18c25b013c.tar.gz coreclr-bbfafe73ee054cc024c7db5dea53ec18c25b013c.tar.bz2 coreclr-bbfafe73ee054cc024c7db5dea53ec18c25b013c.zip | |
Update CoreClr, CoreFx, CoreSetup to preview-27213-02, preview.18613.4, preview-27213-01, respectively (master) (#21503)
* Update CoreClr, CoreFx, CoreSetup to preview-27213-02, preview.18613.4, preview-27213-01, respectively
* Add System.Threading.AccessControl to CoreFX test deps
| -rw-r--r-- | ILAsmVersion.txt | 2 | ||||
| -rw-r--r-- | dependencies.props | 14 | ||||
| -rw-r--r-- | tests/src/Common/CoreFX/CoreFX.depproj | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt index 3e034b4e16..bc249c46ee 100644 --- a/ILAsmVersion.txt +++ b/ILAsmVersion.txt @@ -1 +1 @@ -3.0.0-preview-27211-02 +3.0.0-preview-27213-02 diff --git a/dependencies.props b/dependencies.props index 3f697283e7..30714115bb 100644 --- a/dependencies.props +++ b/dependencies.props @@ -23,21 +23,21 @@ <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreFxCurrentRef>fe931dd06e6e6029c6808a74696ceac304ae81be</CoreFxCurrentRef> - <CoreClrCurrentRef>8648dc9f74fbaec2f2d2604bf2ddd606c8b0ab1b</CoreClrCurrentRef> + <CoreFxCurrentRef>4ffdf01885ba0575eb4d8e980315e3e52ff19c0c</CoreFxCurrentRef> + <CoreClrCurrentRef>4ffdf01885ba0575eb4d8e980315e3e52ff19c0c</CoreClrCurrentRef> <BuildToolsCurrentRef>c538360fb7bf16505db9b54e4674e54deceb13de</BuildToolsCurrentRef> <PgoDataCurrentRef>982efb931db09a52623f2021bf1dd670936d980d</PgoDataCurrentRef> - <CoreSetupCurrentRef>fe931dd06e6e6029c6808a74696ceac304ae81be</CoreSetupCurrentRef> + <CoreSetupCurrentRef>4ffdf01885ba0575eb4d8e980315e3e52ff19c0c</CoreSetupCurrentRef> <IbcDataCurrentRef>fd9474f0c60ac4f7e917c072df61e4b23115b7ae</IbcDataCurrentRef> </PropertyGroup> <!-- Tests/infrastructure dependency versions. --> <PropertyGroup> - <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview.18606.1</MicrosoftPrivateCoreFxNETCoreAppPackageVersion> - <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.18606.1</MicrosoftNETCorePlatformsPackageVersion> + <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview.18613.4</MicrosoftPrivateCoreFxNETCoreAppPackageVersion> + <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.18613.4</MicrosoftNETCorePlatformsPackageVersion> <PgoDataPackageVersion>99.99.99-master-20181210-0037</PgoDataPackageVersion> - <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27211-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> - <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27206-02</MicrosoftNETCoreAppPackageVersion> + <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27213-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27213-01</MicrosoftNETCoreAppPackageVersion> <XunitPackageVersion>2.4.1</XunitPackageVersion> <IbcDataPackageVersion>99.99.99-master-20181120-0045</IbcDataPackageVersion> <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion> diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj index 6e3fa66f94..0abf711952 100644 --- a/tests/src/Common/CoreFX/CoreFX.depproj +++ b/tests/src/Common/CoreFX/CoreFX.depproj @@ -150,6 +150,9 @@ <PackageReference Include="System.Text.Encodings.Web"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> </PackageReference> + <PackageReference Include="System.Threading.AccessControl"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + </PackageReference> <PackageReference Include="System.Threading.Channels"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> </PackageReference> |