diff options
| author | Tanner Gooding <tagoo@outlook.com> | 2019-03-29 06:32:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 06:32:52 -0700 |
| commit | 9f2b33e9e124c1a6be86fa83c21a1a8134a9ca10 (patch) | |
| tree | 6327cd2bfc002e3dbf7365eb3d3c207673bf4461 | |
| parent | dc0d0721aca6c6b1da99346dfb95de78d7c83d6f (diff) | |
| download | coreclr-9f2b33e9e124c1a6be86fa83c21a1a8134a9ca10.tar.gz coreclr-9f2b33e9e124c1a6be86fa83c21a1a8134a9ca10.tar.bz2 coreclr-9f2b33e9e124c1a6be86fa83c21a1a8134a9ca10.zip | |
Updating BuildTools, CoreCLR to preview4-03828-01, preview4-27528-71, respectively (#23536)
* Removing FeedTasksPackageVersion from dependencies.props
* The corresponding metadata was removed in https://github.com/dotnet/coreclr/pull/22884
* Updating BuildTools, CoreCLR to preview4-03828-01, preview4-27528-71, respectively
* Adding a ! in String.Searching.cs
| -rw-r--r-- | BuildToolsVersion.txt | 2 | ||||
| -rw-r--r-- | ILAsmVersion.txt | 2 | ||||
| -rw-r--r-- | dependencies.props | 11 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/String.Searching.cs | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index c452d5681f..2dc38107cb 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -3.0.0-preview1-03723-01 +3.0.0-preview4-03828-01 diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt index 5967a389b7..abee55dd59 100644 --- a/ILAsmVersion.txt +++ b/ILAsmVersion.txt @@ -1 +1 @@ -3.0.0-preview4-27427-72 +3.0.0-preview4-27528-71 diff --git a/dependencies.props b/dependencies.props index fc82a23de8..130926c02e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -26,13 +26,13 @@ <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreClrCurrentRef>9ff62111734d641ece5e5ccb873f2a463675d81b</CoreClrCurrentRef> - <BuildToolsCurrentRef>9ff62111734d641ece5e5ccb873f2a463675d81b</BuildToolsCurrentRef> + <CoreClrCurrentRef>79eb261c83005ea1c93c7861d374d1dd16a07353</CoreClrCurrentRef> + <BuildToolsCurrentRef>79eb261c83005ea1c93c7861d374d1dd16a07353</BuildToolsCurrentRef> </PropertyGroup> <!-- Tests/infrastructure dependency versions. --> <PropertyGroup> - <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview4-27427-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> + <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview4-27528-71</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> <XunitPackageVersion>2.4.1</XunitPackageVersion> <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion> <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.36</MicrosoftDiagnosticsTracingTraceEventPackageVersion> @@ -82,11 +82,6 @@ <Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path> <PackageId>Microsoft.DotNet.BuildTools</PackageId> </UpdateStep> - <XmlUpdateStep Include="BuildTools"> - <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>FeedTasksPackageVersion</ElementName> - <PackageId>$(FeedTasksPackage)</PackageId> - </XmlUpdateStep> <UpdateStep Include="ILAsm"> <UpdaterType>File</UpdaterType> <Path>$(MSBuildThisFileDirectory)ILAsmVersion.txt</Path> diff --git a/src/System.Private.CoreLib/shared/System/String.Searching.cs b/src/System.Private.CoreLib/shared/System/String.Searching.cs index 49c0654480..de91b3b57e 100644 --- a/src/System.Private.CoreLib/shared/System/String.Searching.cs +++ b/src/System.Private.CoreLib/shared/System/String.Searching.cs @@ -19,7 +19,7 @@ namespace System return SpanHelpers.IndexOf( ref _firstChar, Length, - ref value._firstChar, + ref value!._firstChar, // TODO-NULLABLE: Compiler Bug? value.Length) >= 0; } |