diff options
| author | Eric Erhardt <eric.erhardt@microsoft.com> | 2017-09-11 09:52:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 09:52:39 -0500 |
| commit | f585396333e054a945ce5b9d8b6e8d6c55f59c06 (patch) | |
| tree | c104ad9ca922b71b21793cf58e1bb8684039f247 | |
| parent | 554b7a5861502ec02dadecab83e5c682cafefdd0 (diff) | |
| parent | e40a41bb04ff20060d6b7e522c3d84dd05002fb8 (diff) | |
| download | coreclr-f585396333e054a945ce5b9d8b6e8d6c55f59c06.tar.gz coreclr-f585396333e054a945ce5b9d8b6e8d6c55f59c06.tar.bz2 coreclr-f585396333e054a945ce5b9d8b6e8d6c55f59c06.zip | |
Merge branch 'master' into UpdateBuildTools
| -rw-r--r-- | Documentation/building/windows-instructions.md | 2 | ||||
| -rwxr-xr-x | cross/armel/tizen-fetch.sh | 2 | ||||
| -rw-r--r-- | dependencies.props | 4 | ||||
| -rw-r--r-- | src/mscorlib/src/System/RtType.cs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/building/windows-instructions.md b/Documentation/building/windows-instructions.md index 1cbd8e3f27..a5ce25780c 100644 --- a/Documentation/building/windows-instructions.md +++ b/Documentation/building/windows-instructions.md @@ -91,7 +91,7 @@ Powershell version must be 3.0 or higher. This should be the case for Windows 8 - Windows 7 SP1 can install Powershell version 4 [here](https://www.microsoft.com/en-us/download/details.aspx?id=40855). ## DotNet Core SDK -While not strictly needed to build or tests the .NET Core repository, having the .NET Core SDK installed lets +While not strictly needed to build or test the .NET Core repository, having the .NET Core SDK installed lets you use the dotnet.exe command to run .NET Core applications in the 'normal' way. We use this in the [Using Your Build](../workflow/UsingYourBuild.md) instructions. Visual Studio 2015 (update 3) should have installed the .NET Core SDK, but in case it did not you can get it from the [Installing the .Net Core SDK](https://www.microsoft.com/net/core) page. diff --git a/cross/armel/tizen-fetch.sh b/cross/armel/tizen-fetch.sh index a0fa72b7d7..c7a509a750 100755 --- a/cross/armel/tizen-fetch.sh +++ b/cross/armel/tizen-fetch.sh @@ -155,7 +155,7 @@ fetch_tizen_pkgs() } Inform "Initialize base" -fetch_tizen_pkgs_init arm base +fetch_tizen_pkgs_init standard base Inform "fetch common packages" fetch_tizen_pkgs armv7l gcc glibc glibc-devel fetch_tizen_pkgs noarch linux-glibc-devel diff --git a/dependencies.props b/dependencies.props index 3ca3fd5c34..0166b18173 100644 --- a/dependencies.props +++ b/dependencies.props @@ -16,14 +16,14 @@ <CoreFxCurrentRef>13b5345991e55bb0b30a236ab4f6693a870ed789</CoreFxCurrentRef> <CoreClrCurrentRef>016946e95466db8aacaf2a18643352215778c54d</CoreClrCurrentRef> <BuildToolsCurrentRef>7c9088cd9078e1d90be01eb94a3f66ba0a33c9f4</BuildToolsCurrentRef> - <PgoDataCurrentRef>413d7c0d92b6ecfa6ed1e8ae89bc2bd1aaec803a</PgoDataCurrentRef> + <PgoDataCurrentRef>d406f4669b4849df27d4f1ab30e78b72a657f246</PgoDataCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> <CoreFxPackageVersion>4.5.0-preview2-25707-02</CoreFxPackageVersion> <PlatformPackageVersion>2.1.0-preview2-25707-02</PlatformPackageVersion> - <PgoDataPackageVersion>99.99.99-master-20170910-0049</PgoDataPackageVersion> + <PgoDataPackageVersion>99.99.99-master-20170911-0041</PgoDataPackageVersion> </PropertyGroup> <!-- Full package version strings that are used in other parts of the build. --> diff --git a/src/mscorlib/src/System/RtType.cs b/src/mscorlib/src/System/RtType.cs index f95c8dc032..2d70354a48 100644 --- a/src/mscorlib/src/System/RtType.cs +++ b/src/mscorlib/src/System/RtType.cs @@ -458,8 +458,8 @@ namespace System Volatile.Write(ref m_cacheComplete, true); } - else - list = m_allMembers; + + list = m_allMembers; break; default: |