diff options
author | William Godbe <wigodbe@microsoft.com> | 2019-04-04 12:59:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 12:59:07 -0700 |
commit | c917c7ed7f0acf77813c65ec9425e54008ae0f28 (patch) | |
tree | 71eb9cef309dad7a6b1a750fa3b48bc650936f95 /dependencies.props | |
parent | 9efba4fab6ef4401b431d0ec8c2943bcfc81b2b1 (diff) | |
parent | 28dd0b05804bcde13737bbc834d955352f327b54 (diff) | |
download | coreclr-c917c7ed7f0acf77813c65ec9425e54008ae0f28.tar.gz coreclr-c917c7ed7f0acf77813c65ec9425e54008ae0f28.tar.bz2 coreclr-c917c7ed7f0acf77813c65ec9425e54008ae0f28.zip |
Merge pull request #23660 from dotnet-maestro-bot/merge/master-to-release/3.0
[automated] Merge branch 'master' => 'release/3.0'
Diffstat (limited to 'dependencies.props')
-rw-r--r-- | dependencies.props | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/dependencies.props b/dependencies.props index 32e45f30fa..3665b733b8 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> |