[master] Update dependencies from dotnet/corefx (dotnet/coreclr#26446)

* Update dependencies from https://github.com/dotnet/corefx build 20190831.1

- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19431.1
- Microsoft.Private.CoreFx.NETCoreApp - 5.0.0-alpha1.19431.1

* 3.0 -> 5.0

Commit migrated from https://github.com/dotnet/coreclr/commit/c26f2eb4bae7a94375756fe7f075c13c4871b003

diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets
index 5c4d1de..453e8f2 100644 (file)
--- a/src/coreclr/tests/publishdependency.targets
+++ b/src/coreclr/tests/publishdependency.targets
@@ -3,8 +3,8 @@
 
   <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
   <ItemGroup>
-    <TestTargetFramework Include=".NETCoreApp,Version=v3.0">
-      <Folder>netcoreapp3.0</Folder>
+    <TestTargetFramework Include=".NETCoreApp,Version=v5.0">
+      <Folder>netcoreapp5.0</Folder>
     </TestTargetFramework>
   </ItemGroup>
 

diff --git a/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj b/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj
index c42cf53..ddd01f8 100644 (file)
--- a/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj
+++ b/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj
@@ -4,8 +4,8 @@
   <PropertyGroup>
       <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
       <Language>C#</Language>
-      <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-      <TargetFramework>netcoreapp3.0</TargetFramework>
+      <NugetTargetMoniker>.NETCoreApp,Version=v5.0</NugetTargetMoniker>
+      <TargetFramework>netcoreapp5.0</TargetFramework>
       <ContainsPackageReferences>true</ContainsPackageReferences>
       <CLRTestKind>SharedLibrary</CLRTestKind>
       <IsTestProject>false</IsTestProject>

diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
index e4b1af7..4e6969a 100644 (file)
--- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
+++ b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
@@ -25,7 +25,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>

diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
index 6e07686..928cc07 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -5,8 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
+    <NugetTargetMoniker>.NETCoreApp,Version=v5.0</NugetTargetMoniker>
+    <NugetTargetMonikerShort>netcoreapp5.0</NugetTargetMonikerShort>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -33,7 +33,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>

diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
index df58707..455c554 100644 (file)
--- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
@@ -5,8 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
+    <NugetTargetMoniker>.NETCoreApp,Version=v5.0</NugetTargetMoniker>
+    <NugetTargetMonikerShort>netcoreapp5.0</NugetTargetMonikerShort>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -27,7 +27,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>

diff --git a/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj b/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
index e393e50..8df5b3e 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
+++ b/src/coreclr/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
@@ -5,8 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
+    <NugetTargetMoniker>.NETCoreApp,Version=v5.0</NugetTargetMoniker>
+    <NugetTargetMonikerShort>netcoreapp5.0</NugetTargetMonikerShort>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -18,7 +18,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>

diff --git a/src/coreclr/tests/src/dir.props b/src/coreclr/tests/src/dir.props
index ed480ea..b9d879a 100644 (file)
--- a/src/coreclr/tests/src/dir.props
+++ b/src/coreclr/tests/src/dir.props
@@ -140,8 +140,8 @@
     <RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath>
 
     <!-- Specify the target framework of the common test dependency project.json. -->
-    <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
-    <NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v5.0</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>netcoreapp5.0</NuGetTargetMonikerShort>
     <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
   </PropertyGroup>