Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 3fbe134

Browse files
dotnet-maestro[bot]Anipik
dotnet-maestro[bot]
and
Anipik
authored
[release/3.1] Update dependencies from dotnet/corefx (#28096)
* Update dependencies from https://github.com/dotnet/corefx build 20200910.1 Microsoft.Private.CoreFx.NETCoreApp From Version 4.7.0-preview3.19551.4 -> To Version 4.7.0-servicing.20460.1 * pin versions Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Anipik <[email protected]>
1 parent dd56afa commit 3fbe134

File tree

8 files changed

+24
-20
lines changed

8 files changed

+24
-20
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<Uri>https://github.com/dotnet/arcade</Uri>
1919
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview3.19551.4">
21+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20460.1">
2222
<Uri>https://github.com/dotnet/corefx</Uri>
23-
<Sha>046765913dff824f9ed0f2d2fe0fb9b111906cf5</Sha>
23+
<Sha>fe18c4973e11d3302aa446039705948e95e20fe8</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview3.19551.4">
2626
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<!-- roslyn -->
2323
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
2424
<!-- corefx -->
25-
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-preview3.19551.4</MicrosoftPrivateCoreFxNETCoreAppVersion>
26-
<MicrosoftNETCorePlatformsVersion>3.1.0-preview3.19551.4</MicrosoftNETCorePlatformsVersion>
27-
<MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
28-
<SystemIOFileSystemAccessControlVersion>4.7.0-preview3.19551.4</SystemIOFileSystemAccessControlVersion>
25+
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-servicing.20460.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
26+
<MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
27+
<MicrosoftBclAsyncInterfacesVersion>1.0.0</MicrosoftBclAsyncInterfacesVersion>
28+
<SystemIOFileSystemAccessControlVersion>4.7.0</SystemIOFileSystemAccessControlVersion>
2929
<!-- core-setup -->
3030
<MicrosoftNETCoreAppVersion>3.1.9-servicing.20459.3</MicrosoftNETCoreAppVersion>
3131
<!-- dotnet-core-internal-tooling -->

‎tests/src/Common/CoreFX/CoreFX.depproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,20 @@
3636
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" ExcludeAssets="Runtime" />
3737

3838
<!-- Microsoft.Private.CoreFx.OOB is a meta-package that contains references to most of what we need -->
39-
<PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
39+
<PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="4.7.0-rtm.19564.4" />
40+
41+
<PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
42+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.2" />
43+
<PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
4044

4145
<!-- dotnet.exe -->
42-
<PackageReference Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreAppVersion)" />
46+
<PackageReference Include="Microsoft.NETCore.DotNetHost" Version="3.1.8" />
4347

4448
<!-- hostfxr.dll -->
45-
<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreAppVersion)" />
49+
<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="3.1.8" />
4650

4751
<!-- hostpolicy.dll -->
48-
<PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreAppVersion)" />
52+
<PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="3.1.8" />
4953

5054
</ItemGroup>
5155

‎tests/src/Common/test_dependencies/test_dependencies.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
1515
</PackageReference>
1616
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
17-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
17+
<Version>4.7.0</Version>
1818
</PackageReference>
1919
<PackageReference Include="System.Security.Permissions">
20-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
20+
<Version>4.7.0</Version>
2121
</PackageReference>
2222
<PackageReference Include="System.Diagnostics.EventLog">
23-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
23+
<Version>4.7.0</Version>
2424
</PackageReference>
2525
<PackageReference Include="System.Drawing.Common">
26-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
26+
<Version>4.7.0</Version>
2727
</PackageReference>
2828
<PackageReference Include="System.Runtime.Intrinsics.Experimental">
29-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
29+
<Version>4.7.0-rtm.19564.4</Version>
3030
</PackageReference>
3131
<PackageReference Include="Microsoft.Diagnostics.Tools.RuntimeClient">
3232
<Version>$(MicrosoftDiagnosticsToolsRuntimeClientVersion)</Version>

‎tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<ProjectReference Include="../../NativeServer/CMakeLists.txt" />
4141
<ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
4242
<PackageReference Include="System.Drawing.Common">
43-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
43+
<Version>4.7.0</Version>
4444
</PackageReference>
4545
</ItemGroup>
4646
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

‎tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
1515
</PackageReference>
1616
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
17-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
17+
<Version>4.7.0</Version>
1818
</PackageReference>
1919
</ItemGroup>
2020
<PropertyGroup>

‎tests/src/JIT/config/benchmark/benchmark.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
<Version>4.4.0-beta-24913-02</Version>
5757
</PackageReference>
5858
<PackageReference Include="System.Reflection.TypeExtensions">
59-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
59+
<Version>4.7.0</Version>
6060
</PackageReference>
6161
<PackageReference Include="System.Runtime">
6262
<Version>4.4.0-beta-24913-02</Version>
6363
</PackageReference>
6464
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
65-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
65+
<Version>4.7.0</Version>
6666
</PackageReference>
6767
<PackageReference Include="System.Runtime.Extensions">
6868
<Version>4.4.0-beta-24913-02</Version>

‎tests/src/performance/performance.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<Version>4.4.0-beta-24913-02</Version>
5151
</PackageReference>
5252
<PackageReference Include="System.Reflection.TypeExtensions">
53-
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
53+
<Version>4.7.0</Version>
5454
</PackageReference>
5555
<PackageReference Include="System.Runtime">
5656
<Version>4.4.0-beta-24913-02</Version>

0 commit comments

Comments
 (0)