Merge in 'release/2.1' changes

dotnet · Jan 18, 2021 · 06806c7 · 06806c7
2 parents e3c7f2c + c6fcb1d
commit 06806c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
@@ -1 +1 @@
-2.1.23-servicing-29321-03
+2.1.24-servicing-29518-01
diff --git a/dependencies.props b/dependencies.props
@@ -23,18 +23,18 @@
 
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreFxCurrentRef>a192b7d4e3f638a7c1768afd0de2b0da4e59af14</CoreFxCurrentRef>
-    <CoreClrCurrentRef>a192b7d4e3f638a7c1768afd0de2b0da4e59af14</CoreClrCurrentRef>
+    <CoreFxCurrentRef>ab4f1f8a399f9dceef8a93d2b6ecc0e06cc08abf</CoreFxCurrentRef>
+    <CoreClrCurrentRef>ab4f1f8a399f9dceef8a93d2b6ecc0e06cc08abf</CoreClrCurrentRef>
     <BuildToolsCurrentRef>a449c075d4c0681e5a2ac3d39a68aa4b306574aa</BuildToolsCurrentRef>
     <PgoDataCurrentRef>ed075a5a9794917dd978c9ad465edd985d7f26d2</PgoDataCurrentRef>
   </PropertyGroup>
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-servicing-29321-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+    <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-servicing-29518-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
     <MicrosoftNETCorePlatformsPackageVersion>2.1.12</MicrosoftNETCorePlatformsPackageVersion>
     <PgoDataPackageVersion>2.1.0-release-20180912-0055</PgoDataPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.23-servicing-29321-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.24-servicing-29518-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
     <XunitConsoleNetcorePackageVersion>1.0.2-prerelease-00177</XunitConsoleNetcorePackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2.1.23-servicing-29321-03
		2.1.24-servicing-29518-01