Skip to content

Commit 6e4d4e0

Browse files
dotnet-maestro-botdanmoseley
authored andcommitted
[automated] Merge branch 'release/2.1' => 'release/2.2' (dotnet#31329)
* Update CoreClr, CoreFx, CoreSetup to servicing-26722-03, servicing-26722-02, servicing-26722-02, respectively (dotnet#31290) * Update runtime IDs for new RHEL/OL/Fedora releases CentOS does not include a minor version in runtime id.
1 parent b27b225 commit 6e4d4e0

File tree

5 files changed

+838
-65
lines changed

5 files changed

+838
-65
lines changed

dependencies.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
These ref versions are pulled from https://github.com/dotnet/versions.
1010
-->
1111
<PropertyGroup>
12-
<CoreFxCurrentRef>a47e64fd39ba09ac1d5f100098550e31382f9c29</CoreFxCurrentRef>
13-
<CoreClrCurrentRef>a47e64fd39ba09ac1d5f100098550e31382f9c29</CoreClrCurrentRef>
14-
<CoreSetupCurrentRef>a47e64fd39ba09ac1d5f100098550e31382f9c29</CoreSetupCurrentRef>
12+
<CoreFxCurrentRef>c420a2b53cbbbb2e3c6c06bfe28f4ac7ebc0e352</CoreFxCurrentRef>
13+
<CoreClrCurrentRef>c420a2b53cbbbb2e3c6c06bfe28f4ac7ebc0e352</CoreClrCurrentRef>
14+
<CoreSetupCurrentRef>c420a2b53cbbbb2e3c6c06bfe28f4ac7ebc0e352</CoreSetupCurrentRef>
1515
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
1616
<ProjectNTfsCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsCurrentRef>
1717
<ProjectNTfsTestILCCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsTestILCCurrentRef>
@@ -31,15 +31,15 @@
3131

3232
<!-- Tests/infrastructure dependency versions. -->
3333
<PropertyGroup>
34-
<CoreFxExpectedPrerelease>servicing-26719-03</CoreFxExpectedPrerelease>
35-
<MicrosoftNETCorePlatformsPackageVersion>2.1.1-servicing-26719-03</MicrosoftNETCorePlatformsPackageVersion>
36-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.3-servicing-26719-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
34+
<CoreFxExpectedPrerelease>servicing-26722-02</CoreFxExpectedPrerelease>
35+
<MicrosoftNETCorePlatformsPackageVersion>2.1.1-servicing-26722-02</MicrosoftNETCorePlatformsPackageVersion>
36+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.3-servicing-26722-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
3737
<ProjectNTfsExpectedPrerelease>beta-26413-00</ProjectNTfsExpectedPrerelease>
3838
<ProjectNTfsTestILCExpectedPrerelease>beta-26413-00</ProjectNTfsTestILCExpectedPrerelease>
3939
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26413-00</ProjectNTfsTestILCPackageVersion>
40-
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.3-servicing-26719-03</MicrosoftNETCoreDotNetHostPackageVersion>
41-
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.3-servicing-26719-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
42-
<MicrosoftNETCoreAppPackageVersion>2.1.3-servicing-26719-03</MicrosoftNETCoreAppPackageVersion>
40+
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreDotNetHostPackageVersion>
41+
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
42+
<MicrosoftNETCoreAppPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreAppPackageVersion>
4343

4444
<!-- CoreFX-built SNI identity package -->
4545
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>

0 commit comments

Comments
 (0)